system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 13:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdiplus: Bracket HDC use in GdipDrawString.

Browse source
This commit is contained in:
Esme Povirk 2024-05-04 20:24:18 +00:00 committed by Alexandre Julliard
parent 9d30cddf06
commit d9d7e8f392
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/gdiplus/graphics.c
View file

@ -5987,6 +5987,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect,
GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush)
{
GpStatus status;
HRGN rgn = NULL;
HFONT gdifont;
GpPointF rectcpy[4];
@ -6005,9 +6006,11 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
if(!graphics || !string || !font || !brush || !rect)
return InvalidParameter;
if(graphics->hdc)
if(has_gdi_dc(graphics))
{
hdc = graphics->hdc;
status = gdi_dc_acquire(graphics, &hdc);
if (status != Ok)
return status;
}
else
{
@ -6097,7 +6100,10 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
RestoreDC(hdc, save_state);
DeleteDC(temp_hdc);
if (temp_hdc)
DeleteDC(temp_hdc);
else
gdi_dc_release(graphics, hdc);
return Ok;
}