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

gdi32: CreateBitmapIndirect should ignore the provided bm.bmWidthBytes.

This commit is contained in:
Dmitry Timoshkov 2007-02-16 17:02:12 +08:00 committed by Alexandre Julliard
parent f9975b004d
commit 0457b0c346
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdi32/bitmap.c
View File

@ -263,6 +263,9 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp )
return NULL;
}
/* Windows ignores the provided bm.bmWidthBytes */
bm.bmWidthBytes = BITMAP_GetWidthBytes( bm.bmWidth, bm.bmBitsPixel );
/* Create the BITMAPOBJ */
bmpobj = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC,
(HGDIOBJ *)&hbitmap, &bitmap_funcs );

14
dlls/gdi32/tests/bitmap.c
View File

@ -1637,6 +1637,7 @@ static void test_mono_1x1_bmp_dbg(HBITMAP hbmp, int line)
static void test_CreateBitmap(void)
{
BITMAP bmp;
HDC screenDC = GetDC(0);
HDC hdc = CreateCompatibleDC(screenDC);
@ -1684,6 +1685,19 @@ static void test_CreateBitmap(void)
DeleteDC(hdc);
ReleaseDC(0, screenDC);
/* show that Windows ignores the provided bm.bmWidthBytes */
bmp.bmType = 0;
bmp.bmWidth = 1;
bmp.bmHeight = 1;
bmp.bmWidthBytes = 28;
bmp.bmPlanes = 1;
bmp.bmBitsPixel = 1;
bmp.bmBits = NULL;
bm = CreateBitmapIndirect(&bmp);
ok(bm != 0, "CreateBitmapIndirect error %u\n", GetLastError());
test_mono_1x1_bmp(bm);
DeleteObject(bm);
}
START_TEST(bitmap)