November 2018 - Wine-commits

Alex Henrie : shell32: Add "power off" icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

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: Rename icon 12 from "cdrom" to "optical drive".
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 69d2e3818dc78170d4d64341c90e4b9fa3d9e3da URL: https://source.winehq.org/git/wine.git/?a=commit;h=69d2e3818dc78170d4d64341… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:36 2018 -0600 shell32: Rename icon 12 from "cdrom" to "optical drive". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f1f9b81e29fd8a23450fab9d95d5114af51e9118) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/folders.c | 2 +- dlls/shell32/resources/{cdrom.ico => optical_drive.ico} | Bin dlls/shell32/resources/{cdrom.svg => optical_drive.svg} | 0 dlls/shell32/shell32.rc | 4 ++-- dlls/shell32/shresdef.h | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 7411def..74a3c13 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -63,7 +63,6 @@ IDL_SRCS = \ SVG_SRCS = \ resources/blank.svg \ - resources/cdrom.svg \ resources/control.svg \ resources/copy.svg \ resources/delete.svg \ @@ -85,6 +84,7 @@ SVG_SRCS = \ resources/netdrive2.svg \ resources/network.svg \ resources/optical_disc.svg \ + resources/optical_drive.svg \ resources/printer.svg \ resources/ramdisk.svg \ resources/recent.svg \ diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 9307b08..6e6afde 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -256,7 +256,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN switch(GetDriveTypeA(sTemp)) { case DRIVE_REMOVABLE: icon_idx = IDI_SHELL_FLOPPY; break; - case DRIVE_CDROM: icon_idx = IDI_SHELL_CDROM; break; + case DRIVE_CDROM: icon_idx = IDI_SHELL_OPTICAL_DRIVE; break; case DRIVE_REMOTE: icon_idx = IDI_SHELL_NETDRIVE; break; case DRIVE_RAMDISK: icon_idx = IDI_SHELL_RAMDISK; break; } diff --git a/dlls/shell32/resources/cdrom.ico b/dlls/shell32/resources/optical_drive.ico similarity index 100% rename from dlls/shell32/resources/cdrom.ico rename to dlls/shell32/resources/optical_drive.ico diff --git a/dlls/shell32/resources/cdrom.svg b/dlls/shell32/resources/optical_drive.svg similarity index 100% rename from dlls/shell32/resources/cdrom.svg rename to dlls/shell32/resources/optical_drive.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 27c6dc6..0f71d69 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -396,8 +396,8 @@ IDI_SHELL_NETDRIVE ICON resources/netdrive.ico /* @makedep: resources/netdrive2.ico */ IDI_SHELL_NETDRIVE2 ICON resources/netdrive2.ico -/* @makedep: resources/cdrom.ico */ -IDI_SHELL_CDROM ICON resources/cdrom.ico +/* @makedep: resources/optical_drive.ico */ +IDI_SHELL_OPTICAL_DRIVE ICON resources/optical_drive.ico /* @makedep: resources/ramdisk.ico */ IDI_SHELL_RAMDISK ICON resources/ramdisk.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 7af60d3..d8d2f13 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -176,7 +176,7 @@ #define IDI_SHELL_DRIVE 9 #define IDI_SHELL_NETDRIVE 10 #define IDI_SHELL_NETDRIVE2 11 -#define IDI_SHELL_CDROM 12 +#define IDI_SHELL_OPTICAL_DRIVE 12 #define IDI_SHELL_RAMDISK 13 #define IDI_SHELL_ENTIRE_NETWORK 14 #define IDI_SHELL_NETWORK 15

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 52a72d78457286fe4bcba8d1dafd736c853119ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=52a72d78457286fe4bcba8d1… 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> (cherry picked from commit bee0d3af678d198051249c819b7d33d9bceda7f4) 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 e76005c..c81e940 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -537,6 +537,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 232a3de..1764bf2 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -225,6 +225,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 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 3ea26dc172079f03b5c0d097e415209b0bb4bdd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ea26dc172079f03b5c0d097… 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> (cherry picked from commit 9fef0a3f9db4df959bcba7b76a93976bf2988325) 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 c81e940..f3f3af0 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -541,6 +541,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 1764bf2..b549f6d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -226,6 +226,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

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

29 Nov '18

