Changeset 5935 for trunk/src/user32/pmwindow.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/pmwindow.cpp (modified) (21 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.132 2001-05-25 19:59:29 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.133 2001-06-09 14:50:19 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -214 +214 @@
             rc = (MRESULT)win32wnd->DispatchMsgA(pWinMsg);
         }
+        RELEASE_WNDOBJ(win32wnd);
         RestoreOS2TIB();
         return rc;
@@ -229 +230 @@
         dprintf(("OS2: WM_CREATE %x", hwnd));
         win32wnd = (Win32BaseWindow *)teb->o.odin.newWindow;
+        win32wnd->addRef();
         teb->o.odin.newWindow = 0;
         if(win32wnd->MsgCreate(hwnd) == FALSE)
@@ -302 +304 @@
                 WinSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_ZORDER );
             }
+            if(topwindow) RELEASE_WNDOBJ(topwindow);
 
             win32wnd->setComingToTop(FALSE);
@@ -319 +322 @@
         dprintf(("USER32: Delayed SetFocus %x %x %x call!", teb->o.odin.hwndFocus, mp1, mp2));
         if(teb->o.odin.hwndFocus) {
+            RELEASE_WNDOBJ(win32wnd);
             win32wnd = Win32BaseWindow::GetWindowFromHandle(teb->o.odin.hwndFocus);
             if(win32wnd) {
@@ -373 +377 @@
     case WM_BUTTON3DBLCLK:
         if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+            RELEASE_WNDOBJ(win32wnd);
             win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
         }
@@ -396 +401 @@
     {
         if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+            RELEASE_WNDOBJ(win32wnd);
             win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
         }
@@ -525 +531 @@
         goto RunDefWndProc;
     }
+    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
     return (MRESULT)rc;
@@ -530 +537 @@
 RunDefWndProc:
 //  dprintf(("OS2: RunDefWndProc msg %x for %x", msg, hwnd));
+    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
     return WinDefWindowProc( hwnd, msg, mp1, mp2 );
@@ -622 +630 @@
     {
         dprintf(("PMFRAME:WM_ERASEBACKGROUND %x", win32wnd->getWindowHandle()));
-        RestoreOS2TIB();
-        return (MRESULT)FALSE;
+        rc = (MRESULT)FALSE;
+        break;
     }
 
@@ -640 +648 @@
     case WM_BUTTON3DBLCLK:
         if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+            RELEASE_WNDOBJ(win32wnd);
             win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
         }
@@ -663 +672 @@
     {
         if(win32wnd->getWindowHandle() != pWinMsg->hwnd) {
+            RELEASE_WNDOBJ(win32wnd);
             win32wnd = Win32BaseWindow::GetWindowFromHandle(pWinMsg->hwnd);
         }
@@ -724 +734 @@
            if(wndAfter) {
                 wp.hwndInsertAfter = wndAfter->getWindowHandle();
+                RELEASE_WNDOBJ(wndAfter);
            }
            else wp.hwndInsertAfter = HWND_TOP_W;
@@ -760 +771 @@
             pswp->hwnd = hwnd;
 
-            RestoreOS2TIB();
-            return (MRESULT)0xf;
-        }
-        RestoreOS2TIB();
-        return (MRESULT)0;
+            rc = (MRESULT)0xf;
+            break;
+        }
+        rc = 0;
+        break;
     }
 
@@ -835 +846 @@
             if(wndAfter) {
                  wp.hwndInsertAfter = wndAfter->getWindowHandle();
+                 RELEASE_WNDOBJ(wndAfter);
             }
             else wp.hwndInsertAfter = HWND_TOP_W;
@@ -959 +971 @@
 
 PosChangedEnd:
-        RestoreOS2TIB();
-        return (MRESULT)FALSE;
+        rc = (MRESULT)FALSE;
+        break;
     }
 
