[PATCH v3 0/2] MR4638: gdiplus: Partially implement GdipDrawImageFX.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55945 Based on https://gitlab.winehq.org/gang65/wine/-/merge_requests/12. cc/ @gang65 -- v3: gdiplus: Partially implement GdipDrawImageFX. gdiplus/tests: Add GdipDrawImageFX tests except effects or attributes. https://gitlab.winehq.org/wine/wine/-/merge_requests/4638
From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> --- dlls/gdiplus/tests/graphics.c | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d71bc78c2ae..96bc5df7c6f 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1307,6 +1307,63 @@ static void test_GdipDrawLineI(void) ReleaseDC(hwnd, hdc); } +static void test_GdipDrawImageFX(void) +{ + GpGraphics *graphics = NULL; + GpMatrix *transform; + GpBitmap *bm = NULL; + GpStatus status; + GpRectF source; + BYTE buff[400]; + HDC hdc; + + if (!(hdc = GetDC( hwnd ))) + return; + + memset(buff, 0, sizeof(buff)); + status = GdipCreateBitmapFromScan0(10, 10, 40, PixelFormat32bppRGB, buff, &bm); + expect(Ok, status); + ok(NULL != bm, "Expected bitmap to be initialized\n"); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateMatrix2(2.0, 0.0, 0.0, 1.0, 10.0, 20.0, &transform); + expect(Ok, status); + + /* DrawImageFX with source rectangle */ + status = GdipDrawImageFX(graphics, NULL, &source, NULL, NULL, NULL, UnitPixel); + todo_wine + expect(InvalidParameter, status); + + /* DrawImageFX with source bitmap */ + status = GdipDrawImageFX(graphics, (GpImage*)bm, NULL, NULL, NULL, NULL, UnitPixel); + todo_wine + expect(Ok, status); + + /* DrawImageFX with source bitmap and transform */ + status = GdipDrawImageFX(graphics, (GpImage*)bm, NULL, transform, NULL, NULL, UnitPixel); + todo_wine + expect(Ok, status); + + /* DrawImageFX with source bitmap and source rectangle */ + source.X = source.Y = 0.0; + source.Height = source.Width = 10.0; + + status = GdipDrawImageFX(graphics, (GpImage*)bm, &source, NULL, NULL, NULL, UnitPixel); + todo_wine + expect(Ok, status); + + /* DrawImageFX with source bitmap, source rectangle, and transform */ + status = GdipDrawImageFX(graphics, (GpImage*)bm, &source, transform, NULL, NULL, UnitPixel); + todo_wine + expect(Ok, status); + + GdipDeleteMatrix(transform); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bm); + ReleaseDC(hwnd, hdc); +} + static void test_GdipDrawImagePointsRect(void) { GpStatus status; @@ -7395,6 +7452,7 @@ START_TEST(graphics) test_GdipDrawCurve3I(); test_GdipDrawLineI(); test_GdipDrawLinesI(); + test_GdipDrawImageFX(); test_GdipDrawImagePointsRect(); test_GdipFillClosedCurve(); test_GdipFillClosedCurveI(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4638
From: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55945 --- dlls/gdiplus/graphics.c | 43 +++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/graphics.c | 5 ---- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5101378d0e1..a952328ed21 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2947,13 +2947,48 @@ GpStatus WINGDIPAPI GdipDrawImage(GpGraphics *graphics, GpImage *image, REAL x, 0.0, 0.0, (REAL)width, (REAL)height, UnitPixel); } -GpStatus WINGDIPAPI GdipDrawImageFX(GpGraphics *graphics, GpImage *image, GpRectF *src, +GpStatus WINGDIPAPI GdipDrawImageFX(GpGraphics *graphics, GpImage *image, GpRectF *src_rect, GpMatrix *transform, CGpEffect *effect, GpImageAttributes *imageattr, - GpUnit srcUnit) + GpUnit src_unit) { - FIXME("(%p, %p, %p, %p, %p, %p, %d): stub\n", graphics, image, src, transform, effect, imageattr, srcUnit); + GpRectF src_rect_buf; + GpPointF points[3]; + GpStatus status; - return NotImplemented; + TRACE("(%p, %p, %p, %p, %p, %p, %d)\n", graphics, image, src_rect, transform, effect, imageattr, src_unit); + + if (!graphics || !image) + return InvalidParameter; + + if (effect) + FIXME("effect not implemented\n"); + + if (!src_rect) + { + if ((status = GdipGetImageBounds(image, &src_rect_buf, &src_unit)) != Ok) + return status; + + if (src_rect_buf.X != 0.0 || src_rect_buf.Y != 0.0) + { + FIXME("image bounds %s left-top not at origin", debugstr_rectf(&src_rect_buf)); + /* TODO: should we force them to be at origin? */ + } + + src_rect = &src_rect_buf; + } + + points[0].X = points[2].X = src_rect->X; + points[0].Y = points[1].Y = src_rect->Y; + points[1].X = src_rect->X + src_rect->Width; + points[2].Y = src_rect->Y + src_rect->Height; + + if (transform) + GdipTransformMatrixPoints(transform, points, 3); + + return GdipDrawImagePointsRect(graphics, image, points, 3, + src_rect->X, src_rect->Y, + src_rect->Width, src_rect->Height, + src_unit, imageattr, NULL, NULL); } GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 96bc5df7c6f..54960beabb3 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1332,17 +1332,14 @@ static void test_GdipDrawImageFX(void) /* DrawImageFX with source rectangle */ status = GdipDrawImageFX(graphics, NULL, &source, NULL, NULL, NULL, UnitPixel); - todo_wine expect(InvalidParameter, status); /* DrawImageFX with source bitmap */ status = GdipDrawImageFX(graphics, (GpImage*)bm, NULL, NULL, NULL, NULL, UnitPixel); - todo_wine expect(Ok, status); /* DrawImageFX with source bitmap and transform */ status = GdipDrawImageFX(graphics, (GpImage*)bm, NULL, transform, NULL, NULL, UnitPixel); - todo_wine expect(Ok, status); /* DrawImageFX with source bitmap and source rectangle */ @@ -1350,12 +1347,10 @@ static void test_GdipDrawImageFX(void) source.Height = source.Width = 10.0; status = GdipDrawImageFX(graphics, (GpImage*)bm, &source, NULL, NULL, NULL, UnitPixel); - todo_wine expect(Ok, status); /* DrawImageFX with source bitmap, source rectangle, and transform */ status = GdipDrawImageFX(graphics, (GpImage*)bm, &source, transform, NULL, NULL, UnitPixel); - todo_wine expect(Ok, status); GdipDeleteMatrix(transform); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4638
On Sat Dec 9 06:03:50 2023 +0000, Esme Povirk wrote:
This is going to use the contents of `buff` uninitialized. Resolved by zeroing the buffer. (Yes, admittedly the MR was rushed for no good reason, sorry.)
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4638#note_55588
On Sat Dec 9 06:03:58 2023 +0000, Esme Povirk wrote:
`transform` is never deleted. Fixed.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4638#note_55589
On Sat Dec 9 06:02:39 2023 +0000, Jinoh Kang wrote:
changed this line in [version 3 of the diff](/wine/wine/-/merge_requests/4638/diffs?diff_id=89257&start_sha=1698dbc7259ad1e3b7f75d7ccc10cd2f538320f4#aaf93e29527c1cbc47ec54679da5828ebd679128_2969_2968) Clarified the FIXME. The FIXME is now emitted for bounds not at origin, which only happens for metafiles and is hopefully rare.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4638#note_55590
participants (2)
-
Bartosz Kosiorek -
Jinoh Kang (＠iamahuman)