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

- Implement HCBT_CREATEWND support. Tested with user32 cross wine tests, still hangs on win test. For Christoph.

Browse source 
svn path=/trunk/; revision=41614
This commit is contained in:
James Tabor 2009-06-25 20:39:32 +00:00
parent 8ce3178f05
commit f1ab1a2cae
2 changed files with 106 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -347,8 +347,10 @@ co_IntCallHookProc(INT HookId,
CBT_CREATEWNDW *CbtCreateWnd =NULL; CBT_CREATEWNDW *CbtCreateWnd =NULL;
PCHAR Extra; PCHAR Extra;
PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra ; PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra ;
PUNICODE_STRING WindowName = NULL; UNICODE_STRING WindowName;
PUNICODE_STRING ClassName = NULL; UNICODE_STRING ClassName;
PANSI_STRING asWindowName;
PANSI_STRING asClassName;
ArgumentLength = sizeof(HOOKPROC_CALLBACK_ARGUMENTS) - sizeof(WCHAR) ArgumentLength = sizeof(HOOKPROC_CALLBACK_ARGUMENTS) - sizeof(WCHAR)
+ ModuleName->Length; + ModuleName->Length;
@ -360,12 +362,29 @@ co_IntCallHookProc(INT HookId,
case HCBT_CREATEWND: case HCBT_CREATEWND:
CbtCreateWnd = (CBT_CREATEWNDW *) lParam; CbtCreateWnd = (CBT_CREATEWNDW *) lParam;
ArgumentLength += sizeof(HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS); ArgumentLength += sizeof(HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS);
WindowName = (PUNICODE_STRING) (CbtCreateWnd->lpcs->lpszName);
ArgumentLength += WindowName->Length + sizeof(WCHAR); asWindowName = (PANSI_STRING)&WindowName;
ClassName = (PUNICODE_STRING) (CbtCreateWnd->lpcs->lpszClass); asClassName = (PANSI_STRING)&ClassName;
if (! IS_ATOM(ClassName->Buffer))
if (Ansi)
{ {
ArgumentLength += ClassName->Length + sizeof(WCHAR); RtlInitAnsiString(asWindowName, (PCSZ)CbtCreateWnd->lpcs->lpszName);
ArgumentLength += WindowName.Length + sizeof(CHAR);
}
else
{
RtlInitUnicodeString(&WindowName, CbtCreateWnd->lpcs->lpszName);
ArgumentLength += WindowName.Length + sizeof(WCHAR);
}
if (Ansi)
RtlInitAnsiString(asClassName, (PCSZ)CbtCreateWnd->lpcs->lpszClass);
else
RtlInitUnicodeString(&ClassName, CbtCreateWnd->lpcs->lpszClass);
if (! IS_ATOM(ClassName.Buffer))
{
ArgumentLength += ClassName.Length + sizeof(WCHAR);
} }
break; break;
default: default:
@ -430,19 +449,32 @@ co_IntCallHookProc(INT HookId,
CbtCreatewndExtra->Cs = *(CbtCreateWnd->lpcs); CbtCreatewndExtra->Cs = *(CbtCreateWnd->lpcs);
CbtCreatewndExtra->WndInsertAfter = CbtCreateWnd->hwndInsertAfter; CbtCreatewndExtra->WndInsertAfter = CbtCreateWnd->hwndInsertAfter;
Extra = (PCHAR) (CbtCreatewndExtra + 1); Extra = (PCHAR) (CbtCreatewndExtra + 1);
RtlCopyMemory(Extra, WindowName->Buffer, WindowName->Length); RtlCopyMemory(Extra, WindowName.Buffer, WindowName.Length);
CbtCreatewndExtra->Cs.lpszName = (LPCWSTR) (Extra - (PCHAR) CbtCreatewndExtra); CbtCreatewndExtra->Cs.lpszName = (LPCWSTR) (Extra - (PCHAR) CbtCreatewndExtra);
CbtCreatewndExtra->Cs.lpszClass = ClassName->Buffer; CbtCreatewndExtra->Cs.lpszClass = ClassName.Buffer;
Extra += WindowName->Length; Extra += WindowName.Length;
*((WCHAR *) Extra) = L'\0'; if (Ansi)
Extra += sizeof(WCHAR);
if (! IS_ATOM(ClassName->Buffer))
{ {
RtlCopyMemory(Extra, ClassName->Buffer, ClassName->Length); *((CHAR *) Extra) = '\0';
Extra += sizeof(CHAR);
}
else
{
*((WCHAR *) Extra) = L'\0';
Extra += sizeof(WCHAR);
}
if (! IS_ATOM(ClassName.Buffer))
{
RtlCopyMemory(Extra, ClassName.Buffer, ClassName.Length);
CbtCreatewndExtra->Cs.lpszClass = CbtCreatewndExtra->Cs.lpszClass =
(LPCWSTR) MAKELONG(Extra - (PCHAR) CbtCreatewndExtra, 1); (LPCWSTR) MAKELONG(Extra - (PCHAR) CbtCreatewndExtra, 1);
Extra += ClassName->Length; Extra += ClassName.Length;
*((WCHAR *) Extra) = L'\0';
if (Ansi)
*((CHAR *) Extra) = '\0';
else
*((WCHAR *) Extra) = L'\0';
} }
break; break;
} }

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

@ -788,10 +788,66 @@ UserCallNextHookEx(PHOOK Hook,
DPRINT1("HOOK WH_CBT!\n"); DPRINT1("HOOK WH_CBT!\n");
switch (Code) switch (Code)
{ {
case HCBT_CREATEWND: /* Use Ansi. */ case HCBT_CREATEWND:
{
LPCBT_CREATEWNDW pcbtcww = (LPCBT_CREATEWNDW)lParam;
DPRINT1("HOOK HCBT_CREATEWND\n"); DPRINT1("HOOK HCBT_CREATEWND\n");
/* lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); */ _SEH2_TRY
{
if (Ansi)
{
ProbeForRead( pcbtcww,
sizeof(CBT_CREATEWNDA),
1);
ProbeForWrite(pcbtcww->lpcs,
sizeof(CREATESTRUCTA),
1);
ProbeForRead( pcbtcww->lpcs->lpszName,
sizeof(CHAR),
1);
if (!IS_ATOM(pcbtcww->lpcs->lpszClass))
{
ProbeForRead( pcbtcww->lpcs->lpszClass,
sizeof(CHAR),
1);
}
}
else
{
ProbeForRead( pcbtcww,
sizeof(CBT_CREATEWNDW),
1);
ProbeForWrite(pcbtcww->lpcs,
sizeof(CREATESTRUCTW),
1);
ProbeForRead( pcbtcww->lpcs->lpszName,
sizeof(WCHAR),
1);
if (!IS_ATOM(pcbtcww->lpcs->lpszClass))
{
ProbeForRead( pcbtcww->lpcs->lpszClass,
sizeof(WCHAR),
1);
}
}
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
BadChk = TRUE;
}
_SEH2_END;
if (BadChk)
{
DPRINT1("HOOK HCBT_CREATEWND write ERROR!\n");
}
/* The next call handles the structures. */
if (!BadChk) lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam);
break; break;
}
case HCBT_MOVESIZE: case HCBT_MOVESIZE:
{ {