gdiplus: Add clipping to GDI32_GdipFillRegion.

Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdiplus: Add clipping to GDI32_GdipFillRegion.
3fd47e1b · Vincent Povirk · Alexandre Julliard · 5a9f7ef0 · 3fd47e1b
Commit 3fd47e1b authored Sep 19, 2016 by Vincent Povirk Committed by Alexandre Julliard Sep 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 1 deletion

graphics.c dlls/gdiplus/graphics.c +17 -1

No files found.
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -3942,6 +3942,23 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush,

    ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND);

+    DeleteObject(hrgn);
+
+    hrgn = NULL;
+    status = get_clip_hrgn(graphics, &hrgn);
+
+    if (status != Ok)
+    {
+        RestoreDC(graphics->hdc, save_state);
+        return status;
+    }
+
+    if (hrgn)
+    {
+        ExtSelectClipRgn(graphics->hdc, hrgn, RGN_AND);
+        DeleteObject(hrgn);
+    }
+
    if (GetClipBox(graphics->hdc, &rc) != NULLREGION)
    {
        BeginPath(graphics->hdc);
@@ -3953,7 +3970,6 @@ static GpStatus GDI32_GdipFillRegion(GpGraphics* graphics, GpBrush* brush,

    RestoreDC(graphics->hdc, save_state);

-    DeleteObject(hrgn);

    return Ok;
 }