niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

user32/tests: Fix cursoricon tests on recent Windows versions.

Browse source 
This will now fail on older, unsupported versions, but the
test_monochrome_icon test would be pointless otherwise.
This commit is contained in:
Rémi Bernon 2024-01-15 11:58:19 +01:00 • committed by Alexandre Julliard
parent edc41d6db5
commit 0ab411a047
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dlls/user32/tests/cursoricon.c
View file

@ -1115,11 +1115,10 @@ static unsigned char bmpimage[70] = {
0xFF,0xFF,0x00,0x00,0x00,0x00
};
/* 1x1 pixel bmp using BITMAPCOREHEADER */
/* 1x1 pixel bmp using BITMAPCOREHEADER with 24 bits colors (1 bit color fails to load) */
static const unsigned char bmpcoreimage[38] = {
0x42,0x4d,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00,0x0c,0x00,
0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xff,0xff,0xff,0x00,0x55,0x55,
0x55,0x00,0x00,0x00,0x00,0x00
0x42,0x4d,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1a,0x00,0x00,0x00,0x0c,0x00,
0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x18,0x00,0xff,0xff,0xff,0x00
};
/* 2x2 pixel gif */
@ -1219,7 +1218,8 @@ static void test_LoadImageFile(const char * test_desc, const unsigned char * ima
ok(error == 0, "Last error: %lu\n", error);
if (expect_success) {
ok(handle != NULL, "IMAGE_BITMAP failed\n");
ok(handle != NULL || broken(image_data == bmpcoreimage) /* pre-security update */,
"IMAGE_BITMAP failed\n");
if (handle != NULL) test_LoadImageBitmap(handle);
}
else ok(handle == NULL, "IMAGE_BITMAP succeeded incorrectly\n");
@ -2867,9 +2867,8 @@ static void test_monochrome_icon(void)
CloseHandle(handle);
handle = LoadImageA(NULL, "icon.ico", IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
ok(handle != NULL ||
broken(use_core_info && handle == NULL), /* Win 8, 10 */
"LoadImage() failed with %lu.\n", GetLastError());
if (!monochrome && !use_core_info) ok(handle != NULL, "LoadImage() failed with %lu.\n", GetLastError());
else todo_wine ok(handle == NULL || broken(!use_core_info) /* Win7 */, "LoadImage() failed with %lu.\n", GetLastError());
if (handle == NULL)
{
skip("Icon failed to load: %s, %s\n",