ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Always use AlphaBlend to draw to 32-bit DIB's.

This commit is contained in:
Vincent Povirk 2012-12-05 13:15:25 -06:00 committed by Alexandre Julliard
parent 431aa5bc3f
commit 81d9ffa041
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/gdiplus/gdiplus_private.h
View File

@ -152,6 +152,7 @@ struct GpGraphics{
HDC hdc; HDC hdc;
HWND hwnd; HWND hwnd;
BOOL owndc; BOOL owndc;
BOOL alpha_hdc;
GpImage *image; GpImage *image;
SmoothingMode smoothing; SmoothingMode smoothing;
CompositingQuality compqual; CompositingQuality compqual;

19
dlls/gdiplus/graphics.c
View File

@ -2250,6 +2250,8 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics)
GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **graphics) GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **graphics)
{ {
GpStatus retval; GpStatus retval;
HBITMAP hbitmap;
DIBSECTION dib;
TRACE("(%p, %p, %p)\n", hdc, hDevice, graphics); TRACE("(%p, %p, %p)\n", hdc, hDevice, graphics);
@ -2274,6 +2276,13 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra
return retval; return retval;
} }
hbitmap = GetCurrentObject(hdc, OBJ_BITMAP);
if (hbitmap && GetObjectW(hbitmap, sizeof(dib), &dib) == sizeof(dib) &&
dib.dsBmih.biBitCount == 32 && dib.dsBmih.biCompression == BI_RGB)
{
(*graphics)->alpha_hdc = 1;
}
(*graphics)->hdc = hdc; (*graphics)->hdc = hdc;
(*graphics)->hwnd = WindowFromDC(hdc); (*graphics)->hwnd = WindowFromDC(hdc);
(*graphics)->owndc = FALSE; (*graphics)->owndc = FALSE;
@ -3157,7 +3166,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
graphics->scale, image->xres, image->yres, bitmap->format, graphics->scale, image->xres, image->yres, bitmap->format,
imageAttributes ? imageAttributes->outside_color : 0); imageAttributes ? imageAttributes->outside_color : 0);
if (imageAttributes || if (imageAttributes || graphics->alpha_hdc ||
(graphics->image && graphics->image->type == ImageTypeBitmap) || (graphics->image && graphics->image->type == ImageTypeBitmap) ||
ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X || ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X ||
ptf[1].X - ptf[0].X != srcwidth || ptf[2].Y - ptf[0].Y != srcheight || ptf[1].X - ptf[0].X != srcwidth || ptf[2].Y - ptf[0].Y != srcheight ||
@ -4021,7 +4030,7 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p
if(graphics->busy) if(graphics->busy)
return ObjectBusy; return ObjectBusy;
if (!graphics->image) if (!graphics->image && !graphics->alpha_hdc)
stat = GDI32_GdipFillPath(graphics, brush, path); stat = GDI32_GdipFillPath(graphics, brush, path);
if (stat == NotImplemented) if (stat == NotImplemented)
@ -4359,7 +4368,7 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush,
if(graphics->busy) if(graphics->busy)
return ObjectBusy; return ObjectBusy;
if (!graphics->image) if (!graphics->image && !graphics->alpha_hdc)
stat = GDI32_GdipFillRegion(graphics, brush, region); stat = GDI32_GdipFillRegion(graphics, brush, region);
if (stat == NotImplemented) if (stat == NotImplemented)
@ -5982,7 +5991,7 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc)
{ {
stat = METAFILE_GetDC((GpMetafile*)graphics->image, hdc); stat = METAFILE_GetDC((GpMetafile*)graphics->image, hdc);
} }
else if (!graphics->hdc || else if (!graphics->hdc || graphics->alpha_hdc ||
(graphics->image && graphics->image->type == ImageTypeBitmap && ((GpBitmap*)graphics->image)->format & PixelFormatAlpha)) (graphics->image && graphics->image->type == ImageTypeBitmap && ((GpBitmap*)graphics->image)->format & PixelFormatAlpha))
{ {
/* Create a fake HDC and fill it with a constant color. */ /* Create a fake HDC and fill it with a constant color. */
@ -6626,7 +6635,7 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text,
if (length == -1) if (length == -1)
length = strlenW(text); length = strlenW(text);
if (graphics->hdc && if (graphics->hdc && !graphics->alpha_hdc &&
((flags & DriverStringOptionsRealizedAdvance) || length <= 1) && ((flags & DriverStringOptionsRealizedAdvance) || length <= 1) &&
brush->bt == BrushTypeSolidColor && brush->bt == BrushTypeSolidColor &&
(((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000) (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000)

2
dlls/gdiplus/tests/graphics.c
View File

@ -4115,7 +4115,7 @@ static void test_alpha_hdc(void)
status = GdipGraphicsClear(graphics, 0xffaaaaaa); status = GdipGraphicsClear(graphics, 0xffaaaaaa);
expect(Ok, status); expect(Ok, status);
todo_wine expect(0xffaaaaaa, bits[0]); expect(0xffaaaaaa, bits[0]);
SelectObject(hdc, old_hbm); SelectObject(hdc, old_hbm);