gdiplus: Create GDI bitmap only when needed.
Dmitry Timoshkov
dmitry at baikal.ru
Sun Mar 11 00:58:08 CST 2012
This patch fixes another source of GDI object leaks in gdiplus.
---
dlls/gdiplus/brush.c | 7 -------
dlls/gdiplus/gdiplus_private.h | 1 -
dlls/gdiplus/graphics.c | 9 +++++----
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
index ca4d8eb..428cbe9 100644
--- a/dlls/gdiplus/brush.c
+++ b/dlls/gdiplus/brush.c
@@ -54,8 +54,6 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone)
fill = (GpSolidFill*)*clone;
memcpy(*clone, brush, sizeof(GpSolidFill));
-
- fill->bmp = ARGB2BMP(fill->color);
break;
}
case BrushTypeHatchFill:
@@ -654,7 +652,6 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf)
(*sf)->brush.bt = BrushTypeSolidColor;
(*sf)->color = color;
- (*sf)->bmp = ARGB2BMP(color);
TRACE("<-- %p\n", *sf);
@@ -899,10 +896,6 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush)
GdipFree(((GpPathGradient*) brush)->blendfac);
GdipFree(((GpPathGradient*) brush)->blendpos);
break;
- case BrushTypeSolidColor:
- if (((GpSolidFill*)brush)->bmp)
- DeleteObject(((GpSolidFill*)brush)->bmp);
- break;
case BrushTypeLinearGradient:
GdipFree(((GpLineGradient*)brush)->blendfac);
GdipFree(((GpLineGradient*)brush)->blendpos);
diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 2a5fe69..2081290 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -183,7 +183,6 @@ struct GpHatch{
struct GpSolidFill{
GpBrush brush;
ARGB color;
- HBITMAP bmp;
};
struct GpPathGradient{
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index d300f59..fee6935 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -847,7 +847,9 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush)
case BrushTypeSolidColor:
{
GpSolidFill *fill = (GpSolidFill*)brush;
- if (fill->bmp)
+ HBITMAP bmp = ARGB2BMP(fill->color);
+
+ if (bmp)
{
RECT rc;
/* partially transparent fill */
@@ -856,12 +858,11 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush)
if (GetClipBox(graphics->hdc, &rc) != NULLREGION)
{
HDC hdc = CreateCompatibleDC(NULL);
- HBITMAP oldbmp;
BLENDFUNCTION bf;
if (!hdc) break;
- oldbmp = SelectObject(hdc, fill->bmp);
+ SelectObject(hdc, bmp);
bf.BlendOp = AC_SRC_OVER;
bf.BlendFlags = 0;
@@ -870,10 +871,10 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush)
GdiAlphaBlend(graphics->hdc, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, hdc, 0, 0, 1, 1, bf);
- SelectObject(hdc, oldbmp);
DeleteDC(hdc);
}
+ DeleteObject(bmp);
break;
}
/* else fall through */
--
1.7.9.2
More information about the wine-patches
mailing list