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

Timestamp:

Jun 10, 2001, 11:19:58 AM (24 years ago)

Author:

sandervl

Message:

bugfixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.260 2001-06-09 14:50:21 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.261 2001-06-10 09:19:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -241 +241 @@
         RELEASE_WNDOBJ(wndparent);
     }
+    if(owner) {
+        RELEASE_WNDOBJ(owner);
+    }
     if(windowClass) {
         RELEASE_CLASSOBJ(windowClass);
@@ -1055 +1058 @@
 
                     //SvL: Calling OSLibSetActiveWindow(hwndTop); causes focus problems
-                    if (win32top) OSLibWinSetFocus(win32top->getOS2FrameWindowHandle());
+                    if (win32top) {
+                        OSLibWinSetFocus(win32top->getOS2FrameWindowHandle());
+                        RELEASE_WNDOBJ(win32top);
+                    }
                 }
         }
@@ -1721 +1727 @@
                 siblingWindow->SendInternalMessageA (BM_CLICK, 0, 0);
             }
-
             sibling = siblingWindow->GetNextWindow (GW_HWNDNEXT);
+            RELEASE_WNDOBJ(siblingWindow);
         }
 
@@ -2113 +2119 @@
                 else    PostMessageA(window->getWindowHandle(), msg, wParam, lParam);
             }
+            RELEASE_WNDOBJ(window);
         }
     }
@@ -2137 +2144 @@
                 else    PostMessageW(window->getWindowHandle(), msg, wParam, lParam);
             }
+            RELEASE_WNDOBJ(window);
         }
     }
@@ -2457 +2465 @@
         if(wndBehind) {
             swp.hwndInsertBehind   = wndBehind->getOS2FrameWindowHandle();
+            RELEASE_WNDOBJ(wndBehind);
         }
         else {
@@ -2736 +2745 @@
         fShow = TRUE;
    }
-
+   if(oldparent) {
+        RELEASE_WNDOBJ(oldparent);
+   }
    newparent = GetWindowFromHandle(hwndNewParent);
    if(newparent && !newparent->isDesktopWindow())
@@ -2950 +2961 @@
  Win32BaseWindow *parent = GetWindowFromHandle(hwndParent);
  Win32BaseWindow *child  = GetWindowFromHandle(hwndChildAfter);
+ Win32BaseWindow *firstchild = child;
 
     dprintf(("FindWindowEx %x %x %x %s", hwndParent, hwndChildAfter, atom, lpszWindow));
@@ -2956 +2968 @@
        (hwndParent == 0 && hwndChildAfter != 0))
     {
+        if(parent)      RELEASE_WNDOBJ(parent);
+        if(firstchild)  RELEASE_WNDOBJ(firstchild);
         dprintf(("Win32BaseWindow::FindWindowEx: parent or child not found %x %x", hwndParent, hwndChildAfter));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
@@ -2963 +2977 @@
     if(hwndParent != 0)
     {//if the current process owns the window, just do a quick search
+        lock(&critsect);
         child = (Win32BaseWindow *)parent->getFirstChild();
         if(hwndChildAfter != 0)
@@ -2983 +2998 @@
             {
                 dprintf(("FindWindowEx: Found window %x", child->getWindowHandle()));
-                return child->getWindowHandle();
+                HWND hwndChild = child->getWindowHandle();
+                unlock(&critsect);
+                if(parent)      RELEASE_WNDOBJ(parent);
+                if(firstchild)  RELEASE_WNDOBJ(firstchild);
+                dprintf(("FindWindowEx: Found window %x", child->getWindowHandle()));
+                return hwndChild;
             }
             child = (Win32BaseWindow *)child->getNextChild();
         }
+        unlock(&critsect);
+        if(parent)      RELEASE_WNDOBJ(parent);
+        if(firstchild)  RELEASE_WNDOBJ(firstchild);
     }
     else {
@@ -3019 +3042 @@
         }
         OSLibWinEndEnumWindows(henum);
+        if(parent)      RELEASE_WNDOBJ(parent);
+        if(firstchild)  RELEASE_WNDOBJ(firstchild);
     }
     SetLastError(ERROR_CANNOT_FIND_WND_CLASS); //TODO: not always correct
@@ -3532 +3557 @@
 HWND Win32BaseWindow::getNextDlgGroupItem(HWND hwndCtrl, BOOL fPrevious)
 {
- Win32BaseWindow *child, *nextchild, *lastchild;
+ Win32BaseWindow *firstchild = NULL, *child, *nextchild, *lastchild;
  HWND retvalue;
 
+    lock();
     if (hwndCtrl)
     {
-        child = GetWindowFromHandle(hwndCtrl);
+        firstchild = child = GetWindowFromHandle(hwndCtrl);
         if (!child)
         {
@@ -3549 +3575 @@
             if(child == NULL) break;
         }
-
         if (!child || (child->getParent() != this))
         {
@@ -3611 +3636 @@
     retvalue = lastchild->getWindowHandle();
 END:
+    unlock();
+    if(firstchild) RELEASE_WNDOBJ(firstchild);
     return retvalue;
 }
@@ -3624 +3651 @@
     if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {
          if(window) {
-////             dprintf(("addRef %x; refcount %d", hwnd, window->getRefCount()+1));
+             dprintf(("addRef %x; refcount %d", hwnd, window->getRefCount()+1));
              window->addRef();
          }