[PATCH 0/2] MR4287: gdiplus: -Wenum-conversion warning fixes

[PATCH 1/2] gdiplus/tests: Avoid implicit casts from MetafileType to EmfType.

[Jacek Caban]

From: Jacek Caban

---
 dlls/gdiplus/tests/metafile.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c
index 0b7c8ad9827..0b7bdb8b19d 100644
--- a/dlls/gdiplus/tests/metafile.c
+++ b/dlls/gdiplus/tests/metafile.c
@@ -392,16 +392,16 @@ static void test_empty(void)
     stat = GdipRecordMetafile(NULL, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile);
     expect(InvalidParameter, stat);

-    stat = GdipRecordMetafile(hdc, MetafileTypeInvalid, &frame, MetafileFrameUnitPixel, description, &metafile);
+    stat = GdipRecordMetafile(hdc, (EmfType)MetafileTypeInvalid, &frame, MetafileFrameUnitPixel, description, &metafile);
     expect(InvalidParameter, stat);

-    stat = GdipRecordMetafile(hdc, MetafileTypeWmf, &frame, MetafileFrameUnitPixel, description, &metafile);
+    stat = GdipRecordMetafile(hdc, (EmfType)MetafileTypeWmf, &frame, MetafileFrameUnitPixel, description, &metafile);
     expect(InvalidParameter, stat);

-    stat = GdipRecordMetafile(hdc, MetafileTypeWmfPlaceable, &frame, MetafileFrameUnitPixel, description, &metafile);
+    stat = GdipRecordMetafile(hdc, (EmfType)MetafileTypeWmfPlaceable, &frame, MetafileFrameUnitPixel, description, &metafile);
     expect(InvalidParameter, stat);

-    stat = GdipRecordMetafile(hdc, MetafileTypeEmfPlusDual+1, &frame, MetafileFrameUnitPixel, description, &metafile);
+    stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusDual+1, &frame, MetafileFrameUnitPixel, description, &metafile);
     expect(InvalidParameter, stat);

stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, NULL);
@@ -1937,7 +1937,7 @@ static void test_converttoemfplus(void)

hdc = CreateCompatibleDC(0);

-    stat = GdipRecordMetafile(hdc, MetafileTypeEmf, &frame, MetafileFrameUnitPixel, description, &metafile);
+    stat = GdipRecordMetafile(hdc, EmfTypeEmfOnly, &frame, MetafileFrameUnitPixel, description, &metafile);
     expect(Ok, stat);

stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &emhmeta);
@@ -1961,10 +1961,10 @@ static void test_converttoemfplus(void)
     stat = pGdipConvertToEmfPlus(graphics, metafile, &succ, EmfTypeEmfPlusOnly, description, NULL);
     expect(InvalidParameter, stat);

-    stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, MetafileTypeInvalid, NULL, &metafile2);
+    stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, 0, NULL, &metafile2);
     expect(InvalidParameter, stat);

-    stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, MetafileTypeEmfPlusDual+1, NULL, &metafile2);
+    stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, EmfTypeEmfPlusDual+1, NULL, &metafile2);
     expect(InvalidParameter, stat);

/* If we are already an Enhanced Metafile then the conversion fails. */

[PATCH 2/2] gdiplus: Avoid implicit enum casts.

[Jacek Caban]

From: Jacek Caban

---
 dlls/gdiplus/image.c    | 2 +-
 dlls/gdiplus/metafile.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index c6aa2ce5dd5..1fe259f6096 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -6066,7 +6066,7 @@ GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette *palette,
         ColorPalette *wic_palette;
         GpStatus status = Ok;

-        wic_palette = get_palette(NULL, type);
+        wic_palette = get_palette(NULL, (WICBitmapPaletteType)type);
         if (!wic_palette) return OutOfMemory;

if (palette->Count >= wic_palette->Count)
diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c
index 0664aa5fc89..265aec65c1f 100644
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -4531,7 +4531,7 @@ GpStatus WINGDIPAPI GdipRecordMetafileFileName(GDIPCONST WCHAR* fileName,
     (*metafile)->bounds.X = (*metafile)->bounds.Y = 0.0;
     (*metafile)->bounds.Width = (*metafile)->bounds.Height = 1.0;
     (*metafile)->unit = UnitPixel;
-    (*metafile)->metafile_type = type;
+    (*metafile)->metafile_type = (MetafileType)type;
     (*metafile)->record_dc = record_dc;
     (*metafile)->comment_data = NULL;
     (*metafile)->comment_data_size = 0;

[PATCH 0/2] MR4287: gdiplus: -Wenum-conversion warning fixes - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.