Helpers.h update & change how vtable hooks are installed.

Author: blueskythlikesclouds

Dependencies/Helpers.h

@@ -30,57 +30,56 @@ const HMODULE MODULE_HANDLE = GetModuleHandle(nullptr);
     returnType callingConvention implOf##functionName(__VA_ARGS__)
 
 #define INSTALL_HOOK(functionName) \
-    { \
+    do { \
         DetourTransactionBegin(); \
         DetourUpdateThread(GetCurrentThread()); \
         DetourAttach((void**)&original##functionName, implOf##functionName); \
         DetourTransactionCommit(); \
-    }
+    } while(0)
 
 #define VTABLE_HOOK(returnType, callingConvention, className, functionName, ...) \
     typedef returnType callingConvention className##functionName(className* This, __VA_ARGS__); \
     className##functionName* original##className##functionName; \
     returnType callingConvention implOf##className##functionName(className* This, __VA_ARGS__)
 
 #define INSTALL_VTABLE_HOOK(className, object, functionName, functionIndex) \
-    { \
-        void** addr = &(*(void***)object)[functionIndex]; \
-        if (*addr != implOf##className##functionName) \
+    do { \
+        if (original##className##functionName == nullptr) \
         { \
-            original##className##functionName = (className##functionName*)*addr; \
-            DWORD oldProtect; \
-            VirtualProtect(addr, sizeof(void*), PAGE_EXECUTE_READWRITE, &oldProtect); \
-            *addr = implOf##className##functionName; \
-            VirtualProtect(addr, sizeof(void*), oldProtect, &oldProtect); \
+            original##className##functionName = (*(className##functionName***)object)[functionIndex]; \
+            DetourTransactionBegin(); \
+            DetourUpdateThread(GetCurrentThread()); \
+            DetourAttach((void**)&original##className##functionName, implOf##className##functionName); \
+            DetourTransactionCommit(); \
         } \
-    }
+    } while(0)
 
 #define WRITE_MEMORY(location, type, ...) \
-    { \
+    do { \
         const type data[] = { __VA_ARGS__ }; \
         DWORD oldProtect; \
         VirtualProtect((void*)(location), sizeof(data), PAGE_EXECUTE_READWRITE, &oldProtect); \
         memcpy((void*)(location), data, sizeof(data)); \
         VirtualProtect((void*)(location), sizeof(data), oldProtect, &oldProtect); \
-    }
+    } while(0)
 
 #define WRITE_JUMP(location, function) \
-    { \
+    do { \
         WRITE_MEMORY(location, uint8_t, 0xE9); \
-        WRITE_MEMORY(location + 1, uint32_t, (uint32_t)(function) - (size_t)(location) - 5); \
-    }
+        WRITE_MEMORY(location + 1, uint32_t, (uint32_t)((size_t)(function) - (size_t)(location) - 5)); \
+    } while(0)
 
 #define WRITE_CALL(location, function) \
-    { \
+    do { \
         WRITE_MEMORY(location, uint8_t, 0xE8); \
-        WRITE_MEMORY(location + 1, uint32_t, (uint32_t)(function) - (size_t)(location) - 5); \
-    }
+        WRITE_MEMORY(location + 1, uint32_t, (uint32_t)((size_t)(function) - (size_t)(location) - 5)); \
+    } while(0)
 
 #define WRITE_NOP(location, count) \
-    { \
+    do { \
         DWORD oldProtect; \
         VirtualProtect((void*)(location), (size_t)(count), PAGE_EXECUTE_READWRITE, &oldProtect); \
         for (size_t i = 0; i < (size_t)(count); i++) \
             *((uint8_t*)(location) + i) = 0x90; \
         VirtualProtect((void*)(location), (size_t)(count), oldProtect, &oldProtect); \
-    }
+    } while(0)