From 0b5247d93d94f83375449ed08de48c43190d27d5 Mon Sep 17 00:00:00 2001 From: narzoul Date: Sat, 19 Mar 2016 13:26:34 +0100 Subject: [PATCH] Moved HOOK_GDI_FUNCTION macro to resuable scope --- DDrawCompat/CompatGdi.h | 3 +++ DDrawCompat/CompatGdiCaret.cpp | 3 --- DDrawCompat/CompatGdiDcFunctions.cpp | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/DDrawCompat/CompatGdi.h b/DDrawCompat/CompatGdi.h index 32b53e0..633348f 100644 --- a/DDrawCompat/CompatGdi.h +++ b/DDrawCompat/CompatGdi.h @@ -10,6 +10,9 @@ #define CALL_ORIG_GDI(func) CompatGdi::getOrigFuncPtr() +#define HOOK_GDI_FUNCTION(module, func, newFunc) \ + CompatGdi::hookGdiFunction(#module, #func, &newFunc) + namespace CompatGdi { class GdiScopedThreadLock diff --git a/DDrawCompat/CompatGdiCaret.cpp b/DDrawCompat/CompatGdiCaret.cpp index f5e8dcc..9842e32 100644 --- a/DDrawCompat/CompatGdiCaret.cpp +++ b/DDrawCompat/CompatGdiCaret.cpp @@ -207,9 +207,6 @@ namespace } } -#define HOOK_GDI_FUNCTION(module, func, newFunc) \ - CompatGdi::hookGdiFunction(#module, #func, &newFunc); - namespace CompatGdiCaret { void installHooks() diff --git a/DDrawCompat/CompatGdiDcFunctions.cpp b/DDrawCompat/CompatGdiDcFunctions.cpp index a33144a..bd25250 100644 --- a/DDrawCompat/CompatGdiDcFunctions.cpp +++ b/DDrawCompat/CompatGdiDcFunctions.cpp @@ -128,13 +128,9 @@ namespace } } -#define HOOK_GDI_FUNCTION(module, func, newFunc) \ - CompatGdi::hookGdiFunction( \ - #module, #func, &newFunc); - #define HOOK_GDI_DC_FUNCTION(module, func) \ CompatGdi::hookGdiFunction( \ - #module, #func, getCompatGdiDcFuncPtr(&func)); + #module, #func, getCompatGdiDcFuncPtr(&func)) #define HOOK_GDI_TEXT_DC_FUNCTION(module, func) \ HOOK_GDI_DC_FUNCTION(module, func##A); \