[ros-diffs] [tkreuzer] 33861: patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com, irc: Goplat): fix coordinate transformation for NtGdiSetDIBitsToDevice, fixes bug 3200 See issue #3294 for more details.

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Thu Jun  5 17:23:19 2008
New Revision: 33861

URL: http://svn.reactos.org/svn/reactos?rev=33861&view=rev
Log:
patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com, irc: Goplat):
fix coordinate transformation for NtGdiSetDIBitsToDevice,
fixes bug 3200
See issue #3294 for more details.

Modified:
    trunk/reactos/dll/win32/gdi32/objects/bitmap.c
    trunk/reactos/subsystems/win32/win32k/objects/dibobj.c

Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bitmap.c?rev=33861&r1=33860&r2=33861&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Thu Jun  5 17:23:19 2008
@@ -447,8 +447,9 @@
                                           ColorUse,
                                           lpbmi->bmiHeader.biSizeImage,
                                           lpbmi->bmiHeader.biSize,
-                                          FALSE,
+                                          TRUE,
                                           NULL);
 }
 
 
+

Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/dibobj.c?rev=33861&r1=33860&r2=33861&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Jun  5 17:23:19 2008
@@ -372,8 +372,14 @@
 
     rcDest.left = XDest;
     rcDest.top = YDest;
-    rcDest.right = XDest + Width;
-    rcDest.bottom = YDest + Height;
+    if (bTransformCoordinates)
+    {
+        CoordLPtoDP(pDC, (LPPOINT)&rcDest);
+    }
+    rcDest.left += pDC->ptlDCOrig.x;
+    rcDest.top += pDC->ptlDCOrig.y;
+    rcDest.right = rcDest.left + Width;
+    rcDest.bottom = rcDest.top + Height;
     ptSource.x = XSrc;
     ptSource.y = YSrc;