November 2018 - Wine-Commits

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

Nov. 29, 2018

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 Nov. 29, 2018

Nov. 29, 2018

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 update icon.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: 59b413f261848e70e7a2130d85dd0abbd9aac5a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b413f261848e70e7a2130d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:51 2018 -0600 shell32: Add update icon. Adapted from software-update-available 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 661457821bb793b8ff3dc5b99f38fd92147e8c61) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/update.ico | Bin 0 -> 47370 bytes dlls/shell32/resources/update.svg | 583 ++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 588 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59b413f261848e70e7a2…

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 339f5a5bcc157fd293bdda77e2af18db8809cf2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=339f5a5bcc157fd293bdda77… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:49 2018 -0600 shell32: Add music CD icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cb4181b0e4a504ab2e53e0cfe9d836d0711bbd9b) 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 f43009b..0f57fec 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -475,6 +475,10 @@ IDI_SHELL_FONTS_FOLDER ICON resources/folder.ico /* @makedep: resources/menu.ico */ IDI_SHELL_START_MENU ICON resources/menu.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_MUSIC_CD ICON resources/optical_disc.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b28469e..905c684 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -205,6 +205,7 @@ #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_START_MENU 40 +#define IDI_SHELL_MUSIC_CD 41 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 873522eb45a026c55321ef6fe5a6e0294f8bf53b URL: https://source.winehq.org/git/wine.git/?a=commit;h=873522eb45a026c55321ef6f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 21 20:37:49 2018 -0600 shell32: Add font folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b722bae9c8aa9844dbe74f813e794308162493c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 7799511..24d2993 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -468,6 +468,10 @@ IDI_APP_FOLDER ICON resources/folder.ico /* @makedep: resources/folder.ico */ IDI_PRINTERS_FOLDER ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_FONTS_FOLDER ICON resources/folder.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 46b8e1067351781b198bae22f905d3a44f649e21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46b8e1067351781b198bae22… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:59 2018 -0600 shell32: Add options icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9fb7f21b61b2f384f37040ad308d6b1bd00563a7) 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 17d4e26..e76005c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -534,6 +534,9 @@ IDI_SHELL_FILE_SEARCH ICON resources/search.ico /* @makedep: resources/search.ico */ IDI_SHELL_SYSTEM_SEARCH ICON resources/search.ico +/* @makedep: resources/control.ico */ +IDI_SHELL_OPTIONS ICON resources/control.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 8fa3a46..232a3de 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -223,6 +223,8 @@ #define IDI_SHELL_FILES 133 #define IDI_SHELL_FILE_SEARCH 134 #define IDI_SHELL_SYSTEM_SEARCH 135 +/* 136 not used on Windows */ +#define IDI_SHELL_OPTIONS 137 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: e7a31d5dbc364977ecbc8f9b9ee38643530922c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a31d5dbc364977ecbc8f9b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:58 2018 -0600 shell32: Add system search icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4daea1d7effef2c358630b30b6e00a359a17d9e0) 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 4de75cf..17d4e26 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -530,6 +530,10 @@ IDI_SHELL_FILES ICON resources/document.ico /* @makedep: resources/search.ico */ IDI_SHELL_FILE_SEARCH ICON resources/search.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SYSTEM_SEARCH ICON resources/search.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 3ceae19..8fa3a46 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -222,6 +222,7 @@ /* 55 - 132 not used on Windows */ #define IDI_SHELL_FILES 133 #define IDI_SHELL_FILE_SEARCH 134 +#define IDI_SHELL_SYSTEM_SEARCH 135 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add blank icons.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: stable Commit: cba37d347756ec9c89a414a6d61299a0f634c584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cba37d347756ec9c89a414a6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:54 2018 -0600 shell32: Add blank icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 45227d13e63332ade32298c1893fd799f0dea018) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/blank.ico | Bin 0 -> 4375 bytes dlls/shell32/resources/blank.svg | 97 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 12 +++++ dlls/shell32/shresdef.h | 4 ++ 5 files changed, 114 insertions(+) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index bb1b0df..19e6b5b 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -62,6 +62,7 @@ IDL_SRCS = \ shell32_tlb.idl SVG_SRCS = \ + resources/blank.svg \ resources/cdrom.svg \ resources/control.svg \ resources/delete.svg \ diff --git a/dlls/shell32/resources/blank.ico b/dlls/shell32/resources/blank.ico new file mode 100644 index 0000000..63b7cdd Binary files /dev/null and b/dlls/shell32/resources/blank.ico differ diff --git a/dlls/shell32/resources/blank.svg b/dlls/shell32/resources/blank.svg new file mode 100644 index 0000000..fc53114 --- /dev/null +++ b/dlls/shell32/resources/blank.svg @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + id="svg8" + version="1.1" + viewBox="0 0 632 272" + height="272" + width="632"> + <defs + id="defs2" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <rect + id="icon:48-8" + height="48" + width="48" + y="220" + x="328" + style="fill:none" /> + <rect + id="icon:48-4" + height="48" + width="48" + y="220" + x="384" + style="fill:none" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <rect + id="icon:32-8" + height="32" + width="32" + y="236" + x="480" + style="fill:none" /> + <rect + id="icon:32-4" + height="32" + width="32" + y="236" + x="520" + style="fill:none" /> + <rect + id="icon:16-32" + height="16" + width="16" + y="252" + x="560" + style="fill:none" /> + <rect + id="icon:16-8" + height="16" + width="16" + y="252" + x="584" + style="fill:none" /> + <rect + id="icon:16-32" + height="16" + width="16" + y="252" + x="608" + style="fill:none" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index bd9595b..7daa201 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -506,6 +506,18 @@ IDI_SHELL_RIGHTS ICON resources/lock.ico /* @makedep: resources/shut_down.ico */ IDI_SHELL_CONFIRM_SHUTDOWN ICON resources/shut_down.ico +/* @makedep: resources/blank.ico */ +IDI_SHELL_BLANK1 ICON resources/blank.ico + +/* @makedep: resources/blank.ico */ +IDI_SHELL_BLANK2 ICON resources/blank.ico + +/* @makedep: resources/blank.ico */ +IDI_SHELL_BLANK3 ICON resources/blank.ico + +/* @makedep: resources/blank.ico */ +IDI_SHELL_BLANK4 ICON resources/blank.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 83e97ab..ce5a10c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -214,6 +214,10 @@ #define IDI_SHELL_UPDATE 47 #define IDI_SHELL_RIGHTS 48 #define IDI_SHELL_CONFIRM_SHUTDOWN 49 +#define IDI_SHELL_BLANK1 50 +#define IDI_SHELL_BLANK2 51 +#define IDI_SHELL_BLANK3 52 +#define IDI_SHELL_BLANK4 53 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 059990f755f8b8df48d187ab0ec134810e2b79b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=059990f755f8b8df48d187ab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:48 2018 -0600 shell32: Add favorites icon. Adapted from emblem-favorite 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 27b74b5a2c04acaf3b7e991c022e4626c057088b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/favorites.ico | Bin 0 -> 49876 bytes dlls/shell32/resources/favorites.svg | 548 +++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 11 +- dlls/shell32/shresdef.h | 4 +- 5 files changed, 560 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=059990f755f8b8df48d1…

1 0

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

Nov. 29, 2018

Module: wine Branch: stable Commit: 3d421922525b44efb8ffb864979e2a47fde03cab URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d421922525b44efb8ffb864… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:51 2018 -0600 shell32: Add remote folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10296553bd06ca5516d9dd8f5660bef9fa3c91b4) 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 3640588..5f66319 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -483,6 +483,10 @@ IDI_SHELL_MUSIC_CD ICON resources/optical_disc.ico /* @makedep: resources/menu.ico */ IDI_SHELL_TREE ICON resources/menu.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_REMOTE_FOLDER ICON resources/folder.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b304b16..8560d2f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -207,6 +207,7 @@ #define IDI_SHELL_START_MENU 40 #define IDI_SHELL_MUSIC_CD 41 #define IDI_SHELL_TREE 42 +#define IDI_SHELL_REMOTE_FOLDER 43 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0