Esme Povirk : gdiplus: Bracket HDC use in GdipMeasureCharacterRanges.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8f20be4ab84c074b4130360c2f124e51cb8fbef1
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8f20be4ab84c074b4130360c2f124e5...

Author: Esme Povirk 
Date:   Sat May  4 20:04:09 2024 +0000

gdiplus: Bracket HDC use in GdipMeasureCharacterRanges.

---

dlls/gdiplus/graphics.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 87971180d2d..a16932a31ab 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -5734,13 +5734,17 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics,
     if (regionCount < stringFormat->range_count)
         return InvalidParameter;

-    if(!graphics->hdc)
+    if(!has_gdi_dc(graphics))
     {
         hdc = temp_hdc = CreateCompatibleDC(0);
         if (!temp_hdc) return OutOfMemory;
     }
     else
-        hdc = graphics->hdc;
+    {
+        stat = gdi_dc_acquire(graphics, &hdc);
+        if (stat != Ok)
+            return stat;
+    }

if (stringFormat->attr)
         TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr);
@@ -5787,6 +5791,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics,

if (temp_hdc)
         DeleteDC(temp_hdc);
+    else
+        gdi_dc_release(graphics, hdc);

return stat;
 }