Module: wine Branch: stable Commit: 24fbe49ec575c162621ba6424f6b08eeafe0c11c URL: https://source.winehq.org/git/wine.git/?a=commit;h=24fbe49ec575c162621ba6424...
Author: Alex Henrie alexhenrie24@gmail.com Date: Tue Aug 28 23:47:26 2018 -0600
shell32: Add window-on-monitor and desktop-on-monitor icons.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 8017c259ca76ae7f1547e75ed256b8b457fe1340) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+)
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 7589361..18f6f65 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -656,6 +656,14 @@ IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico /* @makedep: resources/internet.ico */ IDI_SHELL_REMOTE_CONNECTION ICON resources/internet.ico
+/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mycomputer.ico */ +IDI_SHELL_WINDOW_ON_MONITOR ICON resources/mycomputer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mycomputer.ico */ +IDI_SHELL_DESKTOP_ON_MONITOR ICON resources/mycomputer.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index ad14a72..61221a4 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -263,6 +263,8 @@ #define IDI_SHELL_VISUAL_SETTINGS 177 #define IDI_SHELL_NEW_WEB_PAGE 178 #define IDI_SHELL_REMOTE_CONNECTION 179 +#define IDI_SHELL_WINDOW_ON_MONITOR 180 +#define IDI_SHELL_DESKTOP_ON_MONITOR 181 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242