Shawn M. Chapla : gdiplus: Set GDI world xform to the identity xform on acquisition.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b0f665045245035f014c516b3143ff85146d1a54
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b0f665045245035f014c516b3143ff85146d1a54

Author: Shawn M. Chapla <schapla at codeweavers.com>
Date:   Tue Jun 30 13:04:04 2020 -0400

gdiplus: Set GDI world xform to the identity xform on acquisition.

Signed-off-by: Shawn M. Chapla <schapla at codeweavers.com>
Signed-off-by: Esme Povirk <esme at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/gdiplus/graphics.c       | 1 +
 dlls/gdiplus/tests/graphics.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 3c5e25ec41..6c50d2d56c 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -6789,6 +6789,7 @@ GpStatus gdi_transform_acquire(GpGraphics *graphics)
     if (graphics->gdi_transform_acquire_count == 0 && graphics->hdc)
     {
         graphics->gdi_transform_save = SaveDC(graphics->hdc);
+        ModifyWorldTransform(graphics->hdc, NULL, MWT_IDENTITY);
         SetGraphicsMode(graphics->hdc, GM_COMPATIBLE);
         SetMapMode(graphics->hdc, MM_TEXT);
         SetWindowOrgEx(graphics->hdc, 0, 0, NULL);
diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index 39002ca570..d1f0d03ddc 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -7012,7 +7012,7 @@ static void test_gdi_interop_hdc(void)
     expect(0x00aa00ff, bits[6 * 100 + 6]);
     expect(0x00aa00ff, bits[26 * 100 + 26]);
     expect(0x00aa00ff, bits[36 * 100 + 36]);
-    todo_wine expect(0xffaa00ff, bits[86 * 100 + 86]);
+    expect(0xffaa00ff, bits[86 * 100 + 86]);
 
     DeleteDC(src_hdc);
     DeleteObject(hbm);