[PATCH 0/1] MR2645: user32/tests: Windows 11's notepad has four icons.

[Francois Gouget (＠fgouget)]

There's the regular application icon and three different styles of
close window icons. While there is nothing wrong with that this case is
marked as broken() because Wine's notepad only has one icon so only 1 is
a valid PrivateExtractIconsA() result in Wine.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2645

[PATCH 1/1] user32/tests: Windows 11's notepad has four icons.

[Francois Gouget]

From: Francois Gouget <fgouget(a)codeweavers.com>

There's the regular application icon and three different styles of
close window icons. While there is nothing wrong with that this case is
marked as broken() because Wine's notepad only has one icon so only 1 is
a valid PrivateExtractIconsA() result in Wine.
---
 dlls/user32/tests/resource.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c
index fff962b955c..472d65df186 100644
--- a/dlls/user32/tests/resource.c
+++ b/dlls/user32/tests/resource.c
@@ -348,7 +348,8 @@ static void test_PrivateExtractIcons(void) {
     ok(cIcons == ~0u, "got %u\n", cIcons);
 
     cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, NULL, NULL, 1, 0);
-    ok(cIcons == 1 || broken(cIcons == 2) /* win2k */, "got %u\n", cIcons);
+    ok(cIcons == 1 || broken(cIcons == 4) /* win11 */ ||
+       broken(cIcons == 2) /* win2k */, "got %u\n", cIcons);
 
     ahIcon[0] = (HICON)0xdeadbeef;
     cIcons = pPrivateExtractIconsA("notepad.exe", 0, 16, 16, ahIcon, NULL, 1, 0);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2645