- Attempt to fix CORE-7554.

svn path=/trunk/; revision=60881
This commit is contained in:
James Tabor 2013-11-08 00:26:08 +00:00
parent 8ea75e12eb
commit f7bf7d04f4
2 changed files with 3 additions and 4 deletions

View file

@ -45,10 +45,9 @@ VIS_ComputeVisibleRegion(
CurrentWindow = Wnd->spwndParent; CurrentWindow = Wnd->spwndParent;
while (CurrentWindow) while (CurrentWindow)
{ {
if ( CurrentWindow->state2 & WNDS2_INDESTROY || if (!VerifyWnd(CurrentWindow))
CurrentWindow->state & WNDS_DESTROYED )
{ {
ERR("ATM the Current Window or Parent is dead!\n"); ERR("ATM the Current Window or Parent is dead! %p\n",CurrentWindow);
if (VisRgn) GreDeleteObject(VisRgn); if (VisRgn) GreDeleteObject(VisRgn);
return NULL; return NULL;
} }

View file

@ -245,7 +245,7 @@ noparent:
Dce->DCXFlags &= ~DCX_DCEDIRTY; Dce->DCXFlags &= ~DCX_DCEDIRTY;
GdiSelectVisRgn(Dce->hDC, hRgnVisible); GdiSelectVisRgn(Dce->hDC, hRgnVisible);
if (Window != NULL) if (VerifyWnd(Window)) // Window maybe dead by this time before finishing the DCE release.
{ {
IntEngWindowChanged(Window, WOC_RGN_CLIENT); IntEngWindowChanged(Window, WOC_RGN_CLIENT);
} }