Changeset 2257 for trunk/src/user32/dc.cpp

Timestamp:

Dec 29, 1999, 11:54:04 PM (26 years ago)

Author:

cbratschi

Message:

new mapping functions, fixed 1 pixel and window handle bugs

File:

• trunk/src/user32/dc.cpp (modified) (20 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.30 1999-12-24 21:44:03 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.31 1999-12-29 22:53:59 cbratschi Exp $ */
 
 /*
@@ -302 +302 @@
    {
       if (wnd)
-         return (wnd->getWindowHeight());
+         return (wnd->getClientHeight());
       else
          return OSLibQueryScreenHeight();
@@ -437 +437 @@
 
    if(hWnd == 0x6800003a) {
-        hwnd = 0x6800003a; 
+        hwnd = 0x6800003a;
    }
    Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
@@ -443 +443 @@
    if ((hwnd != HWND_DESKTOP) && wnd->isOwnDC())
    {
-        hPS_ownDC = wnd->getOwnDC();
-        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
-        if(hPS_ownDC) {
-                pHps = (pDCData)GpiQueryDCData(hPS_ownDC);
-                if (!pHps)
-                {
-                        O32_SetLastError (ERROR_INVALID_PARAMETER);
-                        return (HDC)NULLHANDLE;
-                }
-        }
+        hPS_ownDC = wnd->getOwnDC();
+        //SvL: Hack for memory.exe (doesn't get repainted properly otherwise)
+        if(hPS_ownDC) {
+                pHps = (pDCData)GpiQueryDCData(hPS_ownDC);
+                if (!pHps)
+                {
+                        O32_SetLastError (ERROR_INVALID_PARAMETER);
+                        return (HDC)NULLHANDLE;
+                }
+        }
    }
 
@@ -473 +473 @@
 
    if(!wnd->isSuppressErase()) {
-        wnd->setSuppressErase(TRUE);
+        wnd->setSuppressErase(TRUE);
         wnd->setEraseBkgnd (FALSE, !wnd->MsgEraseBackGround(lpps->hdc));
    }
@@ -480 +480 @@
    if (!hPS_ownDC)
    {
-      long height  = wnd->getWindowHeight();
+      long height  = wnd->getClientHeight();
       rect.yTop    = height - rect.yTop;
       rect.yBottom = height - rect.yBottom;
@@ -531 +531 @@
 BOOL WIN32API GetUpdateRect (HWND hwnd, LPRECT pRect, BOOL erase)
 {
-   if (hwnd)
+   if (!hwnd)
    {
       O32_SetLastError (ERROR_INVALID_HANDLE);
@@ -540 +540 @@
    Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
 
-   BOOL updateRegionExists = WinQueryUpdateRect (hwnd, pRect ? &rectl : NULL);
+   if (!wnd)
+   {
+      O32_SetLastError (ERROR_INVALID_HANDLE);
+      return FALSE;
+   }
+
+   BOOL updateRegionExists = WinQueryUpdateRect (wnd->getOS2WindowHandle(), pRect ? &rectl : NULL);
    if (!pRect) {
       return (updateRegionExists);
@@ -562 +568 @@
       else
       {
-         long height   = wnd->getWindowHeight();
+         long height   = wnd->getClientHeight();
          rectl.yTop    = height - rectl.yTop;
          rectl.yBottom = height - rectl.yBottom;
@@ -586 +592 @@
    LONG Complexity;
 
-   Complexity = O32_GetUpdateRgn (hwnd, hrgn, FALSE);
-   if (erase && (Complexity > NULLREGION_W)) {
-       Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-       sendEraseBkgnd (wnd);
-   }
+   Win32BaseWindow *wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+
+   if (!wnd)
+   {
+      O32_SetLastError (ERROR_INVALID_HANDLE);
+      return ERROR_W;
+   }
+
+   Complexity = O32_GetUpdateRgn (wnd->getOS2WindowHandle(), hrgn, FALSE);
+   if (erase && (Complexity > NULLREGION_W)) sendEraseBkgnd (wnd);
 
    return Complexity;
@@ -615 +626 @@
    if (hwnd)
    {
-        wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-        if(wnd == NULL) {
-                dprintf (("ERROR: User32: GetDCEx bad window handle %X!!!!!", hwnd));
-                O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
-                return 0;
-        }
+        wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
+        if(wnd == NULL) {
+                dprintf (("ERROR: User32: GetDCEx bad window handle %X!!!!!", hwnd));
+                O32_SetLastError(ERROR_INVALID_WINDOW_HANDLE_W);
+                return 0;
+        }
 //SvL: Experimental change (doesn't work right)
 #if 0
-        if(wnd->fHasParentDC() && wnd->getParent()) {
-                wnd = wnd->getParent();
-        }
+        if(wnd->fHasParentDC() && wnd->getParent()) {
+                wnd = wnd->getParent();
+        }
 #endif
-        if (flags & DCX_WINDOW_W)
-                hWindow = wnd->getOS2FrameWindowHandle();
-        else
-                hWindow = wnd->getOS2WindowHandle();
+        if (flags & DCX_WINDOW_W)
+                hWindow = wnd->getOS2FrameWindowHandle();
+        else
+                hWindow = wnd->getOS2WindowHandle();
    }
    else
@@ -906 +917 @@
       PRECTL pr;
       int i;
-      LONG height = wnd ? wnd->getWindowHeight() : OSLibQueryScreenHeight();
+      LONG height = wnd ? wnd->getClientHeight() : OSLibQueryScreenHeight();
 
       if (!hrgn)
@@ -930 +941 @@
    else if (pRect)
    {
-      LONG height = wnd ? wnd->getWindowHeight() : OSLibQueryScreenHeight();
+      LONG height = wnd ? wnd->getClientHeight() : OSLibQueryScreenHeight();
 
       PMRECT_FROM_WINRECT (rectl, *pRect);
@@ -1197 +1208 @@
 
    RECT winRectUpdate;
-   LONG height = wnd->getWindowHeight();
+   LONG height = wnd->getClientHeight();
 
    winRectUpdate.left   = rectlUpdate.xLeft;
@@ -1232 +1243 @@
     }
     dprintf(("ScrollWindow %x %d %d %x %x", hwnd, dx, dy, pScroll, pClip));
-    MapWin32ToOS2Rectl(window->getOS2WindowHandle(),window->getClientRect(), (PRECTLOS2)&clientRect);
+    mapWin32ToOS2Rect(window,window->getClientRect(), (PRECTLOS2)&clientRect);
     //Rectangle could be relative to parent window, so fix this
     if(clientRect.yBottom != 0) {
@@ -1243 +1254 @@
     }
     if(pScroll) {
-         MapWin32ToOS2Rectl(window->getOS2WindowHandle(),(RECT *)pScroll, (PRECTLOS2)&scrollRect);
+         mapWin32ToOS2Rect(window,(RECT *)pScroll, (PRECTLOS2)&scrollRect);
          pScrollRect = &scrollRect;
 
@@ -1256 +1267 @@
 
     if(pClip) {
-         MapWin32ToOS2Rectl(window->getOS2WindowHandle(),(RECT *)pClip, (PRECTLOS2)&clipRect);
+         mapWin32ToOS2Rect(window,(RECT *)pClip, (PRECTLOS2)&clipRect);
          pClipRect = &clipRect;
 
@@ -1300 +1311 @@
     if (scrollFlag & SW_SCROLLCHILDREN_W)  scrollFlags |= SW_SCROLLCHILDREN;
 
-    if(pScroll) MapWin32ToOS2Rectl(window->getOS2WindowHandle(),(RECT *)pScroll, (PRECTLOS2)&scrollRect);
-    if(pClip)   MapWin32ToOS2Rectl(window->getOS2WindowHandle(),(RECT *)pClip, (PRECTLOS2)&clipRect);
+    if(pScroll) mapWin32ToOS2Rect(window,(RECT *)pScroll, (PRECTLOS2)&scrollRect);
+    if(pClip)   mapWin32ToOS2Rect(window,(RECT *)pClip, (PRECTLOS2)&clipRect);
 
     RECTL rectlUpdate;
@@ -1324 +1335 @@
 
     RECT winRectUpdate;
-    LONG height = window->getWindowHeight();
+    LONG height = window->getClientHeight();
 
     winRectUpdate.left   = rectlUpdate.xLeft;
@@ -1391 +1402 @@
 {
     if(lprc) {
-         dprintf(("USER32: ValidateRect %x (%d,%d)(%d,%d)", hwnd, lprc->left, lprc->top, lprc->right, lprc->bottom));
-    } 
-    else dprintf(("USER32: ValidateRect %x", hwnd)); 
-   
+         dprintf(("USER32: ValidateRect %x (%d,%d)(%d,%d)", hwnd, lprc->left, lprc->top, lprc->right, lprc->bottom));
+    }
+    else dprintf(("USER32: ValidateRect %x", hwnd));
+
     return RedrawWindow( hwnd, lprc, 0, RDW_VALIDATE_W | RDW_NOCHILDREN_W | (hwnd==0 ? RDW_UPDATENOW_W : 0));
 }