[Win32k|User32] - Cleanup and added debug prints.

svn path=/trunk/; revision=49606
This commit is contained in:
James Tabor 2010-11-16 05:30:20 +00:00
parent 3d573b97a6
commit c65ab760bf
2 changed files with 6 additions and 3 deletions

View file

@ -451,6 +451,7 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength)
{ {
case WH_CBT: case WH_CBT:
{ {
//ERR("WH_CBT: Code %d\n", Common->Code);
switch(Common->Code) switch(Common->Code)
{ {
case HCBT_CREATEWND: case HCBT_CREATEWND:
@ -461,7 +462,7 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength)
CbtCreatewndw.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; CbtCreatewndw.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter;
wParam = Common->wParam; wParam = Common->wParam;
lParam = (LPARAM) &CbtCreatewndw; lParam = (LPARAM) &CbtCreatewndw;
ERR("HCBT_CREATEWND: hWnd 0x%x Name 0x%x Class 0x%x\n", Common->wParam, Csw.lpszName, Csw.lpszClass); //ERR("HCBT_CREATEWND: hWnd 0x%x Name 0x%x Class 0x%x\n", Common->wParam, Csw.lpszName, Csw.lpszClass);
break; break;
case HCBT_CLICKSKIPPED: case HCBT_CLICKSKIPPED:
pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); pMHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam);
@ -518,13 +519,13 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength)
break; break;
} }
case WH_KEYBOARD_LL: case WH_KEYBOARD_LL:
ERR("WH_KEYBOARD_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); //ERR("WH_KEYBOARD_LL: Code %d, wParam %d\n",Common->Code,Common->wParam);
pKeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); pKeyboardLlData = (PKBDLLHOOKSTRUCT)((PCHAR) Common + Common->lParam);
RtlCopyMemory(&KeyboardLlData, pKeyboardLlData, sizeof(KBDLLHOOKSTRUCT)); RtlCopyMemory(&KeyboardLlData, pKeyboardLlData, sizeof(KBDLLHOOKSTRUCT));
Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &KeyboardLlData); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &KeyboardLlData);
break; break;
case WH_MOUSE_LL: case WH_MOUSE_LL:
ERR("WH_MOUSE_LL: Code %d, wParam %d\n",Common->Code,Common->wParam); //ERR("WH_MOUSE_LL: Code %d, wParam %d\n",Common->Code,Common->wParam);
pMouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); pMouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam);
RtlCopyMemory(&MouseLlData, pMouseLlData, sizeof(MSLLHOOKSTRUCT)); RtlCopyMemory(&MouseLlData, pMouseLlData, sizeof(MSLLHOOKSTRUCT));
Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &MouseLlData); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &MouseLlData);

View file

@ -352,6 +352,7 @@ co_IntCallHookProc(INT HookId,
switch(HookId) switch(HookId)
{ {
case WH_CBT: case WH_CBT:
DPRINT("WH_CBT: Code %d\n", Code);
switch(Code) switch(Code)
{ {
case HCBT_CREATEWND: case HCBT_CREATEWND:
@ -524,6 +525,7 @@ co_IntCallHookProc(INT HookId,
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("Failure to make Callback! Status 0x%x",Status);
goto Fault_Exit; goto Fault_Exit;
} }
/* Support write backs... SEH is in UserCallNextHookEx. */ /* Support write backs... SEH is in UserCallNextHookEx. */