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

Fix a problem when freeing a window class with dirty bit set.

Browse source 
svn path=/trunk/; revision=31344
This commit is contained in:
James Tabor 2007-12-19 23:26:04 +00:00
parent 8ebdc869ec
commit cefb74f67d
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -557,11 +557,6 @@ UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags)
if (Dce->DCXFlags & DCX_CACHE) if (Dce->DCXFlags & DCX_CACHE)
{ {
DPRINT("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %x\n", Dce->hDC); DPRINT("ENTER!!!!!! DCX_CACHE!!!!!! hDC-> %x\n", Dce->hDC);
if (Dce->pProcess)
{
DPRINT1("POWNED!\n");
return NULL; // should assert here.
}
// Need to set ownership so Sync dcattr will work. // Need to set ownership so Sync dcattr will work.
DC_SetOwnership( Dce->hDC, PsGetCurrentProcess()); DC_SetOwnership( Dce->hDC, PsGetCurrentProcess());
DC_AllocateDcAttr( Dce->hDC ); // Allocate new dcattr DC_AllocateDcAttr( Dce->hDC ); // Allocate new dcattr
@ -635,8 +630,16 @@ DceFreeWindowDCE(PWINDOW_OBJECT Window)
if (Window->Wnd->Class->Style & CS_CLASSDC || if (Window->Wnd->Class->Style & CS_CLASSDC ||
Window->Wnd->Style & CS_CLASSDC) /* Test Class first */ Window->Wnd->Style & CS_CLASSDC) /* Test Class first */
{ {
PWINDOW_OBJECT CurrentWindow;
if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/
DceDeleteClipRgn(pDCE); DceDeleteClipRgn(pDCE);
CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent);
if (CurrentWindow)
{ // Update and reset Vis Rgn and clear the dirty bit.
// Should release VisRgn than reset it to default.
DceUpdateVisRgn(pDCE, CurrentWindow, pDCE->DCXFlags);
}
pDCE->DCXFlags = DCX_DCEEMPTY;
pDCE->hwndCurrent = 0; pDCE->hwndCurrent = 0;
} }
else if (Window->Wnd->Class->Style & CS_OWNDC || else if (Window->Wnd->Class->Style & CS_OWNDC ||
@ -665,7 +668,6 @@ DceFreeWindowDCE(PWINDOW_OBJECT Window)
DPRINT1("[%p] GetDC() without ReleaseDC()!\n", Window->hSelf); DPRINT1("[%p] GetDC() without ReleaseDC()!\n", Window->hSelf);
DceReleaseDC(pDCE, FALSE); DceReleaseDC(pDCE, FALSE);
} }
pDCE->DCXFlags |= DCX_DCEEMPTY; pDCE->DCXFlags |= DCX_DCEEMPTY;
pDCE->hwndCurrent = 0; pDCE->hwndCurrent = 0;
} }