Alex Henrie : shell32: Add remaining recycle bin icons.

Alexandre Julliard julliard at winehq.org
Thu Nov 29 15:09:34 CST 2018


Module: wine
Branch: stable
Commit: eae1ebd189b942ebb7b8596e0f584e4980fa9edb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=eae1ebd189b942ebb7b8596e0f584e4980fa9edb

Author: Alex Henrie <alexhenrie24 at gmail.com>
Date:   Tue Aug 28 23:47:29 2018 -0600

shell32: Add remaining recycle bin icons.

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit ade232ada1fbf07a29f94e7241bff86b508fa2b1)
Signed-off-by: Michael Stefaniuc <mstefani at 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 399ef54..070754b 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -688,6 +688,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
 
@@ -700,6 +706,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 d44ad75..735f70e 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -271,10 +271,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
 




More information about the wine-cvs mailing list