marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: If there is no hbitmap associated with GpBitmap then create one.

oldstable
Dmitry Timoshkov 2012-08-20 12:07:32 +09:00 committed by Alexandre Julliard
parent 83024db0ae
commit 466dfee115
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/gdiplus/graphics.c
View File

@ -3094,7 +3094,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
if (imageAttributes ||
(graphics->image && graphics->image->type == ImageTypeBitmap) ||
!((GpBitmap*)image)->hbitmap ||
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 ||
srcx < 0 || srcy < 0 ||
@ -3281,7 +3280,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
}
else
{
hbitmap = bitmap->hbitmap;
if (bitmap->hbitmap)
hbitmap = bitmap->hbitmap;
else
{
GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0);
temp_bitmap = 1;
}
hdc = bitmap->hdc;
temp_hdc = (hdc == 0);
}