backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 01:57:47 +01:00
Code Issues Projects Releases Activity

do full Detours hook with hook=3

Browse Source
This commit is contained in:
FunkyFr3sh 2021-08-06 02:07:50 +02:00
parent 6c225b8730
commit 8314ea5545
3 changed files with 58 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/hook.h
View File

@ -5,8 +5,11 @@
#include <windows.h> #include <windows.h>
typedef struct HOOKLISTDATA { char function_name[32]; PROC new_function; PROC* function; } HOOKLISTDATA; #define SKIP_HOOK2 0x00000001l
typedef struct HOOKLIST { char module_name[32]; BOOL enabled; HOOKLISTDATA data[24]; } HOOKLIST; #define SKIP_HOOK3 0x00000002l
typedef struct HOOKLISTDATA { char function_name[32]; PROC new_function; PROC* function; DWORD flags; } HOOKLISTDATA;
typedef struct HOOKLIST { char module_name[32]; HOOKLISTDATA data[24]; } HOOKLIST;
typedef BOOL(WINAPI* GETCURSORPOSPROC)(LPPOINT); typedef BOOL(WINAPI* GETCURSORPOSPROC)(LPPOINT);
typedef BOOL(WINAPI* CLIPCURSORPROC)(const RECT*); typedef BOOL(WINAPI* CLIPCURSORPROC)(const RECT*);
@ -78,7 +81,7 @@ void hook_early_init();
void hook_exit(); void hook_exit();
void hook_patch_iat(HMODULE hmod, BOOL unhook, char* module_name, char* function_name, PROC new_function); void hook_patch_iat(HMODULE hmod, BOOL unhook, char* module_name, char* function_name, PROC new_function);
void hook_patch_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks); void hook_patch_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks);
void hook_create(HOOKLIST* hooks); void hook_create(HOOKLIST* hooks, BOOL initial_hook);
void hook_revert(HOOKLIST* hooks); void hook_revert(HOOKLIST* hooks);
#endif #endif

113
src/hook.c
View File

