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

Timestamp:

Jun 2, 2001, 4:26:52 PM (24 years ago)

Author:

sandervl

Message:

ScrollDC fix; clip & scroll rect translation

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.106 2001-05-30 08:00:29 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.107 2001-06-02 14:26:52 sandervl Exp $ */
 
 /*
@@ -1497 +1497 @@
     BOOL rc = TRUE;
 
-    dprintf (("USER32: ScrollDC %x (%d,%d), %x %x %x %x", hDC, dx, dy, pScroll, pClip, hrgnUpdate, pRectUpdate));
-
     if (!hDC)
     {
+        dprintf (("USER32: ScrollDC %x (%d,%d), %x %x %x %x -> invalid hdc", hDC, dx, dy, pScroll, pClip, hrgnUpdate, pRectUpdate));
         return (FALSE);
     }
@@ -1511 +1510 @@
     else {
         //assume (for now) that this is not allowed (TODO)
+        dprintf (("USER32: ScrollDC %x (%d,%d), %x %x %x %x", hDC, dx, dy, pScroll, pClip, hrgnUpdate, pRectUpdate));
         dprintf(("ScrollDC used for frame HDC!!"));
         DebugInt3();
         return FALSE;
     }
-
     if((hwnd == NULLHANDLE) || !wnd)
     {
+        dprintf (("USER32: ScrollDC %x (%d,%d), %x %x %x %x -> invalid window handle", hDC, dx, dy, pScroll, pClip, hrgnUpdate, pRectUpdate));
         return (FALSE);
     }
 
+    dprintf (("USER32: ScrollDC %x (hwnd %x) (%d,%d), %x %x %x %x", hDC, wnd->getWindowHandle(), dx, dy, pScroll, pClip, hrgnUpdate, pRectUpdate));
     POINTL ptl[2] = { 0, 0, dx, dy };
 
@@ -1532 +1533 @@
     if (pClip)
     {
+        dprintf (("ScrollDC: Clip rectangle (%d,%d)(%d,%d)", pClip->left, pClip->top, pClip->right, pClip->bottom));
+#if 1
+        clipRect = *pClip;
+        LPtoDP(hDC, (LPPOINT)&clipRect, 2);
+#else
         memcpy(&clipRect, pClip, sizeof(clipRect));
 
@@ -1559 +1565 @@
             clipRect.bottom  = temp;
         }
+#endif
     }
 
     if (pScroll)
     {
+#if 1
+        dprintf (("ScrollDC: Scroll rectangle (%d,%d)(%d,%d)", pScroll->left, pScroll->top, pScroll->right, pScroll->bottom));
+        scrollRect = *pScroll;
+        LPtoDP(hDC, (LPPOINT)&scrollRect, 2);
+#else
         memcpy(&scrollRect, pScroll, sizeof(scrollRect));
 
@@ -1590 +1602 @@
             scrollRect.bottom = temp;
         }
+#endif
     }
     RECTL  rectlUpdate;
@@ -1602 +1615 @@
         mapWin32ToOS2Rect(wnd->getClientHeight(), &scrollRect, (PRECTLOS2)&scrollOS2);
         pScrollOS2 = &scrollOS2;
+        dprintf2(("ScrollDC: PM Scroll rectangle (%d,%d)(%d,%d)", pScrollOS2->xLeft, pScrollOS2->yBottom, pScrollOS2->xRight, pScrollOS2->yTop));
     }
 
@@ -1607 +1621 @@
         mapWin32ToOS2Rect(wnd->getClientHeight(), &clipRect, (PRECTLOS2)&clipOS2);
         pClipOS2 = &clipOS2;
+        dprintf2(("ScrollDC: PM Clip rectangle (%d,%d)(%d,%d)", pClipOS2->xLeft, pClipOS2->yBottom, pClipOS2->xRight, pClipOS2->yTop));
     }
 
@@ -1620 +1635 @@
     if (lComplexity == RGN_ERROR)
     {
+        dprintf(("ScrollDC: lComplexity == RGN_ERROR" ));
         return (FALSE);
     }
@@ -1625 +1641 @@
     RECT winRectUpdate;
 
+    dprintf2(("ScrollDC: PM Update rectangle (%d,%d)(%d,%d)", rectlUpdate.xLeft, rectlUpdate.yBottom, rectlUpdate.xRight, rectlUpdate.yTop));
+
     mapOS2ToWin32Rect(wnd->getClientHeight(), (PRECTLOS2)&rectlUpdate, &winRectUpdate);
+
+    dprintf2(("ScrollDC: Update rectangle (%d,%d)(%d,%d)", winRectUpdate.left, winRectUpdate.top, winRectUpdate.right, winRectUpdate.bottom));
 
     if (pRectUpdate)