commit 409eb44eb00e0fc1a0ebc7ed1a5eed6e59841d88
author Ulrich Weigand <weigand@immd1.informatik.uni-erlangen.de> Mon Oct 23 00:35:28 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Oct 23 00:35:28 2000 +0000
tree 3e64eb096ca006bb6d7ad4b6d2515c6405d2d758
parent 959d73e8dd2cfebedb93e3025525037fdc953dfb

Fixed painting problems in non-MM_TEXT modes.

windows/scroll.c

diff --git a/windows/scroll.c b/windows/scroll.c
index 4eb1760..2cabfbf 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -97,18 +97,27 @@
 	  dc->wndOrgY, dc->wndExtY, dc->vportOrgY, dc->vportExtY );
 */
 
-    /* compute device clipping region */
+    /* compute device clipping region (in device coordinates) */
 
     if ( rc )
 	rect = *rc;
     else /* maybe we should just return FALSE? */
 	GetClipBox( hdc, &rect );
 
+    LPtoDP( hdc, (LPPOINT)&rect, 2 );
+
     if (prLClip)
-	IntersectRect( &rClip,&rect,prLClip );
+    {
+        rClip = *prLClip;
+        LPtoDP( hdc, (LPPOINT)&rClip, 2 );
+	IntersectRect( &rClip, &rect, &rClip );
+    }
     else
         rClip = rect;
 
+    dx = XLPTODP ( dc, rect.left + dx ) - XLPTODP ( dc, rect.left );
+    dy = YLPTODP ( dc, rect.top + dy ) - YLPTODP ( dc, rect.top );
+
     rSrc = rClip;
     OffsetRect( &rSrc, -dx, -dy );
     IntersectRect( &rSrc, &rSrc, &rect );
@@ -121,6 +130,10 @@
             dest.y = (src.y = rSrc.top) + dy;
 
             /* copy bits */
+    
+            DPtoLP( hdc, (LPPOINT)&rSrc, 2 );
+            DPtoLP( hdc, &src, 1 );
+            DPtoLP( hdc, &dest, 1 );
 
             if (!BitBlt( hdc, dest.x, dest.y,
                            rSrc.right - rSrc.left, rSrc.bottom - rSrc.top,
@@ -139,10 +152,6 @@
               (hrgnUpdate) ? hrgnUpdate : CreateRectRgn( 0,0,0,0 );
             HRGN hrgn2;
 
-            dx = XLPTODP ( dc, rect.left + dx) - XLPTODP ( dc, rect.left);
-            dy = YLPTODP ( dc, rect.top + dy) - YLPTODP ( dc, rect.top);
-            LPtoDP( hdc, (LPPOINT)&rect, 2 );
-            LPtoDP( hdc, (LPPOINT)&rClip, 2 );
             hrgn2 = CreateRectRgnIndirect( &rect );
             OffsetRgn( hrgn2, dc->w.DCOrgX, dc->w.DCOrgY );
             CombineRgn( hrgn2, hrgn2, dc->w.hVisRgn, RGN_AND );