Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 18:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1507 patch from w3seek : This patch fixes more issues with NtUserFindWindowEx. (one example of bugs have been fixed with this patch is the tray icon)

Browse source 
svn path=/trunk/; revision=21956
This commit is contained in:
Magnus Olsen 2006-05-20 22:09:42 +00:00
parent 6e418a0fd9
commit 3e649bb0dc
3 changed files with 161 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsystems/win32/win32k/include/class.h
View file

@ -69,6 +69,10 @@ IntGetClassAtom(IN PUNICODE_STRING ClassName,
OUT PWINDOWCLASS *BaseClass OPTIONAL,
OUT PWINDOWCLASS **Link OPTIONAL);
BOOL
IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName,
OUT RTL_ATOM *Atom);
BOOL
IntCheckProcessDesktopClasses(IN PDESKTOP Desktop,
IN BOOL FreeOnFailure);

45
reactos/subsystems/win32/win32k/ntuser/class.c
View file

@ -835,12 +835,11 @@ IntCreateClass(IN CONST WNDCLASSEXW* lpwcx,
}
ClassSize = sizeof(WINDOWCLASS) + lpwcx->cbClsExtra;
ClassSize += ClassName->Length + sizeof(UNICODE_NULL);
ClassSize += MenuName->Length + sizeof(UNICODE_NULL);
if (ClassName->Length != 0)
ClassSize += RtlUnicodeStringToAnsiSize(ClassName);
if (MenuName->Length != 0)
{
ClassSize += MenuName->Length + sizeof(UNICODE_NULL);
ClassSize += RtlUnicodeStringToAnsiSize(MenuName);
}
if (Desktop != NULL)
{
@ -996,14 +995,11 @@ IntFindClass(IN RTL_ATOM Atom,
return Class;
}
RTL_ATOM
IntGetClassAtom(IN PUNICODE_STRING ClassName,
IN HINSTANCE hInstance OPTIONAL,
IN PW32PROCESSINFO pi OPTIONAL,
OUT PWINDOWCLASS *BaseClass OPTIONAL,
OUT PWINDOWCLASS **Link OPTIONAL)
BOOL
IntGetAtomFromStringOrAtom(IN PUNICODE_STRING ClassName,
OUT RTL_ATOM *Atom)
{
RTL_ATOM Atom = (RTL_ATOM)0;
BOOL Ret = FALSE;
if (ClassName->Length != 0)
{
@ -1038,8 +1034,12 @@ IntGetClassAtom(IN PUNICODE_STRING ClassName,
/* lookup the atom */
Status = RtlLookupAtomInAtomTable(gAtomTable,
AtomName,
&Atom);
if (!NT_SUCCESS(Status))
Atom);
if (NT_SUCCESS(Status))
{
Ret = TRUE;
}
else
{
if (Status == STATUS_OBJECT_NAME_NOT_FOUND)
{
@ -1054,10 +1054,25 @@ IntGetClassAtom(IN PUNICODE_STRING ClassName,
else
{
ASSERT(IS_ATOM(ClassName->Buffer));
Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer);
*Atom = (RTL_ATOM)((ULONG_PTR)ClassName->Buffer);
Ret = TRUE;
}
if (BaseClass != NULL && Atom != (RTL_ATOM)0)
return Ret;
}
RTL_ATOM
IntGetClassAtom(IN PUNICODE_STRING ClassName,
IN HINSTANCE hInstance OPTIONAL,
IN PW32PROCESSINFO pi OPTIONAL,
OUT PWINDOWCLASS *BaseClass OPTIONAL,
OUT PWINDOWCLASS **Link OPTIONAL)
{
RTL_ATOM Atom = (RTL_ATOM)0;
if (IntGetAtomFromStringOrAtom(ClassName,
&Atom) &&
BaseClass != NULL && Atom != (RTL_ATOM)0)
{
PWINDOWCLASS Class;

269
reactos/subsystems/win32/win32k/ntuser/window.c
View file

@ -2344,7 +2344,7 @@ NtUserFillWindow(DWORD Unknown0,
}
HWND FASTCALL
static HWND FASTCALL
IntFindWindow(PWINDOW_OBJECT Parent,
PWINDOW_OBJECT ChildAfter,
RTL_ATOM ClassAtom,
@ -2356,7 +2356,7 @@ IntFindWindow(PWINDOW_OBJECT Parent,
ASSERT(Parent);
CheckWindowName = (WindowName && (WindowName->Length > 0));
CheckWindowName = WindowName->Length != 0;
if((List = IntWinListChildren(Parent)))
{
@ -2425,15 +2425,67 @@ NtUserFindWindowEx(HWND hwndParent,
PUNICODE_STRING ucWindowName)
{
PWINDOW_OBJECT Parent, ChildAfter;
UNICODE_STRING ClassName, WindowName;
NTSTATUS Status;
UNICODE_STRING ClassName = {0}, WindowName = {0};
HWND Desktop, Ret = NULL;
RTL_ATOM ClassAtom;
RTL_ATOM ClassAtom = (RTL_ATOM)0;
DECLARE_RETURN(HWND);
DPRINT("Enter NtUserFindWindowEx\n");
UserEnterShared();
_SEH_TRY
{
if (ucClassName != NULL)
{
ClassName = ProbeForReadUnicodeString(ucClassName);
if (ClassName.Length != 0)
{
ProbeForRead(ClassName.Buffer,
ClassName.Length,
sizeof(WCHAR));
}
else if (IS_ATOM(ClassName.Buffer))
{
if (!IntGetAtomFromStringOrAtom(&ClassName,
&ClassAtom))
{
_SEH_LEAVE;
}
}
}
if (ucWindowName != NULL)
{
WindowName = ProbeForReadUnicodeString(ucWindowName);
if (WindowName.Length != 0)
{
ProbeForRead(WindowName.Buffer,
WindowName.Length,
sizeof(WCHAR));
}
}
}
_SEH_HANDLE
{
SetLastNtError(_SEH_GetExceptionCode());
RETURN(NULL);
}
_SEH_END;
if (ucClassName != NULL && ClassName.Length == 0)
{
if (!IS_ATOM(ClassName.Buffer))
{
SetLastWin32Error(ERROR_INVALID_PARAMETER);
RETURN(NULL);
}
else if (ClassAtom == (RTL_ATOM)0)
{
/* LastError code was set by IntGetAtomFromStringOrAtom */
RETURN(NULL);
}
}
Desktop = IntGetCurrentThreadDesktopWindow();
if(hwndParent == NULL)
@ -2456,158 +2508,91 @@ NtUserFindWindowEx(HWND hwndParent,
RETURN( NULL);
}
/* copy the window name */
Status = IntSafeCopyUnicodeString(&WindowName, ucWindowName);
if(!NT_SUCCESS(Status))
_SEH_TRY
{
SetLastNtError(Status);
goto Cleanup3;
}
if(Parent->hSelf == Desktop)
{
HWND *List, *phWnd;
PWINDOW_OBJECT TopLevelWindow;
BOOLEAN CheckWindowName;
BOOLEAN WindowMatches;
BOOLEAN ClassMatches;
/* safely copy the class name */
Status = MmCopyFromCaller(&ClassName, ucClassName, sizeof(UNICODE_STRING));
if(!NT_SUCCESS(Status))
{
SetLastNtError(Status);
goto Cleanup2;
}
if(ClassName.Length > 0 && ClassName.Buffer)
{
WCHAR *buf;
/* safely copy the class name string (NULL terminated because class-lookup
depends on it... */
buf = ExAllocatePoolWithTag(PagedPool, ClassName.Length + sizeof(WCHAR), TAG_STRING);
if(!buf)
{
SetLastWin32Error(STATUS_INSUFFICIENT_RESOURCES);
goto Cleanup2;
}
Status = MmCopyFromCaller(buf, ClassName.Buffer, ClassName.Length);
if(!NT_SUCCESS(Status))
{
ExFreePool(buf);
SetLastNtError(Status);
goto Cleanup2;
}
ClassName.Buffer = buf;
/* make sure the string is null-terminated */
buf += ClassName.Length / sizeof(WCHAR);
*buf = L'\0';
}
/* windows searches through all top-level windows if the parent is the desktop
window */
/* find the class object */
if(ClassName.Buffer)
{
PWINSTATION_OBJECT WinStaObject;
if((List = IntWinListChildren(Parent)))
{
phWnd = List;
if (PsGetWin32Thread()->Desktop == NULL)
{
SetLastWin32Error(ERROR_INVALID_HANDLE);
goto Cleanup;
}
if(ChildAfter)
{
/* skip handles before and including ChildAfter */
while(*phWnd && (*(phWnd++) != ChildAfter->hSelf))
;
}
WinStaObject = PsGetWin32Thread()->Desktop->WindowStation;
CheckWindowName = WindowName.Length != 0;
Status = RtlLookupAtomInAtomTable(
WinStaObject->AtomTable,
ClassName.Buffer,
&ClassAtom);
/* search children */
while(*phWnd)
{
if(!(TopLevelWindow = UserGetWindowObject(*(phWnd++))))
{
continue;
}
if (!NT_SUCCESS(Status))
{
DPRINT1("Failed to lookup class atom!\n");
SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST);
goto Cleanup;
}
}
/* Do not send WM_GETTEXT messages in the kernel mode version!
The user mode version however calls GetWindowText() which will
send WM_GETTEXT messages to windows belonging to its processes */
WindowMatches = !CheckWindowName || !RtlCompareUnicodeString(
&WindowName, &TopLevelWindow->WindowName, TRUE);
ClassMatches = (ClassAtom == (RTL_ATOM)0) ||
ClassAtom == TopLevelWindow->Class->Atom;
if(Parent->hSelf == Desktop)
{
HWND *List, *phWnd;
PWINDOW_OBJECT TopLevelWindow;
BOOLEAN CheckWindowName;
BOOLEAN CheckClassName;
BOOLEAN WindowMatches;
BOOLEAN ClassMatches;
if (WindowMatches && ClassMatches)
{
Ret = TopLevelWindow->hSelf;
break;
}
/* windows searches through all top-level windows if the parent is the desktop
window */
if (IntFindWindow(TopLevelWindow, NULL, ClassAtom, &WindowName))
{
/* window returns the handle of the top-level window, in case it found
the child window */
Ret = TopLevelWindow->hSelf;
break;
}
if((List = IntWinListChildren(Parent)))
{
phWnd = List;
if(ChildAfter)
{
/* skip handles before and including ChildAfter */
while(*phWnd && (*(phWnd++) != ChildAfter->hSelf))
;
}
CheckWindowName = WindowName.Length > 0;
CheckClassName = ClassName.Buffer != NULL;
/* search children */
while(*phWnd)
{
if(!(TopLevelWindow = UserGetWindowObject(*(phWnd++))))
{
continue;
}
/* Do not send WM_GETTEXT messages in the kernel mode version!
The user mode version however calls GetWindowText() which will
send WM_GETTEXT messages to windows belonging to its processes */
WindowMatches = !CheckWindowName || !RtlCompareUnicodeString(
&WindowName, &TopLevelWindow->WindowName, TRUE);
ClassMatches = !CheckClassName ||
ClassAtom == TopLevelWindow->Class->Atom;
if (WindowMatches && ClassMatches)
{
Ret = TopLevelWindow->hSelf;
break;
}
if (IntFindWindow(TopLevelWindow, NULL, ClassAtom, &WindowName))
{
/* window returns the handle of the top-level window, in case it found
the child window */
Ret = TopLevelWindow->hSelf;
break;
}
}
ExFreePool(List);
}
}
else
Ret = IntFindWindow(Parent, ChildAfter, ClassAtom, &WindowName);
}
ExFreePool(List);
}
}
else
Ret = IntFindWindow(Parent, ChildAfter, ClassAtom, &WindowName);
#if 0
if(Ret == NULL && hwndParent == NULL && hwndChildAfter == NULL)
{
/* FIXME - if both hwndParent and hwndChildAfter are NULL, we also should
search the message-only windows. Should this also be done if
Parent is the desktop window??? */
PWINDOW_OBJECT MsgWindows;
if(Ret == NULL && hwndParent == NULL && hwndChildAfter == NULL)
{
/* FIXME - if both hwndParent and hwndChildAfter are NULL, we also should
search the message-only windows. Should this also be done if
Parent is the desktop window??? */
PWINDOW_OBJECT MsgWindows;
if((MsgWindows = UserGetWindowObject(IntGetMessageWindow())))
{
Ret = IntFindWindow(MsgWindows, ChildAfter, ClassAtom, &WindowName);
}
}
if((MsgWindows = UserGetWindowObject(IntGetMessageWindow())))
{
Ret = IntFindWindow(MsgWindows, ChildAfter, ClassAtom, &WindowName);
}
}
#endif
Cleanup:
if(ClassName.Length > 0 && ClassName.Buffer)
ExFreePool(ClassName.Buffer);
Cleanup2:
RtlFreeUnicodeString(&WindowName);
Cleanup3:
}
_SEH_HANDLE
{
SetLastNtError(_SEH_GetExceptionCode());
Ret = NULL;
}
_SEH_END;
RETURN( Ret);