Module: wine Branch: master Commit: e7b4e883d192d4b1a82f51a6d8f819f45b6c2609 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7b4e883d192d4b1a82f51a6d8f819f...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Thu Mar 23 19:51:17 2023 +0300
gdiplus: In GdipImageSelectActiveFrame rely on codec->select_func() to fail.
Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru
---
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); }