Changeset 1849 for trunk/src/user32/oslibgdi.cpp

Timestamp:

Nov 26, 1999, 6:06:09 PM (26 years ago)

Author:

cbratschi

Message:

map rect, WM_ERASEBKGND and other fixes

File:

• trunk/src/user32/oslibgdi.cpp (modified) (10 diffs)

trunk/src/user32/oslibgdi.cpp

@@ -1 @@
-/* $Id: oslibgdi.cpp,v 1.3 1999-10-14 18:27:57 sandervl Exp $ */
+/* $Id: oslibgdi.cpp,v 1.4 1999-11-26 17:06:07 cbratschi Exp $ */
 /*
  * Window GDI wrapper functions for OS/2
@@ -85 +85 @@
     }
 
-    if(hwndParent != HWND_DESKTOP) 
+    if(hwndParent != HWND_DESKTOP)
     {
-         window = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndParent);
-         if(window == NULL)
-                return FALSE;
-         height = window->getWindowHeight();
+         window = Win32BaseWindow::GetWindowFromOS2FrameHandle(hwndParent);
+         if(window == NULL)
+                return FALSE;
+         height = window->getWindowHeight();
     }
     else height = OSLibQueryScreenHeight();
@@ -106 +106 @@
 //
 // Parameters:
+//   hwnd:       OS/2 window handle
 //   rectOS2:    OS/2 child window RECTL
 //   rectWin32:  Win32 Child window RECT   (IN)
@@ -113 +114 @@
 //   FALSE:     Failures
 //******************************************************************************
-BOOL MapOS2ToWin32Rectl(PRECTLOS2 rectOS2, PRECT rectWin32)
-{
- ULONG length = rectOS2->yTop - rectOS2->yBottom;
-
-   rectWin32->bottom = length - rectOS2->yBottom;
-   rectWin32->top    = length - rectOS2->yTop;
+BOOL MapOS2ToWin32Rectl(HWND hwnd,PRECTLOS2 rectOS2, PRECT rectWin32)
+{
+   RECTL rect;
+
+   if (!WinQueryWindowRect(hwnd,&rect)) return FALSE;
+
+   rectWin32->bottom = rect.yTop-rectOS2->yBottom;
+   rectWin32->top    = rect.yTop-rectOS2->yTop;
    rectWin32->left   = rectOS2->xLeft;
    rectWin32->right  = rectOS2->xRight;
+
    return TRUE;
 }
@@ -128 +132 @@
 //
 // Parameters:
+//   hwnd:       OS/2 window handle
 //   rectWin32:  Win32 Child window RECT   (IN)
 //   rectOS2:    OS/2  Child window RECTL  (OUT)
@@ -134 +139 @@
 //   FALSE:      Failures
 //******************************************************************************
-BOOL MapWin32ToOS2Rectl(PRECT rectWin32, PRECTLOS2 rectOS2)
-{
- ULONG length = rectWin32->bottom - rectWin32->top;
-
-    rectOS2->yBottom = length - rectWin32->bottom;
-    rectOS2->yTop    = length - rectWin32->top;
+BOOL MapWin32ToOS2Rectl(HWND hwnd,PRECT rectWin32, PRECTLOS2 rectOS2)
+{
+    RECTL rect;
+
+    if (!WinQueryWindowRect(hwnd,&rect)) return FALSE;
+
+    rectOS2->yBottom = rect.yTop-rectWin32->bottom;
+    rectOS2->yTop    = rect.yTop-rectWin32->top;
     rectOS2->xLeft   = rectWin32->left;
     rectOS2->xRight  = rectWin32->right;
+
     return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL MapOS2ToWin32WindowRect(PRECTLOS2 rectOS2,PRECT rectWin32)
+{
+  rectWin32->bottom = rectOS2->yTop;
+  rectWin32->top    = rectOS2->yBottom;
+  rectWin32->left   = rectOS2->xLeft;
+  rectWin32->right  = rectOS2->xRight;
+
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL MapWin32ToOS2WindowRect(PRECT rectWin32,PRECTLOS2 rectOS2)
+{
+  rectOS2->yBottom = rectWin32->top;
+  rectOS2->yTop    = rectWin32->bottom;
+  rectOS2->xLeft   = rectWin32->left;
+  rectOS2->xRight  = rectWin32->right;
+
+  return TRUE;
 }
 //******************************************************************************
@@ -155 +185 @@
         return 0;
     }
-    MapOS2ToWin32Rectl((RECTLOS2 *)&rectl, rectWin32);
+    MapOS2ToWin32Rectl(hwnd,(RECTLOS2 *)&rectl, rectWin32);
     return WinBeginPaint(hwnd, NULLHANDLE, &rectl);
 }
@@ -169 +199 @@
 {
   if(hwnd == OSLIB_HWND_DESKTOP)
-        hwnd = HWND_DESKTOP;
+        hwnd = HWND_DESKTOP;
 
   return (HDC)WinGetPS(hwnd);
@@ -186 +216 @@
 
     if(pRect) {
-        MapWin32ToOS2Rectl(pRect, &rectl);
+        MapWin32ToOS2Rectl(hwnd,pRect, &rectl);
         return WinInvalidateRect(hwnd, (PRECTL)&rectl, fIncludeChildren);
     }
@@ -201 +231 @@
   rc = WinQueryUpdateRect(hwnd, (PRECTL)&rectl);
   if(rc) {
-        MapOS2ToWin32Rectl(&rectl, pRect);
+        MapOS2ToWin32Rectl(hwnd,&rectl, pRect);
   }
   else  memset(pRect, 0, sizeof(RECT));