@ -51,58 +51,54 @@ static HOOKLIST g_hooks[] =
{ {
{ {
"user32.dll", "user32.dll",
TRUE,
{ {
{ "GetCursorPos", (PROC)fake_GetCursorPos, (PROC*)&real_GetCursorPos }, { "GetCursorPos", (PROC)fake_GetCursorPos, (PROC*)&real_GetCursorPos, 0 },
{ "ClipCursor", (PROC)fake_ClipCursor, (PROC*)&real_ClipCursor }, { "ClipCursor", (PROC)fake_ClipCursor, (PROC*)&real_ClipCursor, 0 },
{ "ShowCursor", (PROC)fake_ShowCursor, (PROC*)&real_ShowCursor }, { "ShowCursor", (PROC)fake_ShowCursor, (PROC*)&real_ShowCursor, 0 },
{ "SetCursor", (PROC)fake_SetCursor, (PROC*)&real_SetCursor }, { "SetCursor", (PROC)fake_SetCursor, (PROC*)&real_SetCursor, 0 },
{ "GetWindowRect", (PROC)fake_GetWindowRect, (PROC*)&real_GetWindowRect }, { "GetWindowRect", (PROC)fake_GetWindowRect, (PROC*)&real_GetWindowRect, SKIP_HOOK3 },
{ "GetClientRect", (PROC)fake_GetClientRect, (PROC*)&real_GetClientRect }, { "GetClientRect", (PROC)fake_GetClientRect, (PROC*)&real_GetClientRect, SKIP_HOOK3 },
{ "ClientToScreen", (PROC)fake_ClientToScreen, (PROC*)&real_ClientToScreen }, { "ClientToScreen", (PROC)fake_ClientToScreen, (PROC*)&real_ClientToScreen, 0 },
{ "ScreenToClient", (PROC)fake_ScreenToClient, (PROC*)&real_ScreenToClient }, { "ScreenToClient", (PROC)fake_ScreenToClient, (PROC*)&real_ScreenToClient, 0 },
{ "SetCursorPos", (PROC)fake_SetCursorPos, (PROC*)&real_SetCursorPos }, { "SetCursorPos", (PROC)fake_SetCursorPos, (PROC*)&real_SetCursorPos, 0 },
{ "GetClipCursor", (PROC)fake_GetClipCursor, (PROC*)&real_GetClipCursor }, { "GetClipCursor", (PROC)fake_GetClipCursor, (PROC*)&real_GetClipCursor, 0 },
{ "WindowFromPoint", (PROC)fake_WindowFromPoint, (PROC*)&real_WindowFromPoint }, { "WindowFromPoint", (PROC)fake_WindowFromPoint, (PROC*)&real_WindowFromPoint, 0 },
{ "GetCursorInfo", (PROC)fake_GetCursorInfo, (PROC*)&real_GetCursorInfo }, { "GetCursorInfo", (PROC)fake_GetCursorInfo, (PROC*)&real_GetCursorInfo, 0 },
{ "GetSystemMetrics", (PROC)fake_GetSystemMetrics, (PROC*)&real_GetSystemMetrics }, { "GetSystemMetrics", (PROC)fake_GetSystemMetrics, (PROC*)&real_GetSystemMetrics, 0 },
{ "SetWindowPos", (PROC)fake_SetWindowPos, (PROC*)&real_SetWindowPos }, { "SetWindowPos", (PROC)fake_SetWindowPos, (PROC*)&real_SetWindowPos, 0 },
{ "MoveWindow", (PROC)fake_MoveWindow, (PROC*)&real_MoveWindow }, { "MoveWindow", (PROC)fake_MoveWindow, (PROC*)&real_MoveWindow, 0 },
{ "SendMessageA", (PROC)fake_SendMessageA, (PROC*)&real_SendMessageA }, { "SendMessageA", (PROC)fake_SendMessageA, (PROC*)&real_SendMessageA, 0 },
{ "SetWindowLongA", (PROC)fake_SetWindowLongA, (PROC*)&real_SetWindowLongA }, { "SetWindowLongA", (PROC)fake_SetWindowLongA, (PROC*)&real_SetWindowLongA, 0 },
{ "GetWindowLongA", (PROC)fake_GetWindowLongA, (PROC*)&real_GetWindowLongA }, { "GetWindowLongA", (PROC)fake_GetWindowLongA, (PROC*)&real_GetWindowLongA, 0 },
{ "EnableWindow", (PROC)fake_EnableWindow, (PROC*)&real_EnableWindow }, { "EnableWindow", (PROC)fake_EnableWindow, (PROC*)&real_EnableWindow, 0 },
{ "CreateWindowExA", (PROC)fake_CreateWindowExA, (PROC*)&real_CreateWindowExA }, { "CreateWindowExA", (PROC)fake_CreateWindowExA, (PROC*)&real_CreateWindowExA, 0 },
{ "DestroyWindow", (PROC)fake_DestroyWindow, (PROC*)&real_DestroyWindow }, { "DestroyWindow", (PROC)fake_DestroyWindow, (PROC*)&real_DestroyWindow, 0 },
{ "MapWindowPoints", (PROC)fake_MapWindowPoints, (PROC*)&real_MapWindowPoints }, { "MapWindowPoints", (PROC)fake_MapWindowPoints, (PROC*)&real_MapWindowPoints, 0 },
{ "ShowWindow", (PROC)fake_ShowWindow, (PROC*)&real_ShowWindow }, { "ShowWindow", (PROC)fake_ShowWindow, (PROC*)&real_ShowWindow, 0 },
{ "", NULL, NULL } { "", NULL, NULL, 0 }
} }
}, },
{ {
"gdi32.dll", "gdi32.dll",
TRUE,
{ {
{ "GetDeviceCaps", (PROC)fake_GetDeviceCaps, (PROC*)&real_GetDeviceCaps }, { "GetDeviceCaps", (PROC)fake_GetDeviceCaps, (PROC*)&real_GetDeviceCaps, SKIP_HOOK3 },
{ "", NULL, NULL } { "", NULL, NULL, 0 }
} }
}, },
{ {
"kernel32.dll", "kernel32.dll",
FALSE,
{ {
{ "LoadLibraryA", (PROC)fake_LoadLibraryA, (PROC*)&real_LoadLibraryA }, { "LoadLibraryA", (PROC)fake_LoadLibraryA, (PROC*)&real_LoadLibraryA, SKIP_HOOK2 | SKIP_HOOK3 },
{ "LoadLibraryW", (PROC)fake_LoadLibraryW, (PROC*)&real_LoadLibraryW }, { "LoadLibraryW", (PROC)fake_LoadLibraryW, (PROC*)&real_LoadLibraryW, SKIP_HOOK2 | SKIP_HOOK3 },
{ "LoadLibraryExA", (PROC)fake_LoadLibraryExA, (PROC*)&real_LoadLibraryExA }, { "LoadLibraryExA", (PROC)fake_LoadLibraryExA, (PROC*)&real_LoadLibraryExA, SKIP_HOOK2 | SKIP_HOOK3 },
{ "LoadLibraryExW", (PROC)fake_LoadLibraryExW, (PROC*)&real_LoadLibraryExW }, { "LoadLibraryExW", (PROC)fake_LoadLibraryExW, (PROC*)&real_LoadLibraryExW, SKIP_HOOK2 | SKIP_HOOK3 },
{ "", NULL, NULL } { "", NULL, NULL, 0 }
} }
}, },
{ {
"", "",
FALSE,
{ {
{ "", NULL, NULL } { "", NULL, NULL, 0 }
} }
} }
}; };
@ -112,7 +108,6 @@ void hook_patch_iat(HMODULE hmod, BOOL unhook, char* module_name, char* function
HOOKLIST hooks[2]; HOOKLIST hooks[2];
memset(&hooks, 0, sizeof(hooks)); memset(&hooks, 0, sizeof(hooks));
hooks[0].enabled = TRUE;
hooks[0].data[0].new_function = new_function; hooks[0].data[0].new_function = new_function;
strncpy(hooks[0].module_name, module_name, sizeof(hooks[0].module_name) - 1); strncpy(hooks[0].module_name, module_name, sizeof(hooks[0].module_name) - 1);
@ -148,9 +143,6 @@ void hook_patch_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks)
{ {
for (int i = 0; hooks[i].module_name[0]; i++) for (int i = 0; hooks[i].module_name[0]; i++)
{ {
if (!hooks[i].enabled)
continue;
char* imp_module_name = (char*)((DWORD)dos_header + (DWORD)(import_desc->Name)); char* imp_module_name = (char*)((DWORD)dos_header + (DWORD)(import_desc->Name));
if (_stricmp(imp_module_name, hooks[i].module_name) == 0) if (_stricmp(imp_module_name, hooks[i].module_name) == 0)
@ -222,18 +214,21 @@ void hook_patch_iat_list(HMODULE hmod, BOOL unhook, HOOKLIST* hooks)
#endif #endif
} }
void hook_create(HOOKLIST* hooks) void hook_create(HOOKLIST* hooks, BOOL initial_hook)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
if (g_hook_method == 2) if ((g_hook_method == 2 || g_hook_method == 3) && initial_hook)
{ {
for (int i = 0; hooks[i].module_name[0]; i++) for (int i = 0; hooks[i].module_name[0]; i++)
{ {
if (!hooks[i].enabled)
continue;
for (int x = 0; hooks[i].data[x].function_name[0]; x++) for (int x = 0; hooks[i].data[x].function_name[0]; x++)
{ {
if (g_hook_method == 2 && (hooks[i].data[x].flags & SKIP_HOOK2))
continue;
if (g_hook_method == 3 && (hooks[i].data[x].flags & SKIP_HOOK3))
continue;
DetourTransactionBegin(); DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread()); DetourUpdateThread(GetCurrentThread());
DetourAttach((PVOID*)hooks[i].data[x].function, (PVOID)hooks[i].data[x].new_function); DetourAttach((PVOID*)hooks[i].data[x].function, (PVOID)hooks[i].data[x].new_function);
@ -304,15 +299,18 @@ void hook_create(HOOKLIST* hooks)
void hook_revert(HOOKLIST* hooks) void hook_revert(HOOKLIST* hooks)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
if (g_hook_method == 2) if (g_hook_method == 2 || g_hook_method == 3)
{ {
for (int i = 0; hooks[i].module_name[0]; i++) for (int i = 0; hooks[i].module_name[0]; i++)
{ {
if (!hooks[i].enabled)
continue;
for (int x = 0; hooks[i].data[x].function_name[0]; x++) for (int x = 0; hooks[i].data[x].function_name[0]; x++)
{ {
if (g_hook_method == 2 && (hooks[i].data[x].flags & SKIP_HOOK2))
continue;
if (g_hook_method == 3 && (hooks[i].data[x].flags & SKIP_HOOK3))
continue;
DetourTransactionBegin(); DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread()); DetourUpdateThread(GetCurrentThread());
DetourDetach((PVOID*)hooks[i].data[x].function, (PVOID)hooks[i].data[x].new_function); DetourDetach((PVOID*)hooks[i].data[x].function, (PVOID)hooks[i].data[x].new_function);
@ -375,8 +373,10 @@ void hook_init()
{ {
if (!g_hook_active || g_hook_method == 3 || g_hook_method == 4) if (!g_hook_active || g_hook_method == 3 || g_hook_method == 4)
{ {
BOOL initial_hook = !g_hook_active;
#ifdef _MSC_VER #ifdef _MSC_VER
if (!g_hook_active && g_hook_method == 3) if (initial_hook && g_hook_method == 3)
{ {
real_DirectInputCreateA = real_DirectInputCreateA =
(DIRECTINPUTCREATEAPROC)GetProcAddress(LoadLibraryA("dinput.dll"), "DirectInputCreateA"); (DIRECTINPUTCREATEAPROC)GetProcAddress(LoadLibraryA("dinput.dll"), "DirectInputCreateA");
@ -426,18 +426,7 @@ void hook_init()
g_hook_active = TRUE; g_hook_active = TRUE;
if (g_hook_method == 3 || g_hook_method == 4) hook_create((HOOKLIST*)&g_hooks, initial_hook);
{
for (int i = 0; g_hooks[i].module_name[0]; i++)
{
if (_stricmp(g_hooks[i].module_name, "kernel32.dll") == 0)
{
g_hooks[i].enabled = TRUE;
}
}
}
hook_create((HOOKLIST*)&g_hooks);
} }
} }

2
src/winapi_hooks.c
View File

@ -360,7 +360,7 @@ LRESULT WINAPI fake_SendMessageA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lPar
lParam = MAKELPARAM(x + g_ddraw->render.viewport.x, y + g_ddraw->render.viewport.y); lParam = MAKELPARAM(x + g_ddraw->render.viewport.x, y + g_ddraw->render.viewport.y);
} }
if (g_ddraw && g_ddraw->hwnd == hWnd && Msg == WM_SIZE && g_hook_method != 2) if (g_ddraw && g_ddraw->hwnd == hWnd && Msg == WM_SIZE && (g_hook_method != 2 && g_hook_method != 3))
{ {
Msg = WM_SIZE_DDRAW; Msg = WM_SIZE_DDRAW;
} }