gdiplus: Don't call PlayEnhMetaFileRecord for records handled by gdiplus.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdiplus: Don't call PlayEnhMetaFileRecord for records handled by gdiplus.
7860d11e · Andrew Eikum · Alexandre Julliard · c51b41f9 · 7860d11e
Commit 7860d11e authored Aug 25, 2017 by Andrew Eikum Committed by Alexandre Julliard Aug 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 15 deletions

metafile.c dlls/gdiplus/metafile.c +16 -15

No files found.
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -1423,8 +1423,6 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile,
        /* regular EMF record */
        if (metafile->playback_dc)
        {
-            ENHMETARECORD *record;
            switch (recordType)
            {
            case EMR_SETMAPMODE:
@@ -1469,24 +1467,27 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile,
                return Ok;
            }
            default:
-                break;
+            {
-            }
+                ENHMETARECORD *record = heap_alloc_zero(dataSize + 8);
-            record = heap_alloc_zero(dataSize + 8);
+                if (record)
+                {
+                    record->iType = recordType;
+                    record->nSize = dataSize + 8;
+                    memcpy(record->dParm, data, dataSize);
-            if (record)
+                    if(PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table,
-            {
+                            record, metafile->handle_count) == 0)
-                record->iType = recordType;
+                        ERR("PlayEnhMetaFileRecord failed\n");
-                record->nSize = dataSize + 8;
-                memcpy(record->dParm, data, dataSize);
-                PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table,
+                    heap_free(record);
-                    record, metafile->handle_count);
+                }
+                else
+                    return OutOfMemory;
-                heap_free(record);
+                break;
+            }
            }
-            else
-                return OutOfMemory;
        }
    }
    else