November 2018 - Wine-Commits

Alex Henrie : shell32: Add backup icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: b2cb2af8e40c0c15760d3102e2e7e73e1a2d79e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2cb2af8e40c0c15760d3102… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:53 2018 -0600 shell32: Add backup icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bcbfaf0b00a45f2c93ffdc82fac057b23b4faf8b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 8eb385c..4d0953f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -611,6 +611,10 @@ IDI_SHELL_RUN2 ICON resources/window.ico /* @makedep: resources/delete.ico */ IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/copy.ico */ +IDI_SHELL_BACKUP ICON resources/copy.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index fde428e..8b2989d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -247,6 +247,8 @@ /* 158 - 159 not used on Windows */ #define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 +/* 162 - 164 not used on Windows */ +#define IDI_SHELL_BACKUP 165 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169 #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170

1 0

Alex Henrie : shell32: Add "power off" icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 052468c2998c14dfd562c3db0d718bce400b8344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=052468c2998c14dfd562c3db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:35 2018 -0600 shell32: Add "power off" icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9954c08dc8dc1783098a48e1188e08a8018c6092) Signed-off-by: Michael Stefaniuc <mstefani(a)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 1a273a6..27c6dc6 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -727,6 +727,9 @@ IDI_SHELL_DEFAULT_FOLDER ICON resources/folder.ico /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico +/* @makedep: resources/shut_down.ico */ +IDI_SHELL_POWER_OFF ICON resources/shut_down.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1502337..7af60d3 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -286,6 +286,7 @@ #define IDI_SHELL_DEFAULT_FOLDER 210 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 +#define IDI_SHELL_POWER_OFF 221 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Alex Henrie : shell32: Add copy icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 901a8d8845396e4ed34716a0c6c69b783853d867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=901a8d8845396e4ed34716a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:52 2018 -0600 shell32: Add copy icon. Adapted from edit-copy in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4f5c8253d33de851aab5111a9042612c0aa1878f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/copy.ico | Bin 0 -> 34090 bytes dlls/shell32/resources/copy.svg | 811 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 816 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=901a8d8845396e4ed347…

1 0

