Log Detour Hook creations

GoldHEN · Jun 24, 2023 · fc6fa34 · fc6fa34
1 parent 2355053
commit fc6fa34
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ TARGETSTATIC := libGoldHEN_Hook.a
 TARGETCRT    := build/crtprx.o
 
 # Libraries linked into the ELF.
-LIBS         := -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS         := -lSceLibcInternal -lkernel -lSceSysmodule
 
 LOG_TYPE = -D__USE_KLOG__
 DEBUG_FLAGS = -DDEBUG=0

diff --git a/include/Utilities.h b/include/Utilities.h
@@ -35,6 +35,8 @@ typedef unsigned long HA;
 #define HA_MANYARGS  HA arg1, HA arg2, HA arg3, HA arg4, HA arg5, HA arg6, HA arg7, HA arg8, HA arg9, HA arg10, HA arg11, HA arg12
 #define MANYARGS arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12
 
+#define klog printf
+
 // if you need to define the hook in some header file, this only externs it.
 #define HOOK_EXTERN(name) \
         extern Detour Detour_##name
@@ -45,12 +47,14 @@ typedef unsigned long HA;
 
 // this does a 64bit hook
 #define HOOK(name) do { \
+    klog("%s:%d HOOK64() Create " #name "\n", __FUNCTION__, __LINE__);  \
     Detour_Construct( (&(Detour_##name)), DetourMode_x64);                                 \
     Detour_DetourFunction( (&(Detour_##name)), (uint64_t)name, (void *)(&(name##_hook)) ); \
 } while (0)
 
 // 32bit...
 #define HOOK32(name) do { \
+    klog("%s:%d HOOK32() Create " #name "\n", __FUNCTION__, __LINE__);  \
     Detour_Construct( (&(Detour_##name)), DetourMode_x32);                                 \
     Detour_DetourFunction( (&(Detour_##name)), (uint64_t)name, (void *)(&(name##_hook)) ); \
 } while (0)
@@ -61,14 +65,6 @@ typedef unsigned long HA;
 // unhooks, killing the defined hook, CANNOT BE REUSED
 #define UNHOOK(name) Detour_Destroy( (&(Detour_##name)) )
 
-#ifdef __USE_PRINTF__
-#define klog printf
-#endif
-
-#ifdef __USE_KLOG__
-void klog(char* fmt, ...);
-#endif
-
 void hex_dump(void *data, size_t size);
 
 #ifdef __cplusplus

diff --git a/source/Utilities.c b/source/Utilities.c
@@ -11,22 +11,6 @@
 
 #include "Common.h"
 
-#ifdef __USE_PRINTF__
-#define klog printf
-#endif
-
-#ifdef __USE_KLOG__
-void klog(char* fmt, ...) {
-    // DO NOT INITIALIZE WITH 0!!
-    char Buffer[255];
-    va_list args;
-    va_start(args, fmt);
-    vsnprintf(Buffer, sizeof(Buffer), fmt, args);
-    va_end(args);
-    sys_sdk_cmd(GOLDHEN_SDK_CMD_KLOG, Buffer);
-}
-#endif
-
 void hex_dump(void *data, size_t size) {
     unsigned char *p = (unsigned char *)data;
     int i;