Changeset 10379 for trunk/src/user32/dc.cpp

Timestamp:

Jan 11, 2004, 1:04:44 PM (22 years ago)

Author:

sandervl

Message:

Update

File:

• trunk/src/user32/dc.cpp (modified) (10 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.122 2003-11-12 14:10:18 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.123 2004-01-11 12:03:13 sandervl Exp $ */
 
 /*
@@ -618 +618 @@
 //******************************************************************************
 //******************************************************************************
-void releaseOwnDC (HDC hps)
-{
-   pDCData pHps = (pDCData)GpiQueryDCData ((HPS)hps);
-
-   dprintf2(("releaseOwnDC %x", hps));
-
-   if (pHps) {
-      if (pHps->hrgnHDC)
-         GpiDestroyRegion (pHps->hps, pHps->hrgnHDC);
-
-      GpiSetBitmap (pHps->hps, NULL);
-      O32_DeleteObject (pHps->nullBitmapHandle);
-      GpiDestroyPS(pHps->hps);
-
-      if (pHps->hdc)
-         DevCloseDC(pHps->hdc);
-   }
-}
-//******************************************************************************
-//******************************************************************************
 HDC WIN32API BeginPaint (HWND hWnd, PPAINTSTRUCT_W lpps)
 {
@@ -685 +665 @@
             }
             hpsPaint = hPS_ownDC;
+            STATS_GetDCEx(hwnd, hpsPaint, 0, 0);
         }
     }
@@ -865 +846 @@
 
     HWND hwndDC = WindowFromDC(hdc);
-
+ 
+    //hwndDC can be zero if the window has already been destroyed
     if(hwndDC != hwnd) {
         dprintf(("WARNING: ReleaseDC: wrong window handle specified %x -> %x", hwnd, hwndDC));
@@ -908 +890 @@
     }
 
+    STATS_ReleaseDC(hwnd, hdc);
     if(isOwnDC) {
         rc = TRUE;
@@ -914 +897 @@
         UnselectGDIObjects(hdc);
         rc = O32_ReleaseDC (0, hdc);
-        STATS_ReleaseDC(hwnd, hdc);
     }
 
@@ -1117 +1099 @@
     RELEASE_WNDOBJ(wnd);
 
-
     STATS_GetDCEx(hwnd, pHps->hps, hrgn, flags);
     return (HDC)pHps->hps;
@@ -1620 +1601 @@
     if (lComplexity == RGN_ERROR)
     {
-        RELEASE_WNDOBJ(window);
-        return ERROR_W;
+        goto fail;
     }
 
@@ -1646 +1626 @@
                 if(!child) {
                     dprintf(("ERROR: ScrollWindowEx, child %x not found", hwnd));
-                    RELEASE_WNDOBJ(window);
-                    return 0;
+                    goto fail;
                 }
                 rectChild = *child->getWindowRect();
@@ -1712 +1691 @@
     RELEASE_WNDOBJ(window);
     return (regionType);
+
+fail:
+    if(hrgn)      GpiDestroyRegion(hpsScreen, hrgn);
+    if(hpsScreen) WinReleasePS(hpsScreen);
+    RELEASE_WNDOBJ(window);
+    return ERROR_W;
 }
 //******************************************************************************