Changeset 4497 for trunk/src/user32/window.cpp

Timestamp:

Oct 18, 2000, 7:10:50 PM (25 years ago)

Author:

sandervl

Message:

Get/SetWindowPlacement fixes

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.80 2000-10-09 17:26:55 sandervl Exp $ */
+/* $Id: window.cpp,v 1.81 2000-10-18 17:10:50 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -486 +486 @@
     if( IsWindow(hwnd) )
     {
-    WINDOWPLACEMENT wndpl;
-    UINT flags;
+        WINDOWPLACEMENT wndpl;
+        UINT flags;
 
         GetWindowPlacement(hwnd, &wndpl);
-    wndpl.length  = sizeof(wndpl);
-    wndpl.showCmd = showCmd;
-    wndpl.flags = 0;
-
-    if(lpPoint)
-    {
+        wndpl.length  = sizeof(wndpl);
+        wndpl.showCmd = showCmd;
+        wndpl.flags = 0;
+
+        if(lpPoint)
+        {
             wndpl.flags |= WPF_SETMINPOSITION;
-        wndpl.ptMinPosition = *lpPoint;
-    }
-    if(lpRect)
-    {
+            wndpl.ptMinPosition = *lpPoint;
+        }
+        if(lpRect)
+        {
             wndpl.rcNormalPosition = *lpRect;
-    }
+        }
         SetWindowPlacement( hwnd, &wndpl);
     }
@@ -593 +593 @@
 }
 //******************************************************************************
+//NOTE: length must equal structure size or else api fails (verified in NT4, SP6)
 //******************************************************************************
 BOOL WIN32API SetWindowPlacement(HWND hwnd, const WINDOWPLACEMENT *winpos)
@@ -604 +605 @@
         return FALSE;
     }
-    if(!winpos) {
+    if(!winpos || winpos->length != sizeof(WINDOWPLACEMENT)) {
         dprintf(("SetWindowPlacement %x invalid parameter", hwnd));
         SetLastError(ERROR_INVALID_PARAMETER);
@@ -613 +614 @@
 }
 //******************************************************************************
+//NOTE: Length does not need to be correct (even though the SDK docs claim otherwise)
+//      (Verified in NT4, SP6)
 //******************************************************************************
 BOOL WIN32API GetWindowPlacement(HWND hwnd, LPWINDOWPLACEMENT winpos)
@@ -1630 +1633 @@
  HWND hwnd;
 
-    hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
-
-    hwnd = Win32BaseWindow::OS2ToWin32Handle(O32_GetLastActivePopup(hWnd));
+    hwnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
+    hwnd = Win32BaseWindow::OS2ToWin32Handle(O32_GetLastActivePopup(hwnd));
 
     dprintf(("GetLastActivePopup %x returned %x NOT CORRECTLY IMPLEMENTED", hWnd, hwnd));