make libwinpe_test compatible with tcc

YuriSizuku · Oct 16, 2024 · 554b2b1 · 554b2b1
1 parent 77cc93c
commit 554b2b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/project/windll_winpe/Makefile b/project/windll_winpe/Makefile
@@ -28,7 +28,7 @@ endif
 ifneq (,$(findstring d, $(BUILD_TYPE)))
 CFLAGS+=-g -D_DEBUG
 else
-CFLAGS+=-O3
+CFLAGS+=-O3 # winpe_memGetProcAddress might fail if use inline and -O3 by llvm-clang
 endif
 ifneq (,$(findstring tcc, $(CC)))
 LDFLAGS= # tcc can not remove at at stdcall in i686

diff --git a/project/windll_winpe/src/libwinpe_test.c b/project/windll_winpe/src/libwinpe_test.c
@@ -15,16 +15,15 @@ void test_findkernel32()
 
 void test_findloadlibrarya()
 {
-
-    void *func = (void*)LoadLibraryA;
+    void *func = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "LoadLibraryA"); // compatible with tcc
     void *func2 = winpe_findloadlibrarya();
     printf("[test_findloadlibrarya] LoadLibraryA=%p\n", func2);
     assert(func==func2);
 }
 
 void test_findgetprocaddress()
 {
-    void *func = (void*)GetProcAddress;
+    void *func = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetProcAddress"); // compatible with tcc
     void *func2 = winpe_findgetprocaddress();
     printf("[test_findgetprocaddress] GetProcAddress=%p\n", func2);
     assert(func==func2);

diff --git a/src/commdef.h b/src/commdef.h
@@ -67,12 +67,12 @@
 #define LOG_LEVEL_INFO 3
 #define LOG_LEVEL_DEBUG 4
 #define LOG_LEVEL_VERBOSE 5
-#define LogTagPrintf(format, tag, ...) \
+#define LogTagPrintf(format, tag, ...) {\
     printf("[%s,%d,%s,%s] ", __FILE__, __LINE__, __func__, tag);\
-    printf(format, ##__VA_ARGS__);
-#define LogTagWprintf(format, tag, ...) \
+    printf(format, ##__VA_ARGS__);}
+#define LogTagWprintf(format, tag, ...) {\
     printf("[%s,%d,%s,%s] ", __FILE__, __LINE__, __func__, tag);\
-    wprintf(format, ##__VA_ARGS__);
+    wprintf(format, ##__VA_ARGS__);}
 #define DummyPrintf(format, ...)
 #define LOG(format, ...) LogTagPrintf(format, "I", ##__VA_ARGS__)
 #define LOGL(format, ...) LogTagWprintf(format, "I", ##__VA_ARGS__)