winex11.drv: Correctly handle overlapping source and destination regions on the…

winex11.drv: Correctly handle overlapping source and destination regions on the same DIB when copying DIBs client-side.

winex11.drv: Correctly handle overlapping source and destination regions on the…
28ddfe80 · Damjan Jovanovic · Alexandre Julliard · 28ca9a86 · 28ddfe80
Commit 28ddfe80 authored Aug 11, 2007 by Damjan Jovanovic Committed by Alexandre Julliard Aug 13, 2007
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

bitblt.c dlls/winex11.drv/bitblt.c +10 -1

No files found.
--- a/dlls/winex11.drv/bitblt.c
+++ b/dlls/winex11.drv/bitblt.c
@@ -1623,9 +1623,18 @@ static BOOL X11DRV_ClientSideDIBCopy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT 
      dstRowOffset = -dstDib.dsBm.bmWidthBytes;
    }

+    /* Handle overlapping regions on the same DIB */
+    if (physDevSrc == physDevDst && ySrc < yDst)
+    {
+      srcPtr += srcRowOffset * (height - 1);
+      srcRowOffset = -srcRowOffset;
+      dstPtr += dstRowOffset * (height - 1);
+      dstRowOffset = -dstRowOffset;
+    }
+
    for (y = yDst; y < yDst + height; ++y)
    {
-      memcpy(dstPtr, srcPtr, bytesToCopy);
+      memmove(dstPtr, srcPtr, bytesToCopy);
      srcPtr += srcRowOffset;
      dstPtr += dstRowOffset;
    }