@@ -994 +1006 @@
             if(wndAfter) {
                  wp.hwndInsertAfter = wndAfter->getWindowHandle();
+                 RELEASE_WNDOBJ(wndAfter);
             }
             else wp.hwndInsertAfter = HWND_TOP_W;
@@ -1046 +1059 @@
             newRect->yBottom += newClientRect.yBottom;
         }
-        RestoreOS2TIB();
-        return (MRESULT)res;
+        rc = res;
+        break;
     }
 #else
         dprintf(("PMWINDOW: WM_CALCVALIDRECTS %x", win32wnd->getWindowHandle()));
-        RestoreOS2TIB();
-        return (MRESULT)(CVR_ALIGNLEFT | CVR_ALIGNTOP);
+        rc = (MRESULT)(CVR_ALIGNLEFT | CVR_ALIGNTOP);
+        break;
 #endif
 
@@ -1078 +1091 @@
 #endif
 
-#if 0
-    //is sent to both windows gaining and loosing the focus
-    case WM_FOCUSCHANGE:
-    {
-     HWND   hwndFocus = (HWND)mp1;
-     HWND   hwndLoseFocus, hwndGainFocus;
-     USHORT usSetFocus = SHORT1FROMMP(mp2);
-     USHORT fsFocusChange = SHORT2FROMMP(mp2);
-
-        rc = 0;
-        dprintf(("PMFRAME:WM_FOCUSCHANGE (start) %x %x %x %x", win32wnd->getWindowHandle(), hwndFocus, usSetFocus, fsFocusChange));
-        if(usSetFocus) {
-            hwndGainFocus = hwnd;
-            hwndLoseFocus = hwndFocus;
-        }
-        else {
-            hwndGainFocus = hwndFocus;
-            hwndLoseFocus = hwnd;
-        }
-
-        if(usSetFocus)
-        {
-          Win32BaseWindow *winfocus = Win32BaseWindow::GetWindowFromOS2Handle(hwndLoseFocus);
-          if(!(fsFocusChange & FC_NOSETACTIVE))
-          {
-            if(!winfocus || (winfocus->GetTopParent() != win32wnd->GetTopParent()))
-            {
-              if(winfocus)
-                WinSendMsg(winfocus->GetTopParent()->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)0, (MPARAM)hwndGainFocus);
-              else
-                WinSendMsg(hwndLoseFocus, WM_ACTIVATE, (MPARAM)0, (MPARAM)hwndGainFocus);
-            }
-          }
-          //SvL: Check if window is still valid
-          win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
-          if(win32wnd == NULL) {
-            RestoreOS2TIB();
-            return (MRESULT)rc;
-          }
-          if(!(fsFocusChange & FC_NOSETACTIVE))
-          {
-            Win32BaseWindow *topparent = win32wnd->GetTopParent();
-            if(!winfocus || (winfocus->GetTopParent() != topparent))
-            {
-              if(!(fsFocusChange & FC_NOBRINGTOTOP))
-              {
-                if(topparent) {
-                  //put window at the top of z order
-                  WinSetWindowPos(topparent->getOS2WindowHandle(), HWND_TOP, 0, 0, 0, 0, SWP_ZORDER);
-                }
-              }
-
-              // PH 2000/09/01 Netscape 4.7
-              // check if topparent is valid
-              if (topparent)
-                WinSendMsg(topparent->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)1, (MPARAM)hwndLoseFocus);
-            }
-          }
-          //SvL: Check if window is still valid
-          win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
-          if(win32wnd == NULL) {
-            break;
-          }
-
-      //TODO: Don't send WM_SETSELECTION to child window if frame already has selection
-      if(!(fsFocusChange & FC_NOSETSELECTION)) {
-            WinSendMsg(hwndGainFocus, WM_SETSELECTION, (MPARAM)1, (MPARAM)0);
-      }
-
-      if(!(fsFocusChange & FC_NOSETFOCUS)) {
-            WinSendMsg(hwndGainFocus, WM_SETFOCUS, (MPARAM)hwndLoseFocus, (MPARAM)1);
-      }
-        }
-        else /* no usSetFocus */
-        {
-      if(!(fsFocusChange & FC_NOLOSEFOCUS)) {
-            WinSendMsg(hwndLoseFocus, WM_SETFOCUS, (MPARAM)hwndGainFocus, (MPARAM)0);
-      }
-      //TODO: Don't send WM_SETSELECTION to child window if frame already has selection
-      if(!(fsFocusChange & FC_NOLOSESELECTION)) {
-            WinSendMsg(hwndLoseFocus, WM_SETSELECTION, (MPARAM)0, (MPARAM)0);
-      }
-          //SvL: Check if window is still valid
-          win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
-          if(win32wnd == NULL) {
-            break;
-          }
-
-          Win32BaseWindow *winfocus = Win32BaseWindow::GetWindowFromOS2Handle(hwndGainFocus);
-          if(!(fsFocusChange & FC_NOLOSEACTIVE))
-          {
-            Win32BaseWindow *topparent = win32wnd->GetTopParent();
-
-            if(!winfocus || (winfocus->GetTopParent() != topparent))
-            {
-              // PH 2000/09/01 Netscape 4.7
-              // check if topparent is valid
-              if (topparent)
-                WinSendMsg(topparent->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)0, (MPARAM)hwndGainFocus);
-            }
-          }
-          //SvL: Check if window is still valid
-          win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
-          if(win32wnd == NULL)
-            break;
-
-          if(!(fsFocusChange & FC_NOSETACTIVE))
-          {
-            if(!winfocus || (winfocus->GetTopParent() != win32wnd->GetTopParent()))
-            {
-              if(winfocus)
-              {
-                // PH 2000/09/01 Netscape 4.7
-                // check if topparent is valid
-                Win32BaseWindow *topparent = winfocus->GetTopParent();
-                if (topparent)
-                  WinSendMsg(topparent->getOS2WindowHandle(), WM_ACTIVATE, (MPARAM)1, (MPARAM)hwndLoseFocus);
-              }
-              else
-                WinSendMsg(hwndGainFocus, WM_ACTIVATE, (MPARAM)1, (MPARAM)hwndLoseFocus);
-            }
-          }
-        }
-
-
-#ifdef DEBUG
-        dprintf(("PMFRAME:WM_FOCUSCHANGE (end) %x %x %x", win32wnd->getWindowHandle(), mp1, mp2));
-#endif
-        break;
-    }
-#endif
-
 #ifdef DEBUG
     case WM_FOCUSCHANGE:
