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

Timestamp:

Jun 9, 2001, 4:50:26 PM (24 years ago)

Author:

sandervl

Message:

reference count (window + class objects) rewrite

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.108 2001-06-03 12:02:26 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.109 2001-06-09 14:50:16 sandervl Exp $ */
 
 /*
@@ -450 +450 @@
    }
    else wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(pHps->hwnd);
-   return changePageXForm(wnd, pHps, pValue, x, y, pPrev);
+   BOOL ret = changePageXForm(wnd, pHps, pValue, x, y, pPrev);
+   if(wnd) RELEASE_WNDOBJ(wnd);
+   return ret;
 }
 //******************************************************************************
@@ -462 +464 @@
    }
    else wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(pHps->hwnd);
-   return setPageXForm(wnd, pHps);
+   BOOL ret = setPageXForm(wnd, pHps);
+   if(wnd) RELEASE_WNDOBJ(wnd);
+   return ret;
 }
 //******************************************************************************
@@ -476 +480 @@
    if(wnd) {
       removeClientArea(wnd, pHps);
+      RELEASE_WNDOBJ(wnd);
    }
 }
@@ -490 +495 @@
    if(wnd) {
       selectClientArea(wnd, pHps);
+      RELEASE_WNDOBJ(wnd);
    }
 }
@@ -505 +511 @@
       if(pHps->isClient)
           selectClientArea(wnd, pHps);
+      RELEASE_WNDOBJ(wnd);
    }
 }
@@ -521 +528 @@
    }
    else wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(pHps->hwnd);
-   return clientHeight(wnd, hwnd, pHps);
+   LONG ret = clientHeight(wnd, hwnd, pHps);
+   if(wnd) RELEASE_WNDOBJ(wnd);
+   return ret;
 }
 //******************************************************************************
@@ -533 +542 @@
    }
    else wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(pHps->hwnd);
-   return setMapMode(wnd, pHps, mode);
+   int ret = setMapMode(wnd, pHps, mode);
+   if(wnd) RELEASE_WNDOBJ(wnd);
+   return ret;
 }
 //******************************************************************************
@@ -673 +684 @@
             {
                 dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
+                RELEASE_WNDOBJ(wnd);
                 SetLastError(ERROR_INVALID_PARAMETER_W);
                 return (HDC)NULLHANDLE;
@@ -685 +697 @@
         {
             dprintf (("USER32: BeginPaint %x invalid parameter %x", hWnd, lpps));
+            RELEASE_WNDOBJ(wnd);
             SetLastError(ERROR_INVALID_PARAMETER_W);
             return (HDC)NULLHANDLE;
@@ -773 +786 @@
         lpps->rcPaint.right = lpps->rcPaint.left = 0;
     }
+    RELEASE_WNDOBJ(wnd);
 
     SetLastError(0);
@@ -814 +828 @@
 
 exit:
+    if(wnd) RELEASE_WNDOBJ(wnd);
     SetLastError(0);
     return TRUE;
@@ -850 +865 @@
             dprintf2(("ReleaseDC: CS_OWNDC, not released"));
         }
+        RELEASE_WNDOBJ(wnd);
     }
 
@@ -928 +944 @@
             //TODO: intersect/exclude clip region?
             dprintf (("User32: GetDCEx hwnd %x (%x %x) -> wnd %x hdc %x", hwnd, hrgn, flags, wnd, hps));
+
+            RELEASE_WNDOBJ(wnd);
             return (HDC)hps;
         }
@@ -1058 +1076 @@
 
     dprintf (("User32: GetDCEx hwnd %x (%x %x) -> hdc %x", hwnd, hrgn, flags, pHps->hps));
+    RELEASE_WNDOBJ(wnd);
+
     return (HDC)pHps->hps;
 
@@ -1080 +1100 @@
         O32_DeleteObject (pHps->nullBitmapHandle);
     }
+    if(wnd) RELEASE_WNDOBJ(wnd);
     SetLastError(ERROR_INVALID_PARAMETER_W);
     return NULL;
@@ -1323 +1344 @@
         SetLastError(ERROR_INVALID_PARAMETER_W);
     }
+    if(wnd) RELEASE_WNDOBJ(wnd);
     return (success);
 }
@@ -1358 +1380 @@
 //    if(!WinIsWindowShowing(wnd->getOS2FrameWindowHandle()) || !WinIsWindowShowing(wnd->getOS2WindowHandle())) {
 //        dprintf(("UpdateWindow: window not showing %d/%d", WinIsWindowShowing(wnd->getOS2FrameWindowHandle()), WinIsWindowShowing(wnd->getOS2WindowHandle()) ));
+//        RELEASE_WNDOBJ(wnd);
 //        return FALSE;
 //    }
@@ -1371 +1394 @@
     }
 #endif
+    RELEASE_WNDOBJ(wnd);
     return rc;
 }
@@ -1551 +1575 @@
     if (lComplexity == RGN_ERROR)
     {
+        RELEASE_WNDOBJ(window);
         return ERROR_W;
     }
@@ -1576 +1601 @@
                 if(!child) {
                     dprintf(("ERROR: ScrollWindowEx, child %x not found", hwnd));
+                    RELEASE_WNDOBJ(window);
                     return 0;
                 }
@@ -1584 +1610 @@
                      child->ScrollWindow(dx, orgdy);
                 }
-                hwndChild = GetWindow(hwndChild, GW_HWNDNEXT_W);
+                RELEASE_WNDOBJ(child);
+                hwndChild = GetWindow(hwndChild, GW_HWNDNEXT_W);        
             }
             dprintf(("***ScrollWindowEx: Scroll child windows DONE"));
@@ -1616 +1643 @@
        if (rc == FALSE)
        {
+          RELEASE_WNDOBJ(window);
           return (0);
        }
@@ -1637 +1665 @@
     }
 
+    RELEASE_WNDOBJ(window);
     return (regionType);
 }
@@ -1643 +1672 @@
 BOOL WIN32API ScrollWindow(HWND hwnd, int dx, int dy, const RECT *pScroll, const RECT *pClip)
 {
- Win32BaseWindow *window;
-
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-        dprintf(("ScrollWindow, window %x not found", hwnd));
-        return 0;
-    }
     dprintf(("ScrollWindow %x %d %d %x %x", hwnd, dx, dy, pScroll, pClip));
     return (ERROR_W != ScrollWindowEx(hwnd, dx, dy, pScroll, pClip, 0, NULL,