mirror of
https://github.com/FunkyFr3sh/cnc-ddraw.git
synced 2025-03-24 17:49:52 +01:00
make sure we always hook dinput
This commit is contained in:
parent
c43f38fad3
commit
d04f9d3fa3
@ -16,6 +16,7 @@
|
|||||||
#include "ddclipper.h"
|
#include "ddclipper.h"
|
||||||
#include "dllmain.h"
|
#include "dllmain.h"
|
||||||
#include "hook.h"
|
#include "hook.h"
|
||||||
|
#include "directinput.h"
|
||||||
|
|
||||||
|
|
||||||
BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint)
|
BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint)
|
||||||
@ -1005,15 +1006,15 @@ HMODULE WINAPI fake_LoadLibraryA(LPCSTR lpLibFileName)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (hmod && hmod != g_ddraw_module && lpLibFileName &&
|
||||||
|
(_strcmpi(lpLibFileName, "dinput.dll") == 0 || _strcmpi(lpLibFileName, "dinput") == 0 ||
|
||||||
|
_strcmpi(lpLibFileName, "dinput8.dll") == 0 || _strcmpi(lpLibFileName, "dinput8") == 0))
|
||||||
|
{
|
||||||
|
dinput_hook_init();
|
||||||
|
}
|
||||||
|
|
||||||
if (hmod && hmod != hmod_old)
|
if (hmod && hmod != hmod_old)
|
||||||
{
|
{
|
||||||
if (hmod != g_ddraw_module && lpLibFileName &&
|
|
||||||
(_strcmpi(lpLibFileName, "dinput.dll") == 0 || _strcmpi(lpLibFileName, "dinput") == 0 ||
|
|
||||||
_strcmpi(lpLibFileName, "dinput8.dll") == 0 || _strcmpi(lpLibFileName, "dinput8") == 0))
|
|
||||||
{
|
|
||||||
dinput_hook_init();
|
|
||||||
}
|
|
||||||
|
|
||||||
hook_init(FALSE);
|
hook_init(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1033,15 +1034,15 @@ HMODULE WINAPI fake_LoadLibraryW(LPCWSTR lpLibFileName)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (hmod && hmod != g_ddraw_module && lpLibFileName &&
|
||||||
|
(_wcsicmp(lpLibFileName, L"dinput.dll") == 0 || _wcsicmp(lpLibFileName, L"dinput") == 0 ||
|
||||||
|
_wcsicmp(lpLibFileName, L"dinput8.dll") == 0 || _wcsicmp(lpLibFileName, L"dinput8") == 0))
|
||||||
|
{
|
||||||
|
dinput_hook_init();
|
||||||
|
}
|
||||||
|
|
||||||
if (hmod && hmod != hmod_old)
|
if (hmod && hmod != hmod_old)
|
||||||
{
|
{
|
||||||
if (hmod != g_ddraw_module && lpLibFileName &&
|
|
||||||
(_wcsicmp(lpLibFileName, L"dinput.dll") == 0 || _wcsicmp(lpLibFileName, L"dinput") == 0 ||
|
|
||||||
_wcsicmp(lpLibFileName, L"dinput8.dll") == 0 || _wcsicmp(lpLibFileName, L"dinput8") == 0))
|
|
||||||
{
|
|
||||||
dinput_hook_init();
|
|
||||||
}
|
|
||||||
|
|
||||||
hook_init(FALSE);
|
hook_init(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1061,15 +1062,15 @@ HMODULE WINAPI fake_LoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwF
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (hmod && hmod != g_ddraw_module && lpLibFileName &&
|
||||||
|
(_strcmpi(lpLibFileName, "dinput.dll") == 0 || _strcmpi(lpLibFileName, "dinput") == 0 ||
|
||||||
|
_strcmpi(lpLibFileName, "dinput8.dll") == 0 || _strcmpi(lpLibFileName, "dinput8") == 0))
|
||||||
|
{
|
||||||
|
dinput_hook_init();
|
||||||
|
}
|
||||||
|
|
||||||
if (hmod && hmod != hmod_old)
|
if (hmod && hmod != hmod_old)
|
||||||
{
|
{
|
||||||
if (hmod != g_ddraw_module && lpLibFileName &&
|
|
||||||
(_strcmpi(lpLibFileName, "dinput.dll") == 0 || _strcmpi(lpLibFileName, "dinput") == 0 ||
|
|
||||||
_strcmpi(lpLibFileName, "dinput8.dll") == 0 || _strcmpi(lpLibFileName, "dinput8") == 0))
|
|
||||||
{
|
|
||||||
dinput_hook_init();
|
|
||||||
}
|
|
||||||
|
|
||||||
hook_init(FALSE);
|
hook_init(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1089,15 +1090,15 @@ HMODULE WINAPI fake_LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dw
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (hmod && hmod != g_ddraw_module && lpLibFileName &&
|
||||||
|
(_wcsicmp(lpLibFileName, L"dinput.dll") == 0 || _wcsicmp(lpLibFileName, L"dinput") == 0 ||
|
||||||
|
_wcsicmp(lpLibFileName, L"dinput8.dll") == 0 || _wcsicmp(lpLibFileName, L"dinput8") == 0))
|
||||||
|
{
|
||||||
|
dinput_hook_init();
|
||||||
|
}
|
||||||
|
|
||||||
if (hmod && hmod != hmod_old)
|
if (hmod && hmod != hmod_old)
|
||||||
{
|
{
|
||||||
if (hmod != g_ddraw_module && lpLibFileName &&
|
|
||||||
(_wcsicmp(lpLibFileName, L"dinput.dll") == 0 || _wcsicmp(lpLibFileName, L"dinput") == 0 ||
|
|
||||||
_wcsicmp(lpLibFileName, L"dinput8.dll") == 0 || _wcsicmp(lpLibFileName, L"dinput8") == 0))
|
|
||||||
{
|
|
||||||
dinput_hook_init();
|
|
||||||
}
|
|
||||||
|
|
||||||
hook_init(FALSE);
|
hook_init(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1119,11 +1120,12 @@ FARPROC WINAPI fake_GetProcAddress(HMODULE hModule, LPCSTR lpProcName)
|
|||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
if (g_config.hook == 4 && hModule && HIWORD(lpProcName))
|
if (g_config.hook == 4 && hModule && HIWORD(lpProcName))
|
||||||
{
|
{
|
||||||
if (strcmp(lpProcName, "DirectInputCreateA") == 0 ||
|
if (strcmp(lpProcName, "DirectInputCreateA") == 0 ||
|
||||||
strcmp(lpProcName, "DirectInputCreateEx") == 0 ||
|
strcmp(lpProcName, "DirectInputCreateEx") == 0 ||
|
||||||
strcmp(lpProcName, "DirectInput8Create") == 0)
|
strcmp(lpProcName, "DirectInput8Create") == 0)
|
||||||
{
|
{
|
||||||
hook = TRUE;
|
hook = TRUE;
|
||||||
|
g_dinput_hook_active = TRUE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user