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

gdi32: Create a sanitized BITMAPINFOHEADER in CreateDIBitmap.

Browse Source
This commit is contained in:
Alexandre Julliard 2011-08-04 12:52:23 +02:00
parent a2c99c7353
commit 3d0f272a0d
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/gdi32/dib.c
View File

@ -1159,32 +1159,24 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header,
DWORD init, LPCVOID bits, const BITMAPINFO *data, DWORD init, LPCVOID bits, const BITMAPINFO *data,
UINT coloruse ) UINT coloruse )
{ {
BITMAPINFOHEADER info;
HBITMAP handle; HBITMAP handle;
LONG width;
LONG height; LONG height;
WORD planes, bpp;
DWORD compr, size;
if (!header) return 0; if (!bitmapinfoheader_from_user_bitmapinfo( &info, header )) return 0;
if (info.biWidth < 0) return 0;
if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &size ) == -1) return 0;
if (width < 0)
{
TRACE("Bitmap has a negative width\n");
return 0;
}
/* Top-down DIBs have a negative height */ /* Top-down DIBs have a negative height */
if (height < 0) height = -height; height = abs( info.biHeight );
TRACE("hdc=%p, header=%p, init=%u, bits=%p, data=%p, coloruse=%u (bitmap: width=%d, height=%d, bpp=%u, compr=%u)\n", TRACE("hdc=%p, header=%p, init=%u, bits=%p, data=%p, coloruse=%u (bitmap: width=%d, height=%d, bpp=%u, compr=%u)\n",
hdc, header, init, bits, data, coloruse, width, height, bpp, compr); hdc, header, init, bits, data, coloruse, info.biWidth, info.biHeight,
info.biBitCount, info.biCompression);
if (hdc == NULL) if (hdc == NULL)
handle = CreateBitmap( width, height, 1, 1, NULL ); handle = CreateBitmap( info.biWidth, height, 1, 1, NULL );
else else
handle = CreateCompatibleBitmap( hdc, width, height ); handle = CreateCompatibleBitmap( hdc, info.biWidth, height );
if (handle) if (handle)
{ {