Skip to content

W
wine-winehq
Commit baceb8d0 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

gdi32: Return bitmask for 32-bit bitmaps too in GetDIBits.

parent 22d2abba
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 7 deletions
dlls/gdi32/dib.c
View file @ baceb8d0
...@@ -640,19 +640,17 @@ INT WINAPI GetDIBits( ...@@ -640,19 +640,17 @@ INT WINAPI GetDIBits(
DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, DIB_GetDIBImageBytes( bmp->bitmap.bmWidth,
bmp->bitmap.bmHeight, bmp->bitmap.bmHeight,
bmp->bitmap.bmBitsPixel ); bmp->bitmap.bmBitsPixel );
info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB;
switch(bmp->bitmap.bmBitsPixel) switch(bmp->bitmap.bmBitsPixel)
{ {
case 15: case 15:
info->bmiHeader.biBitCount = 16; info->bmiHeader.biBitCount = 16;
info->bmiHeader.biCompression = BI_RGB;
break; break;
case 16: case 24:
info->bmiHeader.biBitCount = 16; info->bmiHeader.biBitCount = 32;
info->bmiHeader.biCompression = BI_BITFIELDS;
break; break;
default: default:
info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel;
info->bmiHeader.biCompression = BI_RGB;
break; break;
} }
info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biXPelsPerMeter = 0;
...@@ -824,6 +822,16 @@ INT WINAPI GetDIBits( ...@@ -824,6 +822,16 @@ INT WINAPI GetDIBits(
((PDWORD)info->bmiColors)[2] = 0x001f; ((PDWORD)info->bmiColors)[2] = 0x001f;
} }
break; break;
case 24:
case 32:
if (info->bmiHeader.biCompression == BI_BITFIELDS)
{
((PDWORD)info->bmiColors)[0] = 0xff0000;
((PDWORD)info->bmiColors)[1] = 0x00ff00;
((PDWORD)info->bmiColors)[2] = 0x0000ff;
}
break;
} }
if (bits && lines) if (bits && lines)
......
dlls/gdi32/tests/bitmap.c
View file @ baceb8d0
...@@ -1623,11 +1623,13 @@ static void test_GetDIBits_BI_BITFIELDS(void) ...@@ -1623,11 +1623,13 @@ static void test_GetDIBits_BI_BITFIELDS(void)
/* Call GetDIBits to fill in bmiHeader. */ /* Call GetDIBits to fill in bmiHeader. */
ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS); ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS);
ok(ret == 1, "GetDIBits failed\n"); ok(ret == 1, "GetDIBits failed\n");
if (dibinfo->bmiHeader.biBitCount == 16 && if (dibinfo->bmiHeader.biBitCount > 8)
dibinfo->bmiHeader.biCompression == BI_BITFIELDS)
{ {
DWORD *bitmasks = (DWORD *)dibinfo->bmiColors; DWORD *bitmasks = (DWORD *)dibinfo->bmiColors;
ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS,
"compression is %u\n", dibinfo->bmiHeader.biCompression );
ok( !bitmasks[0], "red mask is set\n" ); ok( !bitmasks[0], "red mask is set\n" );
ok( !bitmasks[1], "green mask is set\n" ); ok( !bitmasks[1], "green mask is set\n" );
ok( !bitmasks[2], "blue mask is set\n" ); ok( !bitmasks[2], "blue mask is set\n" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment