commit e6ea9ebb5e977a4dce56dc7c53903b278b9bd804
author Ulrich Weigand <weigand@informatik.uni-erlangen.de> Sat May 08 09:50:52 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat May 08 09:50:52 1999 +0000
tree ab984f7f9dfa9d56817fcb2487ed5e93d0b6a288
parent ef61c0b632149c684b083f842923f91ef0a38fed

Check for busy DCE moved to DCHook16().

objects/dc.c

diff --git a/objects/dc.c b/objects/dc.c
index 7c746ed..4899717 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -657,24 +657,19 @@
  */
 BOOL WINAPI DeleteDC( HDC hdc )
 {
-    DC * dc;
-
-    /*
-     * Windows will not let you delete a DC that is busy
-     * (between GetDC and ReleaseDC)
-     */
-    if (DCE_IsDCBusy(hdc))
-    {
-      WARN(dc, " Application trying to delete a busy DC\n");
-      return TRUE;
-    }
-
-    dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
-
+    DC * dc = (DC *) GDI_GetObjPtr( hdc, DC_MAGIC );
     if (!dc) return FALSE;
 
     TRACE(dc, "%04x\n", hdc );
 
+    /* Call hook procedure to check whether is it OK to delete this DC */
+    if (    dc->hookProc && !(dc->w.flags & (DC_SAVED | DC_MEMORY))
+         && dc->hookProc( hdc, DCHC_DELETEDC, dc->dwHookData, 0 ) == FALSE )
+    {
+        GDI_HEAP_UNLOCK( hdc );
+        return FALSE;
+    }
+
     while (dc->saveLevel)
     {
 	DC * dcs;