Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-27 00:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USER32_APITEST] Add test for bad 'Icon Groups' but good 'Icons' such as F1'97 (#6020)

Browse source 
Add test for bad 'Icon Groups' but good 'Icons' such as created
by old versions of Watcom C/C++
That icon shows fine in Windows Explorer WinXP/Win2K3,
but does not show in WinVista/Win7 anymore.
A very special corner case.

We will commit the proposed fix shortly after committing the new test.
This commit is contained in:
Doug Lyons 2023-11-26 09:26:05 -06:00 committed by GitHub
parent e3d97d7dde
commit c00d41d91c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/rostests/apitests/user32/PrivateExtractIcons.c
View file

@ -27,8 +27,9 @@ BOOL ResourceToFile(INT i, PCWSTR FileName)
if (FileExists(FileName))
{
skip("'%S' already exists. Exiting now\n", FileName);
return FALSE;
/* We should only be using %temp% paths, so deleting here should be OK */
printf("Deleting '%S' that already exists.\n", FileName);
DeleteFileW(FileName);
}
hRes = FindResourceW(NULL, MAKEINTRESOURCEW(i), MAKEINTRESOURCEW(RT_RCDATA));
@ -90,6 +91,12 @@ static struct
/* Icon group file containing one PNG icon and one normal icon */
{L"%temp%\\ROS.ico", 1, 1, TRUE},
/* Executable file with bad 'Icon Group' but good 'Icons'.
* Windows explorer shows the program's icon correctly in WinXP/Win2K3
* but Windows 7 shows only a default icon. This is analogous
* to EXE's generated by older Watcom C/C++ versions. */
{L"%temp%\\cpimg2e.exe", 1, 1, TRUE},
};
static struct
@ -100,6 +107,7 @@ static struct
{
{L"%temp%\\ROS.ico", IDR_ICONS_PNG},
{L"%temp%\\sysicon.ico", IDR_ICONS_NORMAL},
{L"%temp%\\cpimg2e.exe", IDR_EXE_NORMAL}
};
START_TEST(PrivateExtractIcons)

BIN
modules/rostests/apitests/user32/cpimg2e.exe Normal file
View file

Binary file not shown.

1
modules/rostests/apitests/user32/resource.h
View file

@ -3,3 +3,4 @@
#define IDR_ICONS_PNG 2000
#define IDR_ICONS_NORMAL 2001
#define IDR_EXE_NORMAL 2002

1
modules/rostests/apitests/user32/user32_apitest.rc
View file

@ -10,6 +10,7 @@ TESTCURSOR CURSOR "test.cur"
IDR_ICONS_PNG RCDATA "ROS.ico"
IDR_ICONS_NORMAL RCDATA "sysicon.ico"
IDR_EXE_NORMAL RCDATA "cpimg2e.exe"
TESTDIALOG DIALOG 0,0, 200,200
CLASS "TestDialogClass"