Add debug info

Author: viferga

plthook_elf.c

@@ -187,6 +187,13 @@
 #endif
 #endif /* __LP64__ */
 
+/* TODO: Add debug info for library listing */
+#ifdef PLTHOOK_DEBUG
+#define DEBUG_MSG(...) fprintf(stderr, __VA_ARGS__)
+#else
+#define DEBUG_MSG(...)
+#endif
+
 typedef struct mem_prot {
     size_t start;
     size_t end;

plthook_osx.c

@@ -47,10 +47,12 @@
 #include <mach-o/fixup-chains.h>
 #include "plthook.h"
 
-// #define PLTHOOK_DEBUG_CMD 1
-// #define PLTHOOK_DEBUG_BIND 1
-// #define PLTHOOK_DEBUG_FIXUPS 1
-// #define PLTHOOK_DEBUG_ADDR 1
+#ifdef PLTHOOK_DEBUG
+#define PLTHOOK_DEBUG_CMD 1
+#define PLTHOOK_DEBUG_BIND 1
+#define PLTHOOK_DEBUG_FIXUPS 1
+#define PLTHOOK_DEBUG_ADDR 1
+#endif
 
 #ifdef PLTHOOK_DEBUG_CMD
 #define DEBUG_CMD(...) fprintf(stderr, __VA_ARGS__)

plthook_win32.c

@@ -63,6 +63,12 @@
 #define stricmp strcasecmp
 #endif
 
+#ifdef PLTHOOK_DEBUG
+#define DEBUG_MSG(...) fprintf(stderr, __VA_ARGS__)
+#else
+#define DEBUG_MSG(...)
+#endif
+
 typedef struct {
     const char *mod_name;
     const char *name;
@@ -214,6 +220,8 @@ static int plthook_open_real(plthook_t **plthook_out, HMODULE hMod)
         const char *module_name = (char *)hMod + desc->Name;
         int is_winsock2_dll = (stricmp(module_name, "WS2_32.DLL") == 0);
 
+        DEBUG_MSG("Imported Library: '%s'\n", module_name);
+
         while (addr_thunk->u1.Function != 0) {
             const char *name = NULL;
 
@@ -249,6 +257,8 @@ static int plthook_open_real(plthook_t **plthook_out, HMODULE hMod)
             continue;
         }
 
+        DEBUG_MSG("Imported Delayed Library: '%s'\n", module_name);
+
         while (name_thunk->u1.AddressOfData) {
             const char *name = NULL;