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

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).

File:

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

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