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 7adb97c1ef2..ee89b11ffc0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2222,6 +2222,9 @@ GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height) if(!image || !height) return InvalidParameter; + if(!((GpMetafile*)image)->hemf) + return InvalidParameter; + if(image->type == ImageTypeMetafile) *height = units_to_pixels(((GpMetafile*)image)->bounds.Height, ((GpMetafile*)image)->unit, image->yres, ((GpMetafile*)image)->printer_display); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 11eac354dc7..9ee052b23d3 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1486,7 +1486,7 @@ static void test_pagetransform(void) expect(InvalidParameter, stat); stat = GdipGetImageHeight((GpImage*)metafile, &height); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); expect(Ok, stat); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10480