Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix crash in callback and disable HCBT_CREATEWND until it is implemented correctly. Hooks seem to be working.

Browse source 
svn path=/trunk/; revision=34814
This commit is contained in:
James Tabor 2008-07-26 22:06:31 +00:00
parent 6320253c94
commit 5bf50a8d93
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
reactos/subsystems/win32/win32k/ntuser/callback.c
View file

@ -339,7 +339,7 @@ co_IntCallHookProc(INT HookId,
{ {
ULONG ArgumentLength; ULONG ArgumentLength;
PVOID Argument; PVOID Argument;
LRESULT Result; LRESULT Result = 0;
NTSTATUS Status; NTSTATUS Status;
PVOID ResultPointer; PVOID ResultPointer;
ULONG ResultLength; ULONG ResultLength;
@ -491,10 +491,21 @@ co_IntCallHookProc(INT HookId,
&ResultPointer, &ResultPointer,
&ResultLength); &ResultLength);
UserEnterCo();
_SEH_TRY
{
ProbeForRead((PVOID)*(LRESULT*)ResultPointer,
sizeof(LRESULT),
1);
/* Simulate old behaviour: copy into our local buffer */ /* Simulate old behaviour: copy into our local buffer */
Result = *(LRESULT*)ResultPointer; Result = *(LRESULT*)ResultPointer;
}
UserEnterCo(); _SEH_HANDLE
{
Result = 0;
}
_SEH_END;
IntCbFreeMemory(Argument); IntCbFreeMemory(Argument);

14
reactos/subsystems/win32/win32k/ntuser/hook.c
View file

@ -413,6 +413,7 @@ static LRESULT
FASTCALL FASTCALL
co_HOOK_CallHookNext(PHOOK Hook, INT Code, WPARAM wParam, LPARAM lParam) co_HOOK_CallHookNext(PHOOK Hook, INT Code, WPARAM wParam, LPARAM lParam)
{ {
DPRINT("CALLING HOOK %d\n",Hook->HookId);
return co_IntCallHookProc(Hook->HookId, Code, wParam, lParam, Hook->Proc, return co_IntCallHookProc(Hook->HookId, Code, wParam, lParam, Hook->Proc,
Hook->Ansi, &Hook->ModuleName); Hook->Ansi, &Hook->ModuleName);
} }
@ -708,16 +709,18 @@ UserCallNextHookEx(
} }
case WH_CBT: case WH_CBT:
DPRINT1("HOOK WH_CBT!\n");
switch (Code) switch (Code)
{ {
case HCBT_CREATEWND: // Use Ansi. case HCBT_CREATEWND: // Use Ansi.
lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); DPRINT1("HOOK HCBT_CREATEWND\n");
// lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam);
break; break;
case HCBT_MOVESIZE: case HCBT_MOVESIZE:
{ {
RECT rt; RECT rt;
DPRINT1("HOOK HCBT_MOVESIZE\n");
if (lParam) if (lParam)
{ {
_SEH_TRY _SEH_TRY
@ -749,7 +752,7 @@ UserCallNextHookEx(
case HCBT_ACTIVATE: case HCBT_ACTIVATE:
{ {
CBTACTIVATESTRUCT CbAs; CBTACTIVATESTRUCT CbAs;
DPRINT1("HOOK HCBT_ACTIVATE\n");
if (lParam) if (lParam)
{ {
_SEH_TRY _SEH_TRY
@ -781,6 +784,7 @@ UserCallNextHookEx(
The rest just use default. The rest just use default.
*/ */
default: default:
DPRINT1("HOOK HCBT_ %d\n",Code);
lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam);
break; break;
} }
@ -909,6 +913,10 @@ NtUserCallNextHookEx(
NextObj = IntGetNextHook(HookObj); NextObj = IntGetNextHook(HookObj);
ClientInfo->phkCurrent = NextObj; // Preset next hook from list. ClientInfo->phkCurrent = NextObj; // Preset next hook from list.
if (HookObj->HookId == WH_GETMESSAGE)
{
DPRINT1(" WH_GETMESSAGE, Hook %x NextHook %x \n", HookObj, NextObj);
}
UserCallNextHookEx( HookObj, Code, wParam, lParam, Ansi); UserCallNextHookEx( HookObj, Code, wParam, lParam, Ansi);
UserDereferenceObject(HookObj); UserDereferenceObject(HookObj);