Changeset 7890 for trunk/src/user32/win32wbase.cpp

Timestamp:

Feb 12, 2002, 7:07:21 PM (24 years ago)

Author:

sandervl

Message:

Fixed reference count leaks

File:

• trunk/src/user32/win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.313 2002-02-05 17:59:00 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.314 2002-02-12 18:07:20 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -279 +279 @@
         if(getParent()->IsWindowDestroyed())
         {
+            Win32BaseWindow *wndparent = (Win32BaseWindow *)ChildWindow::getParentOfChild();
+            RELEASE_WNDOBJ(wndparent);
             setParent(NULL);  //or else we'll crash in the dtor of the ChildWindow class
         }
     }
+    else 
+    {
+        Win32BaseWindow *wndparent = (Win32BaseWindow *)ChildWindow::getParentOfChild();
+        if(wndparent && !fDestroyAll) {
+            RELEASE_WNDOBJ(wndparent);
+        }
+    }
+    if(owner && !fDestroyAll) {
+        RELEASE_WNDOBJ(owner);
+    }
+
     /* Decrement class window counter */
     if(windowClass) {
@@ -314 +327 @@
     if(propertyList) {
         removeWindowProps();
-    }
-    Win32BaseWindow *wndparent = (Win32BaseWindow *)ChildWindow::getParentOfChild();
-    if(wndparent && !fDestroyAll) {
-        RELEASE_WNDOBJ(wndparent);
-    }
-    if(owner && !fDestroyAll) {
-        RELEASE_WNDOBJ(owner);
     }
 }
@@ -957 +963 @@
     else {
         //make sure no message can ever arrive for this window again (PM or from other win32 windows)
-        dprintf(("Mark window %x (%x) as deleted", getWindowHandle(), this));
+        dprintf(("Mark window %x (%x) as deleted; refcount %d", getWindowHandle(), this, getRefCount()));
         markDeleted();
         OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);