August 2018 - Wine-commits - list.winehq.org

Alex Henrie : shell32: Add rights icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 5f82532b218c9b25064d65f389e674668dbd361c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f82532b218c9b25064d65f3… 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> --- 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=5f82532b218c9b25064d…

1 0

Alex Henrie : shell32: Add shutdown confirmation icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: b8bc0a3d0d0a65c50e718411f02e92f051c67517 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8bc0a3d0d0a65c50e718411… 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> --- 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 66698e1..8ef0e1b 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -569,6 +569,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 960c974..fddf420 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -217,6 +217,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 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 45227d13e63332ade32298c1893fd799f0dea018 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45227d13e63332ade32298c1… 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> --- 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 8ef0e1b..8889fcf 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -572,6 +572,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 fddf420..cbbdd71 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -218,6 +218,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 unknown drive icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: ef5ad6a6e75eb7cea6eb99ded8b2c0efadf24fc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef5ad6a6e75eb7cea6eb99de… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:55 2018 -0600 shell32: Add unknown drive icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 8889fcf..431492a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -584,6 +584,10 @@ IDI_SHELL_BLANK3 ICON resources/blank.ico /* @makedep: resources/blank.ico */ IDI_SHELL_BLANK4 ICON resources/blank.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/drive.ico */ +IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.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 cbbdd71..446eee8 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -222,6 +222,7 @@ #define IDI_SHELL_BLANK2 51 #define IDI_SHELL_BLANK3 52 #define IDI_SHELL_BLANK4 53 +#define IDI_SHELL_UNKNOWN_DRIVE 54 #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 files icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: c47178a50dae235717c6fbcde2f5898d2aa5c2f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47178a50dae235717c6fbcd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:56 2018 -0600 shell32: Add files icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 431492a..87a6582 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -588,6 +588,10 @@ IDI_SHELL_BLANK4 ICON resources/blank.ico /* @makedep: resources/drive.ico */ IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_FILES ICON resources/document.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 446eee8..5649c6b 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -223,6 +223,8 @@ #define IDI_SHELL_BLANK3 52 #define IDI_SHELL_BLANK4 53 #define IDI_SHELL_UNKNOWN_DRIVE 54 +/* 55 - 132 not used on Windows */ +#define IDI_SHELL_FILES 133 #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 file search icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 2633414c7165b01ad1876daf84ecacfe372564e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2633414c7165b01ad1876daf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:20:57 2018 -0600 shell32: Add file search icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 87a6582..811ca36 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -592,6 +592,10 @@ IDI_SHELL_UNKNOWN_DRIVE ICON resources/drive.ico /* @makedep: resources/document.ico */ IDI_SHELL_FILES ICON resources/document.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/search.ico */ +IDI_SHELL_FILE_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 5649c6b..9df9ed6 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -225,6 +225,7 @@ #define IDI_SHELL_UNKNOWN_DRIVE 54 /* 55 - 132 not used on Windows */ #define IDI_SHELL_FILES 133 +#define IDI_SHELL_FILE_SEARCH 134 #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 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 4daea1d7effef2c358630b30b6e00a359a17d9e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4daea1d7effef2c358630b30… 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> --- 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 811ca36..ea7d618 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -596,6 +596,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 9df9ed6..e894fb1 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -226,6 +226,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 options icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 9fb7f21b61b2f384f37040ad308d6b1bd00563a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb7f21b61b2f384f37040ad… 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> --- 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 ea7d618..8b9fb10 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -600,6 +600,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 e894fb1..2eda7cf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -227,6 +227,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 XP printer folder icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: bee0d3af678d198051249c819b7d33d9bceda7f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bee0d3af678d198051249c81… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:00 2018 -0600 shell32: Add XP printer folder icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 8b9fb10..12517aa 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -603,6 +603,10 @@ IDI_SHELL_SYSTEM_SEARCH ICON resources/search.ico /* @makedep: resources/control.ico */ IDI_SHELL_OPTIONS ICON resources/control.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_PRINTERS_FOLDER_XP 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 2eda7cf..2da5211 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -229,6 +229,7 @@ #define IDI_SHELL_SYSTEM_SEARCH 135 /* 136 not used on Windows */ #define IDI_SHELL_OPTIONS 137 +#define IDI_SHELL_PRINTERS_FOLDER_XP 138 #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 "add printer" icon.
by Alexandre Julliard 27 Aug '18

27 Aug '18

Module: wine Branch: master Commit: 9fef0a3f9db4df959bcba7b76a93976bf2988325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fef0a3f9db4df959bcba7b7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:01 2018 -0600 shell32: Add "add printer" icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(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 12517aa..ac52070 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -607,6 +607,10 @@ IDI_SHELL_OPTIONS ICON resources/control.ico /* @makedep: resources/folder.ico */ IDI_SHELL_PRINTERS_FOLDER_XP ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_ADD_PRINTER ICON resources/printer.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 2da5211..bf1d52c 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -230,6 +230,7 @@ /* 136 not used on Windows */ #define IDI_SHELL_OPTIONS 137 #define IDI_SHELL_PRINTERS_FOLDER_XP 138 +#define IDI_SHELL_ADD_PRINTER 139 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0