system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 13:44:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comctl32: Remove the masked background when 32bpp bitmaps have no alpha values.

Browse source 
Fixes a regression introduced by 61b9209221.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50454
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gabriel Ivăncescu 2021-01-05 19:53:18 +02:00 committed by Alexandre Julliard
parent a692a12541
commit 4ac05afd39
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/comctl32/imagelist.c
View file

@ -234,6 +234,13 @@ static void add_dib_bits( HIMAGELIST himl, int pos, int count, int width, int he
mask_bits[i * mask_stride + j / 8] |= 0x80 >> (j % 8);
}
}
else if (mask_info) /* mask out the background */
{
for (i = 0; i < height; i++)
for (j = n * width; j < (n + 1) * width; j++)
if ((mask_bits[i * mask_stride + j / 8] << (j % 8)) & 0x80)
bits[i * stride + j] = 0;
}
StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy,
n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY );
if (mask_info)

2
dlls/comctl32/tests/imagelist.c
View file

@ -2436,7 +2436,7 @@ static void test_alpha(void)
/* If all alpha values are zero, the image is considered to have no alpha and gets masked */
if (!GetAValue(bits[0]) && !GetAValue(bits[1]))
todo_wine ok(!bits[0] && bits[1] == test_bitmaps[i + 1],
ok(!bits[0] && bits[1] == test_bitmaps[i + 1],
"Bitmap [%08X, %08X] returned [%08X, %08X], expected [%08X, %08X]\n",
test_bitmaps[i], test_bitmaps[i + 1], bits[0], bits[1], 0, test_bitmaps[i + 1]);
else