Alex Henrie : shell32: Add "trash mixed" icon.

[Alexandre Julliard]

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

Author: Alex Henrie <alexhenrie24 at gmail.com>
Date:   Sun Aug 26 22:21:05 2018 -0600

shell32: Add "trash mixed" icon.

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 9aabf827ed594b3631cfc847d70e57a0d3b46ba4)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/shell32/shell32.rc | 3 +++
 dlls/shell32/shresdef.h | 1 +
 2 files changed, 4 insertions(+)

diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index a68d123..fb20391 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -559,6 +559,9 @@ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico
 /* @makedep: resources/trash_file.ico */
 IDI_SHELL_TRASH_FOLDER ICON resources/trash_file.ico
 
+/* @makedep: resources/trash_file.ico */
+IDI_SHELL_TRASH_MIXED ICON resources/trash_file.ico
+
 /* @makedep: resources/delete.ico */
 IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico
 
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index f38e0d2..45ac067 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -231,6 +231,7 @@
 #define IDI_SHELL_TO_FILE_PRINTER  141
 #define IDI_SHELL_TRASH_FILE       142
 #define IDI_SHELL_TRASH_FOLDER     143
+#define IDI_SHELL_TRASH_MIXED      144
 #define IDI_SHELL_CONFIRM_DELETE   161
 #define IDI_SHELL_DEFAULT_PRINTER  168
 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER   169