Module: wine Branch: master Commit: ade232ada1fbf07a29f94e7241bff86b508fa2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade232ada1fbf07a29f94e724...
Author: Alex Henrie alexhenrie24@gmail.com Date: Tue Aug 28 23:47:29 2018 -0600
shell32: Add remaining recycle bin icons.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/shell32/shell32.rc | 9 +++++++++ dlls/shell32/shresdef.h | 4 ++++ 2 files changed, 13 insertions(+)
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 896c63d..6bb7aa1 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -754,6 +754,12 @@ IDI_SHELL_ONE_CLICK_OPEN ICON resources/folder_open.ico /* @makedep: resources/folder_open.ico */ IDI_SHELL_TWO_CLICK_OPEN ICON resources/folder_open.ico
+/* @makedep: resources/trash_file.ico */ +IDI_SHELL_EMPTY_RECYCLE_BIN_95 ICON resources/trash_file.ico + +/* @makedep: resources/trash_full.ico */ +IDI_SHELL_FULL_RECYCLE_BIN_95 ICON resources/trash_full.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico
@@ -766,6 +772,9 @@ IDI_SHELL_RENAME ICON resources/rename.ico /* @makedep: resources/copy.ico */ IDI_SHELL_COPY ICON resources/copy.ico
+/* @makedep: resources/trash_file.ico */ +IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e901460..090a3fa 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -275,10 +275,14 @@ #define IDI_SHELL_FLOATING_WINDOWS 185 #define IDI_SHELL_ONE_CLICK_OPEN 186 #define IDI_SHELL_TWO_CLICK_OPEN 187 +/* 188 - 190 not used on Windows */ +#define IDI_SHELL_EMPTY_RECYCLE_BIN_95 191 +#define IDI_SHELL_FULL_RECYCLE_BIN_95 192 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 +#define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_FAVORITES_SMALL 322