[PATCH 0/3] MR3743: gdiplus: In GdipImageSelectActiveFrame() rely on codec->select_func() to fail.

[PATCH 1/3] gdiplus/tests: Fix compilation with PSDK compiler.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/gdiplus/tests/image.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 6f497e416b0..34a38cd980f 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -5733,7 +5733,7 @@ static void test_png_color_formats(void)
     GpImage *image;
     ImageType type;
     PixelFormat format;
-    ImageFlags flags;
+    UINT flags;
     BOOL valid;
     int i, j, PLTE_off = 0, tRNS_off = 0;
     const ImageFlags color_space_mask = ImageFlagsColorSpaceRGB | ImageFlagsColorSpaceCMYK | ImageFlagsColorSpaceGRAY | ImageFlagsColorSpaceYCBCR | ImageFlagsColorSpaceYCCK;
@@ -5925,7 +5925,7 @@ static void test_png_unit_properties(void)
         ULONG unitY;
     } td[] =
     {
-        {},
+        {0, 0, 0},
         {1, 0, 0},
         {0, 1000, 1000},
         {1, 1000, 1000},

[PATCH 2/3] gdiplus/tests: Add a test for calling GdipImageSelectActiveFrame() with invalid frame on a memory bitmap.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/gdiplus/tests/image.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 34a38cd980f..724c4a16349 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -470,6 +470,9 @@ static void test_GdipImageGetFrameDimensionsCount(void)
     expect(Ok, stat);
     expect(0xffffffff, color);

+    stat = GdipImageSelectActiveFrame((GpImage*)bm, &dimension, 1);
+    todo_wine expect(Ok, stat);
+
     GdipDisposeImage((GpImage*)bm);
 }

[PATCH 3/3] gdiplus: In GdipImageSelectActiveFrame rely on codec->select_func() to fail.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/gdiplus/image.c       | 5 +----
 dlls/gdiplus/tests/image.c | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 9b66edbd22b..c6aa2ce5dd5 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -4553,11 +4553,8 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d
         return ObjectBusy;

if (frame >= image->frame_count)
-    {
         WARN("requested frame %u, but image has only %u\n", frame, image->frame_count);
-        image_unlock(image);
-        return InvalidParameter;
-    }
+        /* rely on codec->select_func() to fail */

if (image->type != ImageTypeBitmap && image->type != ImageTypeMetafile)
     {
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index 724c4a16349..cd409a0bad4 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -471,7 +471,7 @@ static void test_GdipImageGetFrameDimensionsCount(void)
     expect(0xffffffff, color);

stat = GdipImageSelectActiveFrame((GpImage*)bm, &dimension, 1);
-    todo_wine expect(Ok, stat);
+    expect(Ok, stat);

GdipDisposeImage((GpImage*)bm);
 }

[PATCH 0/3] MR3743: gdiplus: In GdipImageSelectActiveFrame() rely on codec->select_func() to fail. - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.