[PATCH 2/2] gdiplus: Partially implement GdipDrawImageFX.

[Bartosz Kosiorek]

From: Bartosz Kosiorek

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55945
---
 dlls/gdiplus/graphics.c       | 37 ++++++++++++++++++++++++++++++++---
 dlls/gdiplus/tests/graphics.c |  5 -----
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 5101378d0e1..93021a736d8 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -2947,13 +2947,44 @@ 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_argp,
     GpMatrix *transform, CGpEffect *effect, GpImageAttributes *imageattr,
     GpUnit srcUnit)
 {
-    FIXME("(%p, %p, %p, %p, %p, %p, %d): stub\n", graphics, image, src, transform, effect, imageattr, srcUnit);
+    GpPointF points[3];
+    GpRectF src_rect;
+    GpStatus status;

-    return NotImplemented;
+    TRACE("(%p, %p, %p, %p, %p, %p, %d)\n", graphics, image, src_argp, transform, effect, imageattr, srcUnit);
+
+    if (!graphics || !image)
+        return InvalidParameter;
+
+    if (effect)
+        FIXME("effect not implemented\n");
+
+    if (!src_argp)
+    {
+        if (image->type != ImageTypeBitmap)
+            FIXME("src rect is NULL and source is not bitmap\n");
+
+        if ((status = GdipGetImageBounds(image, &src_rect, &srcUnit)) != Ok)
+            return status;
+    }
+    else src_rect = *src_argp;
+
+    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,
+                                   srcUnit, 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 6d7f0ec1ea8..fe2ab34f562 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -1338,17 +1338,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 */
@@ -1356,12 +1353,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);

GdipDisposeImage((GpImage*)bm);