Prevent a null access when the first show-desktop is called. Hidden by low-memory mapped in csrss.

svn path=/trunk/; revision=38886
This commit is contained in:
Art Yerkes 2009-01-18 12:11:32 +00:00
parent 56c6d214ab
commit 26a6195563

View file

@ -885,6 +885,7 @@ co_WinPosSetWindowPos(
HDC Dc;
RECT CopyRect;
RECT TempRect;
PWINDOW_OBJECT Ancestor;
ASSERT_REFS_CO(Window);
@ -923,11 +924,10 @@ co_WinPosSetWindowPos(
return FALSE;
}
Ancestor = UserGetAncestor(Window, GA_PARENT);
if ((WinPos.flags & (SWP_NOZORDER | SWP_HIDEWINDOW | SWP_SHOWWINDOW)) !=
SWP_NOZORDER &&
// UserGetAncestor(WinPos.hwnd, GA_PARENT) == IntGetDesktopWindow())
//faxme: is WinPos.hwnd constant?? (WinPos.hwnd = Window->hSelf above)
UserGetAncestor(Window, GA_PARENT)->hSelf == IntGetDesktopWindow())
Ancestor && Ancestor->hSelf == IntGetDesktopWindow())
{
WinPos.hwndInsertAfter = WinPosDoOwnedPopups(WinPos.hwnd, WinPos.hwndInsertAfter);
}