[PATCH v3] gdi32: Fix handling of ModifyWorldTransform( MWT_IDENTITY ) on an emf dc.

[Huw Davies]

From: Zhiyi Zhang <zzhang(a)codeweavers.com>

When the mode parameter is MWT_IDENTITY, the xform parameter can be NULL because it should be
ignored and use the identity matrix.

Fix Tally crashing when exporting a JPEG image.

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
 dlls/gdi32/enhmfdrv/dc.c    | 14 +++++++++++++-
 dlls/gdi32/tests/metafile.c | 15 +++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c
index 16251939714..2a749418829 100644
--- a/dlls/gdi32/enhmfdrv/dc.c
+++ b/dlls/gdi32/enhmfdrv/dc.c
@@ -362,7 +362,19 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m
 
     emr.emr.iType = EMR_MODIFYWORLDTRANSFORM;
     emr.emr.nSize = sizeof(emr);
-    emr.xform = *xform;
+    if (mode == MWT_IDENTITY)
+    {
+        emr.xform.eM11 = 1.0f;
+        emr.xform.eM12 = 0.0f;
+        emr.xform.eM21 = 0.0f;
+        emr.xform.eM22 = 1.0f;
+        emr.xform.eDx = 0.0f;
+        emr.xform.eDy = 0.0f;
+    }
+    else
+    {
+        emr.xform = *xform;
+    }
     emr.iMode = mode;
 
     if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c
index e81cff1ae57..648e9369803 100644
--- a/dlls/gdi32/tests/metafile.c
+++ b/dlls/gdi32/tests/metafile.c
@@ -4158,6 +4158,18 @@ static INT CALLBACK enum_emf_WorldTransform(HDC hdc, HANDLETABLE *ht,
 
                     CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale);
                 }
+                else if(lpXfrm->iMode == MWT_IDENTITY)
+                {
+                    /* reset to identity matrix also does discard */
+                    test_data->stored.eM11 = 1.0f;
+                    test_data->stored.eM12 = 0.0f;
+                    test_data->stored.eM21 = 0.0f;
+                    test_data->stored.eM22 = 1.0f;
+                    test_data->stored.eDx = 0.0f;
+                    test_data->stored.eDy = 0.0f;
+
+                    CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale);
+                }
 
                 /* verify it is updated immediately */
                 ret = GetWorldTransform(hdc, &xform);
@@ -4265,6 +4277,9 @@ static void test_emf_WorldTransform(void)
         ret = SetWorldTransform(hdcMetafile, &xform); /* EMR_SETWORLDTRANSFORM */
         ok(ret == TRUE, "SetWorldTransform failed\n");
 
+        ret = ModifyWorldTransform(hdcMetafile, NULL, MWT_IDENTITY); /* EMR_MODIFYWORLDTRANSFORM */
+        ok(ret == TRUE, "ModifyWorldTransform failed\n");
+
         set_rotation_xform(&xform, M_PI / 2.f, -2, -3);
         ret = ModifyWorldTransform(hdcMetafile, &xform, MWT_LEFTMULTIPLY); /* EMR_MODIFYWORLDTRANSFORM */
         ok(ret == TRUE, "ModifyWorldTransform failed\n");
-- 
2.23.0

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=87991

Your paranoid android.


=== debiant2 (build log) ===

Task: Could not create the win32 wineprefix: Failed to disable the crash dialogs: 
Task: WineTest did not produce the 0 report

=== debiant2 (build log) ===

Task: Could not create the wow32 wineprefix: Failed to disable the crash dialogs: 
Task: WineTest did not produce the 0 report