Changeset 340 for trunk/src/user32/new/oslibwin.cpp

Timestamp:

Jul 19, 1999, 8:40:44 PM (26 years ago)

Author:

sandervl

Message:

Point/Rectangle bug fixes

File:

• trunk/src/user32/new/oslibwin.cpp (modified) (4 diffs)

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.15 1999-07-18 18:04:29 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.16 1999-07-19 18:40:43 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -226 +226 @@
                           LONG cy, ULONG fl)
 {
+ HWND hwndParent = hwndInsertBehind;
+
   if(fl & SWP_MOVE) {
-        y = MapOS2ToWin32Y(hwnd, cy, y);
+        switch(hwndParent)
+        {
+            case HWNDOS_TOP:
+            case HWNDOS_BOTTOM:
+                hwndParent = HWND_DESKTOP;
+                break;
+        }
+        y = MapOS2ToWin32Y(hwndParent, cy, y);
   }
   dprintf(("WinSetWindowPos %x %x %d %d %d %d %x", hwnd, hwndInsertBehind, x, y, cx, cy, fl));
@@ -255 +264 @@
 }
 //******************************************************************************
+//Returns rectangle in Win32 window coordinates
 //******************************************************************************
 BOOL OSLibWinQueryUpdateRect(HWND hwnd, PVOID pRect)
@@ -263 +273 @@
   rc = WinQueryUpdateRect(hwnd, (PRECTL)&rectl);
   if(rc) {
-    MapOS2ToWin32Rectl(hwnd, &rectl, (PRECT)pRect);
-  }
+        MapOS2ToWin32Rectl(&rectl, (PRECT)pRect);
+  }
+  else  memset(pRect, 0, sizeof(RECT));
   return rc;
 }