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

gdiplus: Avoid accessing dib bits directly in GdipCreateBitmapFromHBITMAP.

oldstable
Vincent Povirk 2012-12-05 10:36:40 -06:00 committed by Alexandre Julliard
parent c98767a425
commit 04412f7a74
1 changed files with 38 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
dlls/gdiplus/image.c
View File

@ -4694,62 +4694,50 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi
format, &lockeddata);
if (retval == Ok)
{
if (bm.bmBits)
HDC hdc;
HBITMAP oldhbm;
BITMAPINFO *pbmi;
INT src_height, dst_stride;
BYTE *dst_bits;
hdc = CreateCompatibleDC(NULL);
oldhbm = SelectObject(hdc, hbm);
pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
if (pbmi)
{
for (y=0; y<bm.bmHeight; y++)
pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
pbmi->bmiHeader.biBitCount = 0;
GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS);
src_height = abs(pbmi->bmiHeader.biHeight);
if (pbmi->bmiHeader.biHeight > 0)
{
memcpy((BYTE*)lockeddata.Scan0+lockeddata.Stride*y,
(BYTE*)bm.bmBits+bm.bmWidthBytes*(bm.bmHeight-1-y),
bm.bmWidthBytes);
}
}
else
{
HDC hdc;
HBITMAP oldhbm;
BITMAPINFO *pbmi;
INT src_height, dst_stride;
BYTE *dst_bits;
hdc = CreateCompatibleDC(NULL);
oldhbm = SelectObject(hdc, hbm);
pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
if (pbmi)
{
pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
pbmi->bmiHeader.biBitCount = 0;
GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS);
src_height = abs(pbmi->bmiHeader.biHeight);
if (pbmi->bmiHeader.biHeight > 0)
{
dst_bits = (BYTE*)lockeddata.Scan0+lockeddata.Stride*(src_height-1);
dst_stride = -lockeddata.Stride;
}
else
{
dst_bits = lockeddata.Scan0;
dst_stride = lockeddata.Stride;
}
for (y=0; y<src_height; y++)
{
GetDIBits(hdc, hbm, y, 1, dst_bits+dst_stride*y,
pbmi, DIB_RGB_COLORS);
}
GdipFree(pbmi);
dst_bits = (BYTE*)lockeddata.Scan0+lockeddata.Stride*(src_height-1);
dst_stride = -lockeddata.Stride;
}
else
retval = OutOfMemory;
{
dst_bits = lockeddata.Scan0;
dst_stride = lockeddata.Stride;
}
SelectObject(hdc, oldhbm);
DeleteDC(hdc);
for (y=0; y<src_height; y++)
{
GetDIBits(hdc, hbm, y, 1, dst_bits+dst_stride*y,
pbmi, DIB_RGB_COLORS);
}
GdipFree(pbmi);
}
else
retval = OutOfMemory;
SelectObject(hdc, oldhbm);
DeleteDC(hdc);
GdipBitmapUnlockBits(*bitmap, &lockeddata);
}