November 2018 - Wine-commits

Alex Henrie : shell32: Add rename icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 3dc40a1507e02e678918bd64f2bdcdecf51be51f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc40a1507e02e678918bd64… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:41 2018 -0600 shell32: Add rename icon. Adapted from document-save-as.svg 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 01d9dba509d139e7b87518db5c4f0ba503e76672) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/rename.ico | Bin 0 -> 30995 bytes dlls/shell32/resources/rename.svg | 419 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 424 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dc40a1507e02e678918…

1 0

Alex Henrie : shell32: Add folder rename icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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

Alex Henrie : shell32: Add install icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 5bc1f04367f2a822368bc9d33dee0e107d3e45e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bc1f04367f2a822368bc9d3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:43 2018 -0600 shell32: Add install icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 04383aed44d68b2790f97740cec5ec46568cdd70) 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 fd84041..3d20083 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -574,6 +574,9 @@ IDI_SHELL_FOLDER_OVERWRITE ICON resources/delete.ico /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME_FOLDER ICON resources/rename.ico +/* @makedep: resources/update.ico */ +IDI_SHELL_INSTALL ICON resources/update.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 a982073..b7f94f0 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -235,6 +235,7 @@ #define IDI_SHELL_FILE_OVERWRITE 145 #define IDI_SHELL_FOLDER_OVERWRITE 146 #define IDI_SHELL_FOLDER_RENAME 147 +#define IDI_SHELL_INSTALL 148 #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 config file icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: e40cba2ce6bec82fdbf1f2d7b225cb297cf756e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e40cba2ce6bec82fdbf1f2d7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:44 2018 -0600 shell32: Add config file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f6695aea201ebc7aedd8cd68b97a675e5e71984a) 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 3d20083..17903bf 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -577,6 +577,10 @@ IDI_SHELL_RENAME_FOLDER ICON resources/rename.ico /* @makedep: resources/update.ico */ IDI_SHELL_INSTALL ICON resources/update.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_CONFIG_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 b7f94f0..7d63502 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -236,6 +236,8 @@ #define IDI_SHELL_FOLDER_OVERWRITE 146 #define IDI_SHELL_FOLDER_RENAME 147 #define IDI_SHELL_INSTALL 148 +/* 149 - 150 not used on Windows */ +#define IDI_SHELL_CONFIG_FILE 151 #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 text file icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 900da5a8c82b47309ff846d8489c073d5a6a348e URL: https://source.winehq.org/git/wine.git/?a=commit;h=900da5a8c82b47309ff846d8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 27 20:40:45 2018 -0600 shell32: Add text file icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8abd69dc973d0e03b5946eccad2b04648d12b0d5) 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 17903bf..cc1eaf7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -581,6 +581,10 @@ IDI_SHELL_INSTALL ICON resources/update.ico /* @makedep: resources/document.ico */ IDI_SHELL_CONFIG_FILE ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_TEXT_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 7d63502..60c0415 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -238,6 +238,7 @@ #define IDI_SHELL_INSTALL 148 /* 149 - 150 not used on Windows */ #define IDI_SHELL_CONFIG_FILE 151 +#define IDI_SHELL_TEXT_FILE 152 #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 29 Nov '18

29 Nov '18

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 library file icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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 system font icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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 29 Nov '18

29 Nov '18

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 PostScript font icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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