Free DCE when window is destroyed

svn path=/trunk/; revision=6272

diff --git a/reactos/subsys/win32k/include/dce.h b/reactos/subsys/win32k/include/dce.h
index edb75eb..9dc5ea3 100644 (file)
--- a/reactos/subsys/win32k/include/dce.h
+++ b/reactos/subsys/win32k/include/dce.h
@@ -30,6 +30,7 @@ typedef struct tagDCE
     HRGN         hClipRgn;
     DCE_TYPE     type;
     DWORD        DCXFlags;
+    HANDLE       Self;
 } DCE, *PDCE;
 
 
@@ -48,5 +49,7 @@ INT  FASTCALL DCE_ExcludeRgn(HDC, HWND, HRGN);
 BOOL FASTCALL DCE_InvalidateDCE(HWND, const PRECTL);
 BOOL FASTCALL DCE_InternalDelete(PDCE dce);
 HWND FASTCALL IntWindowFromDC(HDC hDc);
+PDCE FASTCALL DceFreeDCE(PDCE dce);
+void FASTCALL DceFreeWindowDCE(HWND hwnd);
 
 #endif

diff --git a/reactos/subsys/win32k/ntuser/windc.c b/reactos/subsys/win32k/ntuser/windc.c
index d45921c..149ffa0 100644 (file)
--- a/reactos/subsys/win32k/ntuser/windc.c
+++ b/reactos/subsys/win32k/ntuser/windc.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: windc.c,v 1.30 2003/10/06 18:49:50 navaraf Exp $
+/* $Id: windc.c,v 1.31 2003/10/09 07:30:02 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -132,6 +132,7 @@ DceAllocDCE(HWND hWnd, DCE_TYPE Type)
     return NULL;
   
   Dce = DCEOBJ_LockDCE(DceHandle);
+  Dce->Self = DceHandle;
   Dce->hDC = NtGdiCreateDC(L"DISPLAY", NULL, NULL, NULL);
   if (NULL == defaultDCstate)
     {
@@ -233,7 +234,7 @@ DceReleaseDC(DCE* dce)
   if ((dce->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) &&
       (dce->DCXFlags & (DCX_CACHE | DCX_WINDOWPAINT)) )
     {
-      DceDeleteClipRgn( dce );
+      DceDeleteClipRgn(dce);
     }
 
   if (dce->DCXFlags & DCX_CACHE)
@@ -554,6 +555,113 @@ NtUserReleaseDC(HWND hWnd, HDC hDc)
 
   return nRet;
 }
+
+/***********************************************************************
+ *           DceFreeDCE
+ */
+PDCE FASTCALL
+DceFreeDCE(PDCE dce)
+{
+  DCE **ppDCE, *ret;
+  HANDLE hDce;
+
+  if (NULL == dce)
+    {
+      return NULL;
+    }
+
+#if 0  /* FIXME */
+  USER_Lock();
+#endif
+
+  ppDCE = &FirstDce;
+
+  while (*ppDCE && (*ppDCE != dce))
+    {
+      ppDCE = &(*ppDCE)->next;
+    }
+  if (*ppDCE == dce)
+    {
+      *ppDCE = dce->next;
+    }
+  ret = *ppDCE;
+
+#if 0 /* FIXME */
+  USER_Unlock();
+#endif
+
+#if 0 /* FIXME */
+  SetDCHook(dce->hDC, NULL, 0L);
+#endif
+
+  NtGdiDeleteDC(dce->hDC);
+  if (dce->hClipRgn && ! (dce->DCXFlags & DCX_KEEPCLIPRGN))
+    {
+      NtGdiDeleteObject(dce->hClipRgn);
+    }
+
+  hDce = dce->Self;
+  DCEOBJ_UnlockDCE(hDce);
+  DCEOBJ_FreeDCE(hDce);
+
+  return ret;
+}
   
 
+/***********************************************************************
+ *           DceFreeWindowDCE
+ *
+ * Remove owned DCE and reset unreleased cache DCEs.
+ */
+void FASTCALL
+DceFreeWindowDCE(HWND hwnd)
+{
+  DCE *pDCE;
+  PWINDOW_OBJECT pWnd = IntGetWindowObject(hwnd);
+
+  pDCE = FirstDce;
+  while (pDCE)
+    {
+      if (pDCE->hwndCurrent == hwnd)
+        {
+          if (pDCE == pWnd->Dce) /* owned or Class DCE*/
+            {
+              if (pWnd->Class->style & CS_OWNDC) /* owned DCE*/
+                {
+                  pDCE = DceFreeDCE(pDCE);
+                  pWnd->Dce = NULL;
+                  continue;
+                }
+              else if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN))   /* Class DCE*/
+               {
+                  DceDeleteClipRgn(pDCE);
+                  pDCE->hwndCurrent = 0;
+                }
+            }
+          else
+            {
+              if (pDCE->DCXFlags & DCX_DCEBUSY) /* shared cache DCE */
+                {
+                  /* FIXME: AFAICS we are doing the right thing here so
+                   * this should be a DPRINT. But this is best left as an ERR
+                   * because the 'application error' is likely to come from
+                   * another part of Wine (i.e. it's our fault after all).
+                   * We should change this to DPRINT when ReactOS is more stable
+                   * (for 1.0?).
+                   */
+                  DPRINT1("[%p] GetDC() without ReleaseDC()!\n", hwnd);
+                  DceReleaseDC(pDCE);
+                }
+
+              pDCE->DCXFlags &= DCX_CACHE;
+              pDCE->DCXFlags |= DCX_DCEEMPTY;
+              pDCE->hwndCurrent = 0;
+            }
+        }
+      pDCE = pDCE->next;
+    }
+
+  IntReleaseWindowObject(pWnd);
+}
+
 /* EOF */

diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index 4dc3a25..37de46d 100644 (file)
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.110 2003/10/04 16:04:01 weiden Exp $
+/* $Id: window.c,v 1.111 2003/10/09 07:30:02 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -236,7 +236,9 @@ static LRESULT IntDestroyWindow(PWINDOW_OBJECT Window,
       DestroyMenu(Window->hSysMenu);
       Window->hSysMenu = 0;
     }
-  DCE_FreeWindowDCE(Window->Self);    /* Always do this to catch orphaned DCs */
+#endif
+  DceFreeWindowDCE(Window->Self);    /* Always do this to catch orphaned DCs */
+#if 0 /* FIXME */
   WINPROC_FreeProc(Window->winproc, WIN_PROC_WINDOW);
   CLASS_RemoveWindow(Window->Class);
 #endif