Module: wine Branch: stable Commit: 8309f5b8f42f872eac53d4729d2afc21f31e02c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8309f5b8f42f872eac53d4729...
Author: Alex Henrie alexhenrie24@gmail.com Date: Sun Aug 26 22:21:07 2018 -0600
shell32: Add folder overwrite icon.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 6d4e625cb28d7e6e798b5304b125f0c89647d0e0) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+)
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 8b9e159..6225a8d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -566,6 +566,10 @@ IDI_SHELL_TRASH_MIXED ICON resources/trash_file.ico /* @makedep: resources/delete.ico */ IDI_SHELL_FILE_OVERWRITE ICON resources/delete.ico
+/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_FOLDER_OVERWRITE ICON resources/delete.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 d5ce7c6..247f941 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -233,6 +233,7 @@ #define IDI_SHELL_TRASH_FOLDER 143 #define IDI_SHELL_TRASH_MIXED 144 #define IDI_SHELL_FILE_OVERWRITE 145 +#define IDI_SHELL_FOLDER_OVERWRITE 146 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169