From a25e4d35f871f067c0bcd84e9ab3ba7ff4d65f9a Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Mon, 2 Aug 2021 17:27:19 +0200 Subject: [PATCH] dinput.dll proxy with CoCreateInstance hook --- ddraw.def | 1 + inc/hook.h | 2 ++ inc/winapi_hooks.h | 2 ++ src/directinput.c | 2 +- src/hook.c | 12 ++++++++++++ src/winapi_hooks.c | 20 ++++++++++++++++++++ 6 files changed, 38 insertions(+), 1 deletion(-) diff --git a/ddraw.def b/ddraw.def index 01f4f2b..096d061 100644 --- a/ddraw.def +++ b/ddraw.def @@ -13,5 +13,6 @@ EXPORTS DirectDrawEnumerateExW @13 DirectDrawEnumerateW @14 ReleaseDDThreadLock @21 + DirectInputCreateEx = fake_DirectInputCreateEx @22 GameHandlesClose DATA pvBmpBits = FakePrimarySurface DATA diff --git a/inc/hook.h b/inc/hook.h index c7783ac..4b26fe9 100644 --- a/inc/hook.h +++ b/inc/hook.h @@ -36,6 +36,7 @@ typedef HMODULE(WINAPI* LOADLIBRARYAPROC)(LPCSTR); typedef HMODULE(WINAPI* LOADLIBRARYWPROC)(LPCWSTR); typedef HMODULE(WINAPI* LOADLIBRARYEXAPROC)(LPCSTR, HANDLE, DWORD); typedef HMODULE(WINAPI* LOADLIBRARYEXWPROC)(LPCWSTR, HANDLE, DWORD); +typedef HRESULT(WINAPI* COCREATEINSTANCEPROC)(REFCLSID, LPUNKNOWN, DWORD, REFIID, LPVOID*); extern GETCURSORPOSPROC real_GetCursorPos; extern CLIPCURSORPROC real_ClipCursor; @@ -65,6 +66,7 @@ extern LOADLIBRARYAPROC real_LoadLibraryA; extern LOADLIBRARYWPROC real_LoadLibraryW; extern LOADLIBRARYEXAPROC real_LoadLibraryExA; extern LOADLIBRARYEXWPROC real_LoadLibraryExW; +extern COCREATEINSTANCEPROC real_CoCreateInstance; extern int g_hook_method; extern BOOL g_hook_active; diff --git a/inc/winapi_hooks.h b/inc/winapi_hooks.h index 211a794..499b375 100644 --- a/inc/winapi_hooks.h +++ b/inc/winapi_hooks.h @@ -35,5 +35,7 @@ HMODULE WINAPI fake_LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dw HWND WINAPI fake_CreateWindowExA( DWORD dwExStyle, LPCSTR lpClassName, LPCSTR lpWindowName, DWORD dwStyle, int X, int Y, int nWidth, int nHeight, HWND hWndParent, HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam); +HRESULT WINAPI fake_CoCreateInstance( + REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID* ppv); #endif diff --git a/src/directinput.c b/src/directinput.c index 6989730..4a7848e 100644 --- a/src/directinput.c +++ b/src/directinput.c @@ -236,7 +236,7 @@ HRESULT WINAPI fake_DirectInputCreateEx( if (!real_DirectInputCreateEx) { real_DirectInputCreateEx = - (DIRECTINPUTCREATEEXPROC)GetProcAddress(GetModuleHandle("dinput.dll"), "DirectInputCreateEx"); + (DIRECTINPUTCREATEEXPROC)GetProcAddress(LoadLibraryA("system32\\dinput.dll"), "DirectInputCreateEx"); } if (!real_DirectInputCreateEx) diff --git a/src/hook.c b/src/hook.c index 27d78c5..15adaaa 100644 --- a/src/hook.c +++ b/src/hook.c @@ -44,6 +44,7 @@ LOADLIBRARYAPROC real_LoadLibraryA = LoadLibraryA; LOADLIBRARYWPROC real_LoadLibraryW = LoadLibraryW; LOADLIBRARYEXAPROC real_LoadLibraryExA = LoadLibraryExA; LOADLIBRARYEXWPROC real_LoadLibraryExW = LoadLibraryExW; +COCREATEINSTANCEPROC real_CoCreateInstance = CoCreateInstance; static HOOKLIST g_hooks[] = { @@ -440,6 +441,15 @@ void hook_init() void hook_early_init() { + /* + DetourTransactionBegin(); + DetourUpdateThread(GetCurrentThread()); + DetourAttach((PVOID*)&real_CoCreateInstance, (PVOID)fake_CoCreateInstance); + DetourTransactionCommit(); + */ + + hook_patch_iat(GetModuleHandle(NULL), FALSE, "ole32.dll", "CoCreateInstance", (PROC)fake_CoCreateInstance); + hook_patch_iat(GetModuleHandle(NULL), FALSE, "dinput.dll", "DirectInputCreateA", (PROC)fake_DirectInputCreateA); hook_patch_iat(GetModuleHandle(NULL), FALSE, "dinput.dll", "DirectInputCreateW", (PROC)fake_DirectInputCreateW); hook_patch_iat(GetModuleHandle(NULL), FALSE, "dinput.dll", "DirectInputCreateEx", (PROC)fake_DirectInputCreateEx); @@ -493,6 +503,8 @@ void hook_exit() hook_revert((HOOKLIST*)&g_hooks); } + hook_patch_iat(GetModuleHandle(NULL), TRUE, "ole32.dll", "CoCreateInstance", (PROC)fake_CoCreateInstance); + hook_patch_iat(GetModuleHandle(NULL), TRUE, "dinput.dll", "DirectInputCreateA", (PROC)fake_DirectInputCreateA); hook_patch_iat(GetModuleHandle(NULL), TRUE, "dinput.dll", "DirectInputCreateW", (PROC)fake_DirectInputCreateW); hook_patch_iat(GetModuleHandle(NULL), TRUE, "dinput.dll", "DirectInputCreateEx", (PROC)fake_DirectInputCreateEx); diff --git a/src/winapi_hooks.c b/src/winapi_hooks.c index 6b4c36f..5010df5 100644 --- a/src/winapi_hooks.c +++ b/src/winapi_hooks.c @@ -3,6 +3,7 @@ #include #include "debug.h" #include "dd.h" +#include "ddraw.h" #include "hook.h" #include "config.h" #include "utils.h" @@ -630,3 +631,22 @@ HWND WINAPI fake_CreateWindowExA( hInstance, lpParam); } + +HRESULT WINAPI fake_CoCreateInstance(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID* ppv) +{ + if (rclsid && riid && (IsEqualGUID(&CLSID_DirectDraw, rclsid) || IsEqualGUID(&CLSID_DirectDraw7, rclsid))) + { + if (IsEqualGUID(&IID_IDirectDraw2, riid) || + IsEqualGUID(&IID_IDirectDraw4, riid) || + IsEqualGUID(&IID_IDirectDraw7, riid)) + { + return dd_CreateEx(NULL, ppv, NULL, NULL); + } + else + { + return dd_CreateEx(NULL, ppv, &IID_IDirectDraw, NULL); + } + } + + return real_CoCreateInstance(rclsid, pUnkOuter, dwClsContext, riid, ppv); +}