November 2018 - Wine-commits

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

29 Nov '18

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

29 Nov '18

Module: wine Branch: stable Commit: 7629fa523ba35e4945aaea07d591f923998ee5aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7629fa523ba35e4945aaea07… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:50 2018 -0600 shell32: Add tree icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1594905e8bb189255188ec1a03b150b010f3392c) 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 0f57fec..3640588 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -479,6 +479,10 @@ IDI_SHELL_START_MENU ICON resources/menu.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/menu.ico */ +IDI_SHELL_TREE ICON resources/menu.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 905c684..b304b16 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -206,6 +206,7 @@ #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_START_MENU 40 #define IDI_SHELL_MUSIC_CD 41 +#define IDI_SHELL_TREE 42 #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 remote folder icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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

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

29 Nov '18

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

29 Nov '18

Module: wine Branch: stable Commit: 419658c881bb65be9d8ecc56d6162dd80bafc9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=419658c881bb65be9d8ecc56… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:49 2018 -0600 shell32: Add logoff icon. Adapted from system-log-out 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 856e68e131275b7ff61f365483c2dbf9f3dd789b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/log_off.ico | Bin 0 -> 48648 bytes dlls/shell32/resources/log_off.svg | 875 +++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 880 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=419658c881bb65be9d8e…

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 8a2ff4d83417ba18f708ed7699b1b7da599cbea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a2ff4d83417ba18f708ed76… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:50 2018 -0600 shell32: Add folder search icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 15c0612914f50d38f8d6f9fb3cd8c2e66d811541) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/resources/search.ico | Bin 78155 -> 78154 bytes dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/shell32/resources/search.ico b/dlls/shell32/resources/search.ico index 8697c8a..ca73425 100644 Binary files a/dlls/shell32/resources/search.ico and b/dlls/shell32/resources/search.ico differ diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 3448cf9..6672099 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -493,6 +493,10 @@ IDI_SHELL_FAVORITES ICON resources/favorites.ico /* @makedep: resources/log_off.ico */ IDI_SHELL_LOG_OFF ICON resources/log_off.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_SEARCH_FOLDER 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 cd78597..c14a79d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -210,6 +210,7 @@ #define IDI_SHELL_REMOTE_FOLDER 43 #define IDI_SHELL_FAVORITES 44 #define IDI_SHELL_LOG_OFF 45 +#define IDI_SHELL_SEARCH_FOLDER 46 #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 update icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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

29 Nov '18

Module: wine Branch: stable Commit: 08d06862807b81f0cfeb6e4a23d34cc92de0576d URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d06862807b81f0cfeb6e4a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:52 2018 -0600 shell32: Add rights icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5f82532b218c9b25064d65f389e674668dbd361c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/lock.ico | Bin 0 -> 32810 bytes dlls/shell32/resources/lock.svg | 532 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 537 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08d06862807b81f0cfeb…

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 2a2f908db23fcef73e543d5b5cd62b275816eaa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2f908db23fcef73e543d5b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:53 2018 -0600 shell32: Add shutdown confirmation icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8bc0a3d0d0a65c50e718411f02e92f051c67517) 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 86aaf07..bd9595b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -503,6 +503,9 @@ IDI_SHELL_UPDATE ICON resources/update.ico /* @makedep: resources/lock.ico */ IDI_SHELL_RIGHTS ICON resources/lock.ico +/* @makedep: resources/shut_down.ico */ +IDI_SHELL_CONFIRM_SHUTDOWN ICON resources/shut_down.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 47e66a8..83e97ab 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -213,6 +213,7 @@ #define IDI_SHELL_SEARCH_FOLDER 46 #define IDI_SHELL_UPDATE 47 #define IDI_SHELL_RIGHTS 48 +#define IDI_SHELL_CONFIRM_SHUTDOWN 49 #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 29 Nov '18

29 Nov '18

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