@@ -1237 +1118 @@
             if (win32wnd->IsModalDialog())
             {
-                Win32BaseWindow *topOwner = win32wnd->getOwner()->GetTopParent();
-
-                if (topOwner) WinSetWindowPos(topOwner->getOS2FrameWindowHandle(),hwnd,0,0,0,0,SWP_ZORDER);
+                if(win32wnd->getOwner()) {
+                    Win32BaseWindow *topOwner = Win32BaseWindow::GetWindowFromHandle(win32wnd->getOwner()->GetTopParent());
+ 
+                    if (topOwner) {
+                        WinSetWindowPos(topOwner->getOS2FrameWindowHandle(),hwnd,0,0,0,0,SWP_ZORDER);
+                        RELEASE_WNDOBJ(topOwner);
+                    }
+                }
             }
         }
@@ -1356 +1242 @@
     }
     RestoreOS2TIB();
+    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     return (MRESULT)rc;
 
 RunDefFrameWndProc:
+    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
     return pfnFrameWndProc(hwnd, msg, mp1, mp2);
 
 RunDefWndProc:
+    if(win32wnd) RELEASE_WNDOBJ(win32wnd);
     RestoreOS2TIB();
     //calling WinDefWindowProc here breaks Opera hotlist window (WM_ADJUSTWINDOWPOS)