Author: jimtabor Date: Sat Oct 5 19:57:22 2013 New Revision: 60539
URL: http://svn.reactos.org/svn/reactos?rev=60539&view=rev Log: [Win32ss] - Add support for loading hook modules.
Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callback.h trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/user32/windows/hook.c
Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h?... ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -49,7 +49,10 @@ WPARAM wParam; LPARAM lParam; HOOKPROC Proc; + INT Mod; + ULONG_PTR offPfn; BOOLEAN Ansi; + WCHAR ModuleName[512]; } HOOKPROC_CALLBACK_ARGUMENTS, *PHOOKPROC_CALLBACK_ARGUMENTS;
typedef struct _HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS
Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callbac... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -448,6 +448,8 @@ WPARAM wParam, LPARAM lParam, HOOKPROC Proc, + INT Mod, + ULONG_PTR offPfn, BOOLEAN Ansi, PUNICODE_STRING ModuleName) { @@ -575,7 +577,11 @@ Common->wParam = wParam; Common->lParam = lParam; Common->Proc = Proc; + Common->Mod = Mod; + Common->offPfn = offPfn; Common->Ansi = Ansi; + RtlZeroMemory(&Common->ModuleName, sizeof(Common->ModuleName)); + RtlCopyMemory(&Common->ModuleName, ModuleName->Buffer, ModuleName->Length); Extra = (PCHAR) Common + sizeof(HOOKPROC_CALLBACK_ARGUMENTS);
switch(HookId)
Modified: trunk/reactos/win32ss/user/ntuser/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callbac... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -29,6 +29,8 @@ WPARAM wParam, LPARAM lParam, HOOKPROC Proc, + INT Mod, + ULONG_PTR offPfn, BOOLEAN Ansi, PUNICODE_STRING ModuleName);
Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c?... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -349,6 +349,8 @@ wParam, lParam, phk->Proc, + phk->ihmod, + phk->offPfn, phk->Ansi, &phk->ModuleName);
@@ -373,6 +375,8 @@ wParam, lParam, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); } @@ -1233,6 +1237,8 @@ wParam, lParam, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); if (ClientInfo) @@ -1309,6 +1315,8 @@ wParam, lParam, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); }
Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/message... ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -2698,6 +2698,8 @@ ((ClientInfo->CI_flags & CI_CURTHPRHOOK) ? 1 : 0), (LPARAM)&CWP, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); } @@ -2715,6 +2717,8 @@ ((ClientInfo->CI_flags & CI_CURTHPRHOOK) ? 1 : 0), (LPARAM)&CWPR, Hook->Proc, + Hook->ihmod, + Hook->offPfn, Hook->Ansi, &Hook->ModuleName); }
Modified: trunk/reactos/win32ss/user/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/windows... ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] Sat Oct 5 19:57:22 2013 @@ -567,12 +567,33 @@ CWPRETSTRUCT *pCWPR; PRECTL prl; LPCBTACTIVATESTRUCT pcbtas; + HOOKPROC Proc; WPARAM wParam = 0; LPARAM lParam = 0; LRESULT Result = 0; BOOL Hit = FALSE; + HMODULE mod = NULL;
Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; + + Proc = Common->Proc; + // HookProc Justin Case module is from another process. + if (Common->offPfn && Common->Mod) + { + if (!(mod = GetModuleHandleW((LPCWSTR)Common->ModuleName))) + { + TRACE("Reloading Hook Module.\n"); + if (!(mod = LoadLibraryExW((LPCWSTR)Common->ModuleName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) + { + ERR("Failed to load Hook Module.\n"); + } + } + if (mod) + { + TRACE("Loading Hook Module.\n"); + Proc = (HOOKPROC)((char *)mod + Common->offPfn); + } + }
switch(Common->HookId) { @@ -613,15 +634,16 @@ lParam = Common->lParam; break; default: + if (mod) FreeLibrary(mod); ERR("HCBT_ not supported = %d\n", Common->Code); return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); }
- if (Common->Proc) + if (Proc) { _SEH2_TRY { - Result = Common->Proc(Common->Code, wParam, lParam); + Result = Proc(Common->Code, wParam, lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -631,7 +653,7 @@ } else { - ERR("Null Proc! Common = 0x%x, Proc = 0x%x\n",Common,Common->Proc); + ERR("Null Proc! Common = 0x%x, Proc = 0x%x\n",Common,Proc); } switch(Common->Code) { @@ -649,19 +671,19 @@ //ERR("WH_KEYBOARD_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); pKeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); RtlCopyMemory(&KeyboardLlData, pKeyboardLlData, sizeof(KBDLLHOOKSTRUCT)); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &KeyboardLlData); + Result = Proc(Common->Code, Common->wParam, (LPARAM) &KeyboardLlData); break; case WH_MOUSE_LL: //ERR("WH_MOUSE_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); pMouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); RtlCopyMemory(&MouseLlData, pMouseLlData, sizeof(MSLLHOOKSTRUCT)); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &MouseLlData); + Result = Proc(Common->Code, Common->wParam, (LPARAM) &MouseLlData); break; case WH_MOUSE: /* SEH support */ pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); _SEH2_TRY { - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pMHook); + Result = Proc(Common->Code, Common->wParam, (LPARAM) pMHook); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -683,7 +705,7 @@ pCWP->lParam); pCWP->lParam = (LPARAM)((PCHAR)pCWP + sizeof(CWPSTRUCT)); } - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWP); + Result = Proc(Common->Code, Common->wParam, (LPARAM) pCWP); HeapFree(GetProcessHeap(), 0, pCWP); break; case WH_CALLWNDPROCRET: @@ -697,7 +719,7 @@ pCWPR->lParam); pCWPR->lParam = (LPARAM)((PCHAR)pCWPR + sizeof(CWPRETSTRUCT)); } - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWPR); + Result = Proc(Common->Code, Common->wParam, (LPARAM) pCWPR); HeapFree(GetProcessHeap(), 0, pCWPR); break; case WH_MSGFILTER: /* All SEH support */ @@ -709,7 +731,7 @@ // ERR("pMsg %d pcMsg %d\n",pMsg->message, pcMsg->message); _SEH2_TRY { - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pcMsg); + Result = Proc(Common->Code, Common->wParam, (LPARAM) pcMsg); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -722,12 +744,12 @@ break; case WH_KEYBOARD: case WH_SHELL: - Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); + Result = Proc(Common->Code, Common->wParam, Common->lParam); break; case WH_FOREGROUNDIDLE: /* <-- SEH support */ _SEH2_TRY { - Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); + Result = Proc(Common->Code, Common->wParam, Common->lParam); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -736,12 +758,14 @@ _SEH2_END; break; default: + if (mod) FreeLibrary(mod); return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); } if (Hit) { - ERR("Hook Exception! Id: %d, Code %d, Proc 0x%x\n",Common->HookId,Common->Code,Common->Proc); - } + ERR("Hook Exception! Id: %d, Code %d, Proc 0x%x\n",Common->HookId,Common->Code,Proc); + } + if (mod) FreeLibrary(mod); return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); }
-
jimtabor＠svn.reactos.org