Esme Povirk : gdiplus: Bracket HDC use in GDI32_GdipFillPath.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1c360a01c9cd92563d03ab1c3d4cd262ea810461
URL:    https://gitlab.winehq.org/wine/wine/-/commit/1c360a01c9cd92563d03ab1c3d4cd26...

Author: Esme Povirk 
Date:   Sat May  4 19:35:52 2024 +0000

gdiplus: Bracket HDC use in GDI32_GdipFillPath.

---

dlls/gdiplus/graphics.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index f04d4941310..1cf5da6f1f8 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -4433,42 +4433,47 @@ GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x

static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path)
 {
+    HDC hdc;
     INT save_state;
     GpStatus retval;
     HRGN hrgn=NULL;

-    if(!graphics->hdc || !brush_can_fill_path(brush, TRUE))
+    if(!brush_can_fill_path(brush, TRUE))
         return NotImplemented;

-    save_state = SaveDC(graphics->hdc);
-    EndPath(graphics->hdc);
-    SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE
-                                                                    : WINDING));
+    retval = gdi_dc_acquire(graphics, &hdc);
+    if (retval != Ok)
+        return retval;
+
+    save_state = SaveDC(hdc);
+    EndPath(hdc);
+    SetPolyFillMode(hdc, (path->fill == FillModeAlternate ? ALTERNATE : WINDING));

retval = get_clip_hrgn(graphics, &hrgn);

if (retval != Ok)
         goto end;

-    ExtSelectClipRgn(graphics->hdc, hrgn, RGN_COPY);
+    ExtSelectClipRgn(hdc, hrgn, RGN_COPY);

gdi_transform_acquire(graphics);

-    BeginPath(graphics->hdc);
+    BeginPath(hdc);
     retval = draw_poly(graphics, NULL, path->pathdata.Points,
                        path->pathdata.Types, path->pathdata.Count, FALSE);

if(retval == Ok)
     {
-        EndPath(graphics->hdc);
+        EndPath(hdc);
         retval = brush_fill_path(graphics, brush);
     }

gdi_transform_release(graphics);

end:
-    RestoreDC(graphics->hdc, save_state);
+    RestoreDC(hdc, save_state);
     DeleteObject(hrgn);
+    gdi_dc_release(graphics, hdc);

return retval;
 }