Changeset 5964 for trunk/src

Timestamp:

Jun 11, 2001, 4:37:46 PM (24 years ago)

Author:

sandervl

Message:

Reference count bugfixes

Location:

trunk/src/user32

Files:

• gen_object.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/gen_object.cpp

@@ -1 @@
-/* $Id: gen_object.cpp,v 1.10 2001-06-10 12:05:38 sandervl Exp $ */
+/* $Id: gen_object.cpp,v 1.11 2001-06-11 14:37:46 sandervl Exp $ */
 /*
  * Generic Object Class for OS/2
@@ -91 +91 @@
 LONG GenericObject::addRef()
 {
-////  dprintf(("addRef %x -> refcount %x", this, refCount));
+  dprintf2(("addRef %x -> refcount %x", this, refCount+1));
   return InterlockedIncrement(&refCount);
 }
@@ -99 +99 @@
 LONG GenericObject::release()
 {
-////  dprintf(("release %x -> refcount %x", this, refCount));
+  dprintf2(("release %x -> refcount %x", this, refCount-1));
 #ifdef DEBUG
   if(refCount-1 < 0) {
@@ -106 +106 @@
 #endif
   if(InterlockedDecrement(&refCount) == 0 && fDeletePending) {
+      dprintf2(("marked for deletion -> delete now"));
       delete this;
       return 0;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.262 2001-06-10 12:05:40 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.263 2001-06-11 14:37:46 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -203 +203 @@
         setParent(NULL);  //or else we'll crash in the dtor of the ChildWindow class
     }
-
+    else
+    if(getParent() && getParent()->getFirstChild() == this && getNextChild() == NULL)
+    {
+        //if we're the last child that's being destroyed and our
+        //parent window was also destroyed, then we 
+        if(getParent()->IsWindowDestroyed())
+        {
+            setParent(NULL);  //or else we'll crash in the dtor of the ChildWindow class
+        }
+    }
     /* Decrement class window counter */
     if(windowClass) {
@@ -238 +247 @@
     }
     Win32BaseWindow *wndparent = (Win32BaseWindow *)ChildWindow::getParentOfChild();
-    if(wndparent) {
+    if(wndparent && !fDestroyAll) {
         RELEASE_WNDOBJ(wndparent);
     }
-    if(owner) {
+    if(owner && !fDestroyAll) {
         RELEASE_WNDOBJ(owner);
     }
@@ -427 +436 @@
         else
         {
-            owner = GetWindowFromHandle(GetWindowFromHandle(cs->hwndParent)->GetTopParent());
+            Win32BaseWindow *wndparent = GetWindowFromHandle(cs->hwndParent); 
+            if(wndparent) {
+                 owner = GetWindowFromHandle(wndparent->GetTopParent());
+                 RELEASE_WNDOBJ(wndparent);
+            }
+            else owner = NULL;        
+
             if(owner == NULL)
             {