diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ca4d8eb3bcd..0b326ed1b1e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -47,15 +47,9 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) switch(brush->bt){ case BrushTypeSolidColor: { - GpSolidFill *fill; *clone = GdipAlloc(sizeof(GpSolidFill)); if (!*clone) return OutOfMemory; - - fill = (GpSolidFill*)*clone; - memcpy(*clone, brush, sizeof(GpSolidFill)); - - fill->bmp = ARGB2BMP(fill->color); break; } case BrushTypeHatchFill: @@ -654,7 +648,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 +892,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 2a5fe690631..20812900a03 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 d300f595f91..fee6935d9bc 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 */