backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Revert "Workaround for module path limitations of global hooks"

Browse Source 
This reverts commit 2f52e1028b45f3874dcd99fef74b95ab36c2a334.

See issue #264.
This commit is contained in:
narzoul 2024-03-23 17:56:21 +01:00
parent f36a255ac9
commit ca2c3b7106
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DDrawCompat/Input/Input.cpp
View File

@ -252,7 +252,8 @@ namespace
} }
g_keyState.reset(); g_keyState.reset();
g_keyboardHook = CALL_ORIG_FUNC(SetWindowsHookExA)(WH_KEYBOARD_LL, &lowLevelKeyboardProc, nullptr, 0); g_keyboardHook = CALL_ORIG_FUNC(SetWindowsHookExA)(
WH_KEYBOARD_LL, &lowLevelKeyboardProc, Dll::g_currentModule, 0);
if (!g_keyboardHook) if (!g_keyboardHook)
{ {
LOG_ONCE("ERROR: Failed to install low level keyboard hook, error code: " << GetLastError()); LOG_ONCE("ERROR: Failed to install low level keyboard hook, error code: " << GetLastError());
@ -270,7 +271,8 @@ namespace
} }
g_origCursorPos = { MAXLONG, MAXLONG }; g_origCursorPos = { MAXLONG, MAXLONG };
g_mouseHook = CALL_ORIG_FUNC(SetWindowsHookExA)(WH_MOUSE_LL, &lowLevelMouseProc, nullptr, 0); g_mouseHook = CALL_ORIG_FUNC(SetWindowsHookExA)(
WH_MOUSE_LL, &lowLevelMouseProc, Dll::g_currentModule, 0);
if (g_mouseHook) if (g_mouseHook)
{ {
@ -323,8 +325,6 @@ namespace
lpfn = dinputLowLevelMouseProc; lpfn = dinputLowLevelMouseProc;
Compat::hookIatFunction(hmod, "CallNextHookEx", dinputCallNextHookEx); Compat::hookIatFunction(hmod, "CallNextHookEx", dinputCallNextHookEx);
} }
hmod = nullptr;
} }
HHOOK result = origSetWindowsHookEx(idHook, lpfn, hmod, dwThreadId); HHOOK result = origSetWindowsHookEx(idHook, lpfn, hmod, dwThreadId);