From: Bartosz Kosiorek <gang65@poczta.onet.pl> In case HEMF (Handle to an Enhanced Metafile) is missing, we should return InvalidParameter --- dlls/gdiplus/image.c | 3 +++ dlls/gdiplus/tests/metafile.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ce644d98478..7adb97c1ef2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2337,6 +2337,9 @@ GpStatus WINGDIPAPI GdipGetImageWidth(GpImage *image, UINT *width) if(!image || !width) return InvalidParameter; + + if(!((GpMetafile*)image)->hemf) + return InvalidParameter; if(image->type == ImageTypeMetafile) *width = units_to_pixels(((GpMetafile*)image)->bounds.Width, ((GpMetafile*)image)->unit, diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 04b6eb02aad..11eac354dc7 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1483,7 +1483,7 @@ static void test_pagetransform(void) expect(InvalidParameter, stat); stat = GdipGetImageWidth((GpImage*)metafile, &width); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipGetImageHeight((GpImage*)metafile, &height); todo_wine expect(InvalidParameter, stat); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10480