Changeset 10396 for trunk/src

Timestamp:

Jan 15, 2004, 11:28:42 AM (22 years ago)

Author:

sandervl

Message:

KSO: Removed duplicate (and dangerous) checks on framewindows in a couple of enumerations (OSLibWinQueryClientWindow).

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (4 diffs)
• win32wbase.cpp (modified) (6 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.146 2004-01-11 12:03:15 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.147 2004-01-15 10:28:41 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -884 +884 @@
 //******************************************************************************
 //******************************************************************************
-HWND OSLibWinQueryClientWindow(HWND hwndFrame)
-{
- HWND hwndClient = 0;
-
-   if(((ULONG)WinSendMsg(hwndFrame, WM_QUERYFRAMEINFO, NULL, NULL)) & FI_FRAME)
-          hwndClient = WinWindowFromID(hwndFrame, FID_CLIENT);
-
-   return hwndClient;
-}
-//******************************************************************************
-//******************************************************************************
 BOOL OSLibWinEndEnumWindows(HWND hwndEnum)
 {

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.76 2003-04-23 18:00:58 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.77 2004-01-15 10:28:42 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -43 +43 @@
 HWND  OSLibWinCreateWindow(HWND hwndParent,ULONG dwWinStyle, ULONG dwOSFrameStyle,
                            char *pszName, HWND Owner, ULONG fBottom,
-                           ULONG id, BOOL fTaskList,BOOL fShellPosition, 
+                           ULONG id, BOOL fTaskList,BOOL fShellPosition,
                            DWORD classStyle, HWND *hwndFrame);
 
-BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, 
+BOOL  OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle,
                            ULONG *OSFrameStyle);
-void  OSLibSetWindowStyle(HWND hwndFrame, HWND hwndClient, ULONG dwStyle, 
+void  OSLibSetWindowStyle(HWND hwndFrame, HWND hwndClient, ULONG dwStyle,
                           ULONG dwExStyle, ULONG dwOldWindowsStyle);
 
 DWORD OSLibQueryWindowStyle(HWND hwnd);
 
-BOOL  OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle, 
-                                    DWORD dwExStyle, HICON hSysMenuIcon, 
+BOOL  OSLibWinPositionFrameControls(HWND hwndFrame, RECTLOS2 *pRect, DWORD dwStyle,
+                                    DWORD dwExStyle, HICON hSysMenuIcon,
                                     BOOL drawCloseButton, BOOL fClassIcon);
 BOOL  OSLibChangeCloseButtonState(HWND hwndFrame, BOOL State);
@@ -281 +281 @@
 
 BOOL  OSLibWinQueryWindowPos (HWND hwnd, PSWP pswp);
-void  OSLibMapSWPtoWINDOWPOS(PSWP pswp, PWINDOWPOS pwpos, PSWP pswpOld, 
+void  OSLibMapSWPtoWINDOWPOS(PSWP pswp, PWINDOWPOS pwpos, PSWP pswpOld,
                             int parentHeight, HWND hwnd);
-void  OSLibMapWINDOWPOStoSWP(struct tagWINDOWPOS *pwpos, PSWP pswp, PSWP pswpOld, 
+void  OSLibMapWINDOWPOStoSWP(struct tagWINDOWPOS *pwpos, PSWP pswp, PSWP pswpOld,
                              int parentHeight, HWND hFrame);
 
@@ -290 +290 @@
 HWND  OSLibWinBeginEnumWindows(HWND hwnd);
 HWND  OSLibWinGetNextWindow(HWND hwndEnum);
-HWND  OSLibWinQueryClientWindow(HWND hwndFrame);
 BOOL  OSLibWinEndEnumWindows(HWND hwndEnum);
 BOOL  OSLibWinQueryWindowProcess(HWND hwnd, ULONG *pid, ULONG *tid);

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.383 2004-01-11 12:03:18 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.384 2004-01-15 10:28:42 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -251 +251 @@
     }
 
-    // Decrement class window counter 
+    // Decrement class window counter
     // NOTE: Must be done before ReleaseDC call for ownDC!
     if(windowClass) {
@@ -892 +892 @@
             Win32Hwnd = 0;
         }
-        // Decrement class window counter 
+        // Decrement class window counter
         // NOTE: Must be done before ReleaseDC call for ownDC!
         if(windowClass) {
@@ -2552 +2552 @@
     }
 
-    // Hack alert: This makes sure the tooltips windows in OpenOffice don't 
+    // Hack alert: This makes sure the tooltips windows in OpenOffice don't
     //             activate the owner windows too.
     //             First condition takes care of SetWindowPos during window
     //             creation. The 2nd one for calls made by OpenOffice
-    if(((getStyle() & WS_POPUP) && (getExStyle() & WS_EX_TOPMOST)) || (fuFlags & SWP_NOOWNERZORDER)) 
-    { 
+    if(((getStyle() & WS_POPUP) && (getExStyle() & WS_EX_TOPMOST)) || (fuFlags & SWP_NOOWNERZORDER))
+    {
         //SWP_NOOWNERZORDER means only the z-order of this window changes; it
         //should not affect the owner
@@ -3196 +3196 @@
     {
         wnd = GetWindowFromOS2FrameHandle(hwnd);
-        if(wnd == NULL) {
-            hwnd = OSLibWinQueryClientWindow(hwnd);
-            if(hwnd)  wnd = GetWindowFromOS2Handle(hwnd);
-        }
         if(wnd) {
              hwndWin32 = wnd->getWindowHandle();
@@ -3343 +3339 @@
         {
             wnd = GetWindowFromOS2FrameHandle(hwnd);
-            if(wnd == NULL) {
-                hwnd = OSLibWinQueryClientWindow(hwnd);
-                if(hwnd)  wnd = GetWindowFromOS2Handle(hwnd);
-            }
-
             if(wnd) {
                 //According to Wine, the class doesn't need to be specified