[PATCH 0/4] MR10988: shell32: Correct several icon IDs and add the computer-turning-off icon.
I figured it would be less confusing to just add icon 8240 now than to have two comments about big gaps right next to each other. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10988
From: Alex Henrie <alexhenrie24@gmail.com> Fixes: 8c42ceea48f1422fcb7a7e4772674416ad48b367 --- dlls/shell32/shell32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index cfcd3994f99..e886347777c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -643,7 +643,7 @@ IDI_SHELL_FOLDER_OVERWRITE ICON resources/delete.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/rename.ico */ -IDI_SHELL_RENAME_FOLDER ICON resources/rename.ico +IDI_SHELL_FOLDER_RENAME ICON resources/rename.ico /* @makedep: resources/update.ico */ IDI_SHELL_INSTALL ICON resources/update.ico -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10988
From: Alex Henrie <alexhenrie24@gmail.com> Fixes: e26bf9c3ea2e3ed2728a008722d54f7a8f89350b --- dlls/shell32/shell32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index e886347777c..e7dacf13d1e 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -606,7 +606,7 @@ IDI_SHELL_FILE_SEARCH ICON resources/search.ico IDI_SHELL_SYSTEM_SEARCH ICON resources/search.ico /* @makedep: resources/control.ico */ -IDI_SHELL_OPTIONS ICON resources/control.ico +IDI_SHELL_CONTROL_PANEL_XP ICON resources/control.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10988
From: Alex Henrie <alexhenrie24@gmail.com> This is the icon that was used on the Windows 95 shutdown dialog. Later versions of the shutdown dialog used a generic computer icon without depicting the flash of light as the CRT monitor turns off, so for now just use the generic computer icon in this spot. --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index e7dacf13d1e..fda44525fca 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1072,6 +1072,10 @@ IDI_SHELL_WEB_BROWSER ICON resources/internet.ico /* @makedep: resources/info.ico */ IDI_SHELL_INFO ICON resources/info.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mycomputer.ico */ +IDI_SHELL_COMPUTER_OFF ICON resources/mycomputer.ico + /* @makedep: resources/idb_sort_incr.bmp */ IDB_SORT_INCR BITMAP resources/idb_sort_incr.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index dfa7c7ffbfd..029655be23b 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -377,6 +377,8 @@ #define IDI_SHELL_WEB_BROWSER 512 /* 512 - 1000 not used on Windows */ #define IDI_SHELL_INFO 1001 +/* 1012 - 8239 not used on Windows */ +#define IDI_SHELL_COMPUTER_OFF 8240 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10988
From: Alex Henrie <alexhenrie24@gmail.com> Fixes: def41b05f639ab0f07fd57323a1d29e914e335ca --- dlls/shell32/shell32.rc | 6 +++--- dlls/shell32/shresdef.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index fda44525fca..6738ba802dc 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -590,9 +590,6 @@ IDI_SHELL_BLANK4 ICON resources/blank.ico /* @makedep: resources/drive.ico */ IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico -/* @makedep: resources/shield.ico */ -IDI_SHELL_SHIELD ICON resources/shield.ico - /* FIXME: Following resource is not yet added */ /* @makedep: resources/document.ico */ IDI_SHELL_FILES ICON resources/document.ico @@ -1076,6 +1073,9 @@ IDI_SHELL_INFO ICON resources/info.ico /* @makedep: resources/mycomputer.ico */ IDI_SHELL_COMPUTER_OFF ICON resources/mycomputer.ico +/* @makedep: resources/shield.ico */ +IDI_SHELL_SHIELD ICON resources/shield.ico + /* @makedep: resources/idb_sort_incr.bmp */ IDB_SORT_INCR BITMAP resources/idb_sort_incr.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 029655be23b..64763f820f6 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -227,7 +227,6 @@ #define IDI_SHELL_BLANK3 52 #define IDI_SHELL_BLANK4 53 #define IDI_SHELL_UNKNOWN_DRIVE 54 -#define IDI_SHELL_SHIELD 78 /* 55 - 132 not used on Windows */ #define IDI_SHELL_FILES 133 #define IDI_SHELL_FILE_SEARCH 134 @@ -379,6 +378,8 @@ #define IDI_SHELL_INFO 1001 /* 1012 - 8239 not used on Windows */ #define IDI_SHELL_COMPUTER_OFF 8240 +/* 8241 - 16709 not used on Windows */ +#define IDI_SHELL_SHIELD 16747 /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10988
participants (2)
-
Alex Henrie -
Alex Henrie (＠alexhenrie)