Module: wine Branch: stable Commit: 29774279700728bc28614bf9dcd0ed8d11732cda URL: https://source.winehq.org/git/wine.git/?a=commit;h=29774279700728bc28614bf9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:02 2018 -0600 shell32: Add remote printer icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8c250c618fadd8b3ce2347f5058da1122e4b85ba) 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 f3f3af0..4d7d346 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -545,6 +545,10 @@ IDI_SHELL_PRINTERS_FOLDER_XP ICON resources/folder.ico /* @makedep: resources/printer.ico */ IDI_SHELL_ADD_PRINTER ICON resources/printer.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_REMOTE_PRINTER ICON resources/printer.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0

Alex Henrie : shell32: Add "print to file" icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: eb613941c820501c5751b1002a024f3d181f8c59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb613941c820501c5751b100… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:03 2018 -0600 shell32: Add "print to file" icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1d6191eb2a4a306171ae9c777fe8138e6828d38) 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 4d7d346..86e05b1 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -549,6 +549,10 @@ IDI_SHELL_ADD_PRINTER ICON resources/printer.ico /* @makedep: resources/printer.ico */ IDI_SHELL_REMOTE_PRINTER ICON resources/printer.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_TO_FILE_PRINTER ICON resources/printer.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0

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

29 Nov '18

Module: wine Branch: stable Commit: 9c7e0060bc75bfbf5409926da3b65dbcdf15c670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c7e0060bc75bfbf5409926d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:04 2018 -0600 shell32: Add "trash folder" icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5d60f1697a26341b4bc9c702bfc02274a7aa988d) 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 86e05b1..a68d123 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -556,6 +556,9 @@ IDI_SHELL_TO_FILE_PRINTER ICON resources/printer.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_TRASH_FOLDER ICON resources/trash_file.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 b549f6d..f38e0d2 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -230,6 +230,7 @@ #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 +#define IDI_SHELL_TRASH_FOLDER 143 #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 "trash mixed" icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 90c112d4770af36dfba9a3222c9aeb17c77cebfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=90c112d4770af36dfba9a322… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:05 2018 -0600 shell32: Add "trash mixed" icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9aabf827ed594b3631cfc847d70e57a0d3b46ba4) 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 a68d123..fb20391 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -559,6 +559,9 @@ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FOLDER ICON resources/trash_file.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_TRASH_MIXED ICON resources/trash_file.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 f38e0d2..45ac067 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -231,6 +231,7 @@ #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142 #define IDI_SHELL_TRASH_FOLDER 143 +#define IDI_SHELL_TRASH_MIXED 144 #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 file overwrite icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: fd003230fcf3b9e14873db0587bb27bb76c945cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd003230fcf3b9e14873db05… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:06 2018 -0600 shell32: Add file overwrite icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fb706ed7f871ce632210cf9356c8e43789f032aa) 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 fb20391..8b9e159 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -562,6 +562,10 @@ IDI_SHELL_TRASH_FOLDER ICON resources/trash_file.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_MIXED ICON resources/trash_file.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_FILE_OVERWRITE ICON resources/delete.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 45ac067..d5ce7c6 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -232,6 +232,7 @@ #define IDI_SHELL_TRASH_FILE 142 #define IDI_SHELL_TRASH_FOLDER 143 #define IDI_SHELL_TRASH_MIXED 144 +#define IDI_SHELL_FILE_OVERWRITE 145 #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 overwrite icon.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: stable Commit: 8309f5b8f42f872eac53d4729d2afc21f31e02c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8309f5b8f42f872eac53d472… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 26 22:21:07 2018 -0600 shell32: Add folder overwrite icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6d4e625cb28d7e6e798b5304b125f0c89647d0e0) 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 8b9e159..6225a8d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -566,6 +566,10 @@ IDI_SHELL_TRASH_MIXED ICON resources/trash_file.ico /* @makedep: resources/delete.ico */ IDI_SHELL_FILE_OVERWRITE ICON resources/delete.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_FOLDER_OVERWRITE ICON resources/delete.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 d5ce7c6..247f941 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -233,6 +233,7 @@ #define IDI_SHELL_TRASH_FOLDER 143 #define IDI_SHELL_TRASH_MIXED 144 #define IDI_SHELL_FILE_OVERWRITE 145 +#define IDI_SHELL_FOLDER_OVERWRITE 146 #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_DEFAULT_PRINTER 168 #define IDI_SHELL_DEFAULT_REMOTE_PRINTER 169

1 0