Alex Henrie : shell32: Add system font icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 9e289323e6dce91844354b36d168676db7df9d80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e289323e6dce91844354b36… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:48 2018 -0600 shell32: Add system font icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9669c4fad9b0dc4f6781d189de0ba9bac9ca5810) Signed-off-by: Michael Stefaniuc <mstefani(a)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 1ec22a1..565db13 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -593,6 +593,10 @@ IDI_SHELL_BATCH_FILE ICON resources/window.ico /* @makedep: resources/document.ico */ IDI_SHELL_LIBRARY_FILE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_SYSTEM_FONT ICON resources/document.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 9413ea8..c8583d2 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -241,6 +241,7 @@ #define IDI_SHELL_TEXT_FILE 152 #define IDI_SHELL_BATCH_FILE 153 #define IDI_SHELL_LIBRARY_FILE 154 +#define IDI_SHELL_SYSTEM_FONT 155 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add TrueType font icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 135aa94b159e8e1d0ca6f065c16dbe8c022485b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=135aa94b159e8e1d0ca6f065… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:49 2018 -0600 shell32: Add TrueType font icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d805b6d165834cb6a9e52dec65bd01e5e1709db9) Signed-off-by: Michael Stefaniuc <mstefani(a)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 565db13..2c54be2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -597,6 +597,10 @@ IDI_SHELL_LIBRARY_FILE ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_SYSTEM_FONT ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_TRUETYPE_FONT ICON resources/document.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 c8583d2..19a6bae 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -242,6 +242,7 @@ #define IDI_SHELL_BATCH_FILE 153 #define IDI_SHELL_LIBRARY_FILE 154 #define IDI_SHELL_SYSTEM_FONT 155 +#define IDI_SHELL_TRUETYPE_FONT 156 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add second run icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 7a4cb1ad1cd575273954d4e9e1c59227ab0b08b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a4cb1ad1cd575273954d4e9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:51 2018 -0600 shell32: Add second run icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3aa81e84076c8cb3b6c2d6aab516a894cb949863) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 3 +++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 98cf82a..370280d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -605,6 +605,9 @@ IDI_SHELL_TRUETYPE_FONT ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_POSTSCRIPT_FONT ICON resources/document.ico +/* @makedep: resources/window.ico */ +IDI_SHELL_RUN2 ICON resources/window.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 46e1cc7..13f110f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -244,6 +244,8 @@ #define IDI_SHELL_SYSTEM_FONT 155 #define IDI_SHELL_TRUETYPE_FONT 156 #define IDI_SHELL_POSTSCRIPT_FONT 157 +/* 158 - 159 not used on Windows */ +#define IDI_SHELL_RUN2 160 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add library file icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: aebb93355128c7fd442a028779745eb8b359bd03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aebb93355128c7fd442a0287… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:47 2018 -0600 shell32: Add library file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3a8a1b1e24e4752d3acb9aa4db09d7e4d48cbe8c) Signed-off-by: Michael Stefaniuc <mstefani(a)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 861a471..1ec22a1 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -589,6 +589,10 @@ IDI_SHELL_TEXT_FILE ICON resources/document.ico /* @makedep: resources/window.ico */ IDI_SHELL_BATCH_FILE ICON resources/window.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_LIBRARY_FILE ICON resources/document.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 10015ee..9413ea8 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -240,6 +240,7 @@ #define IDI_SHELL_CONFIG_FILE 151 #define IDI_SHELL_TEXT_FILE 152 #define IDI_SHELL_BATCH_FILE 153 +#define IDI_SHELL_LIBRARY_FILE 154 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add PostScript font icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 66092f11014357a28569d50559e5ca331b9c2e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66092f11014357a28569d505… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:50 2018 -0600 shell32: Add PostScript font icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1a21156bc9656c2e939f4ef62ad5275784689bd3) Signed-off-by: Michael Stefaniuc <mstefani(a)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 2c54be2..98cf82a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -601,6 +601,10 @@ IDI_SHELL_SYSTEM_FONT ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_TRUETYPE_FONT ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_POSTSCRIPT_FONT ICON resources/document.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 19a6bae..46e1cc7 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -243,6 +243,7 @@ #define IDI_SHELL_LIBRARY_FILE 154 #define IDI_SHELL_SYSTEM_FONT 155 #define IDI_SHELL_TRUETYPE_FONT 156 +#define IDI_SHELL_POSTSCRIPT_FONT 157 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add batch file icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 730181b3bac5f78b7d80af13d8b1d30a020889e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=730181b3bac5f78b7d80af13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:46 2018 -0600 shell32: Add batch file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c31f1ace26d1806ad268f7b332136c0ab806f519) Signed-off-by: Michael Stefaniuc <mstefani(a)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 cc1eaf7..861a471 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -585,6 +585,10 @@ IDI_SHELL_CONFIG_FILE ICON resources/document.ico /* @makedep: resources/document.ico */ IDI_SHELL_TEXT_FILE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/window.ico */ +IDI_SHELL_BATCH_FILE ICON resources/window.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 60c0415..10015ee 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -239,6 +239,7 @@ /* 149 - 150 not used on Windows */ #define IDI_SHELL_CONFIG_FILE 151 #define IDI_SHELL_TEXT_FILE 152 +#define IDI_SHELL_BATCH_FILE 153 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0

Alex Henrie : shell32: Add folder rename icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 7e6959e19b813b3884dd9bc1e07ce8055a8862fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e6959e19b813b3884dd9bc1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:42 2018 -0600 shell32: Add folder rename icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8c42ceea48f1422fcb7a7e4772674416ad48b367) Signed-off-by: Michael Stefaniuc <mstefani(a)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 f07c31b..fd84041 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -570,6 +570,10 @@ IDI_SHELL_FILE_OVERWRITE ICON resources/delete.ico /* @makedep: resources/delete.ico */ IDI_SHELL_FOLDER_OVERWRITE ICON resources/delete.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/rename.ico */ +IDI_SHELL_RENAME_FOLDER ICON resources/rename.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 4d4f3e5..a982073 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -234,6 +234,7 @@ #define IDI_SHELL_TRASH_MIXED 144 #define IDI_SHELL_FILE_OVERWRITE 145 #define IDI_SHELL_FOLDER_OVERWRITE 146 +#define IDI_SHELL_FOLDER_RENAME 147 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0