Changeset 378 for trunk/src

Timestamp:

Jul 23, 1999, 9:09:26 PM (26 years ago)

Author:

cbratschi

Message:

BeginPaint() fix

Location:

trunk/src/user32/new

Files:

• window.cpp (modified) (7 diffs)
• wingdi.cpp (modified) (5 diffs)

trunk/src/user32/new/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.7 1999-07-18 18:04:30 sandervl Exp $ */
+/* $Id: window.cpp,v 1.8 1999-07-23 19:09:25 cbratschi Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -178 +178 @@
     window = Win32Window::GetWindowFromHandle(hwnd);
     if(!window) {
-        dprintf(("DestroyWindow, window %x not found", hwnd));
-        return 0;
+        dprintf(("DestroyWindow, window %x not found", hwnd));
+        return 0;
     }
     dprintf(("DestroyWindow %x", hwnd));
@@ -192 +192 @@
     window = Win32Window::GetWindowFromHandle(hwnd);
     if(!window) {
-        dprintf(("SetActiveWindow, window %x not found", hwnd));
-        return 0;
+        dprintf(("SetActiveWindow, window %x not found", hwnd));
+        return 0;
     }
     dprintf(("SetActiveWindow %x", hwnd));
@@ -206 +206 @@
     window = Win32Window::GetWindowFromHandle(hwnd);
     if(!window) {
-        dprintf(("GetParent, window %x not found", hwnd));
-        return 0;
+        dprintf(("GetParent, window %x not found", hwnd));
+        return 0;
     }
     dprintf(("GetParent %x", hwnd));
@@ -220 +220 @@
     window = Win32Window::GetWindowFromHandle(hwndChild);
     if(!window) {
-        dprintf(("SetParent, window %x not found", hwndChild));
-        return 0;
+        dprintf(("SetParent, window %x not found", hwndChild));
+        return 0;
     }
     dprintf(("SetParent %x %x", hwndChild, hwndNewParent));
@@ -234 +234 @@
     window = Win32Window::GetWindowFromHandle(hwnd);
     if(!window) {
-        dprintf(("IsChild, window %x not found", hwnd));
-        return 0;
+        dprintf(("IsChild, window %x not found", hwnd));
+        return 0;
     }
     dprintf(("IsChild %x %x", hwndParent, hwnd));
@@ -593 +593 @@
     WriteLog("USER32:  GetClientRect of %X\n", arg1);
 #endif
-
+    arg1 = Win32Window::Win32ToOS2Handle(arg1);
     return O32_GetClientRect(arg1, arg2);
 }

trunk/src/user32/new/wingdi.cpp

@@ -1 @@
-/* $Id: wingdi.cpp,v 1.4 1999-07-19 18:40:44 sandervl Exp $ */
+/* $Id: wingdi.cpp,v 1.5 1999-07-23 19:09:26 cbratschi Exp $ */
 /*
  * Win32 Window graphics apis for OS/2
@@ -30 +30 @@
     }
     dprintf(("BeginPaint %X\n", hwnd));
-    lps->hdc = OSLibWinBeginPaint(window->getOS2WindowHandle(), &lps->rcPaint);
+    return O32_BeginPaint(window->getOS2WindowHandle(),lps);
+    //CB: conflict with Open32 mechanism
+    //lps->hdc = OSLibWinBeginPaint(window->getOS2WindowHandle(), &lps->rcPaint);
 
     return lps->hdc;
@@ -39 +41 @@
 {
     dprintf(("EndPaint %x\n", hwnd));
-    return OSLibWinEndPaint(lps->hdc);
+    return O32_EndPaint(hwnd,lps);
+    //CB: dito
+    //return OSLibWinEndPaint(lps->hdc);
 }
 //******************************************************************************
@@ -54 +58 @@
    }
    dprintf(("GetDC %x", hwnd));
-   return OSLibWinGetPS(window->getOS2WindowHandle());
+   return O32_GetDC(window->getOS2WindowHandle());
+   //return OSLibWinGetPS(window->getOS2WindowHandle());
 }
 //******************************************************************************
@@ -70 +75 @@
 int WIN32API ReleaseDC(HWND hwnd, HDC hdc)
 {
-    return OSLibWinReleasePS(hdc);
+    return O32_ReleaseDC(hwnd,hdc);
+    //return OSLibWinReleasePS(hdc);
 }
 //******************************************************************************