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

Timestamp:

Jun 11, 2001, 10:08:26 PM (24 years ago)

Author:

sandervl

Message:

bug fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.263 2001-06-11 14:37:46 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.264 2001-06-11 20:08:24 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2903 +2903 @@
 
     dprintf(("EnumChildWindows of %x parameter %x %x (%x)", getWindowHandle(), lpfn, lParam, getFirstChild()));
+    lock();
     for (child = (Win32BaseWindow *)getFirstChild(); child; child = (Win32BaseWindow *)child->getNextChild())
     {
         dprintf(("EnumChildWindows: enumerating child %x (owner %x; parent %x)", child->getWindowHandle(), (child->getOwner()) ? child->getOwner()->getWindowHandle() : 0, getWindowHandle()));
         hwnd = child->getWindowHandle();
-        if(child->getOwner()) {
+        if(child->IsWindowDestroyed() || child->getOwner()) {
                 continue; //shouldn't have an owner (Wine)
         }
+        child->addRef();
+        unlock();
         if(lpfn(hwnd, lParam) == FALSE)
         {
-                rc = FALSE;
-                break;
-        }
+                child->release();
+                return FALSE;
+        }
+        child->release();
+        lock();
         //check if the window still exists
         if(!::IsWindow(hwnd))
@@ -2924 +2929 @@
         {
             dprintf(("EnumChildWindows: Enumerate children of %x", child->getWindowHandle()));
+            child->addRef();
+            unlock();
             if(child->EnumChildWindows(lpfn, lParam) == FALSE)
             {
-                rc = FALSE;
-                break;
-            }
+                child->release();
+                return FALSE;
+            }
+            child->release();
+            lock();
         }
         prevchild = child;
     }
+    unlock();
     return rc;
 }
@@ -3476 +3486 @@
                 }
                 oldval = (LONG)WINPROC_GetProc(win32wndproc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
-                dprintf(("SetWindowLong GWL_WNDPROC %x old %x new style %x", getWindowHandle(), oldval, value));
+                dprintf(("SetWindowLong GWL_WNDPROC %x old %x new wndproc %x", getWindowHandle(), oldval, value));
                 WINPROC_SetProc((HWINDOWPROC *)&win32wndproc, (WNDPROC)value, type, WIN_PROC_WINDOW);
                 break;