Merge pull request #118 from dlfcn-win32/variousimprovements2025HEADmaster

Remove use of CRT, fix gcc compilation in C++ mode, fix missing includes and fix warnings

3 files changed, 8 insertions, 4 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cd321f2..1fe7387 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -31,6 +31,4 @@ if(WIN32 AND NOT BUILD_SHARED_LIBS)
     endif()
 endif()
 
-install(TARGETS test-dladdr EXPORT dlfcn-win32-targets RUNTIME DESTINATION bin)
-
 add_test(NAME test-dladdr COMMAND test-dladdr WORKING_DIRECTORY $<TARGET_FILE_DIR:test-dladdr>)
diff --git a/tests/test-dladdr.c b/tests/test-dladdr.c
index 5568f23..aa815b0 100644
--- a/tests/test-dladdr.c
+++ b/tests/test-dladdr.c
@@ -140,6 +140,7 @@ __declspec(dllexport)
 #endif
 int main(int argc, char **argv)
 {
+#ifdef _WIN32
 #if defined(_M_ARM64) || defined(__aarch64__)
     /* points to non reachable address */
     unsigned char zero_thunk_address[12] = { 0x10, 0x00, 0x00, 0x90, 0x10, 0x02, 0x40, 0xF9, 0x00, 0x02, 0x1F, 0xD6 };
@@ -147,13 +148,16 @@ int main(int argc, char **argv)
     unsigned char invalid_thunk_address[12] = { 0x10, 0x00, 0x00, 0xb0, 0x10, 0x06, 0x47, 0xF9, 0x00, 0x02, 0x1F, 0xD6 };
     /* no import thunk */
     unsigned char no_import_thunk[12] = { 0x11, 0x00, 0x00, 0xb0, 0x31, 0x06, 0x47, 0xF9, 0x20, 0x02, 0x1F, 0xD6 };
-#else
+#elif defined(_M_AMD64) || defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)
     /* points to non reachable address */
     unsigned char zero_thunk_address[6] = { 0xFF, 0x25, 0x00, 0x00, 0x00, 0x00 };
     /* points to executable base */
     unsigned char invalid_thunk_address[6] = { 0xFF, 0x25, 0x00, 0x00, 0x40, 0x00 };
     /* no import thunk */
     unsigned char no_import_thunk[6] = { 0xFF, 0x26, 0x00, 0x00, 0x40, 0x00 };
+#else
+#error "thunk test cases are not defined for this architecture"
+#endif
 #endif
     int  result = 0;
     UNUSED(argv);
@@ -169,11 +173,12 @@ int main(int argc, char **argv)
     result |= check_dladdr( "function from executable", (void*)main, "main", Pass );
     result |= check_dladdr( "static function from executable", (void*)print_dl_info, "print_dl_info", Fail );
     result |= check_dladdr( "address with positive offset", ((char*)atoi)+1, "atoi", PassWithDifferentAddress );
+
+#ifdef _WIN32
     result |= check_dladdr( "zero address from import thunk", zero_thunk_address, "", NoInfo );
     result |= check_dladdr( "invalid address from import thunk", invalid_thunk_address, "", NoInfo );
     result |= check_dladdr( "no import thunk", no_import_thunk, "", NoInfo );
 
-#ifdef _WIN32
     result |= check_dladdr( "last entry in iat", (void*)VirtualQuery, "VirtualQuery", PassWithDifferentAddress );
 
     result |= check_dladdr ( "address through import thunk", (void*)GetModuleHandleA, "GetModuleHandleA", PassWithDifferentAddress );
diff --git a/tests/test.c b/tests/test.c
index 1d0d437..4fa7089 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -36,6 +36,7 @@
 #include <io.h>

 #include <fcntl.h>

 #include <direct.h>

+#include <errno.h>

 #include "dlfcn.h"

 

 /* If these dlclose's fails, we don't care as the handles are going to be