wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Alex Henrie : shell32: Add documents icon.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 5d66862e5aa37ea8c6982a5783acd85ff1f2ec28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d66862e5aa37ea8c6982a57… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:38 2018 -0600 shell32: Add documents 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 16b84b4..6dad8bc 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -801,6 +801,10 @@ IDI_SHELL_POWER_OFF ICON resources/shut_down.ico IDI_SHELL_DVD ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_DOCUMENTS ICON resources/document.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b947300..1c28a06 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -292,6 +292,7 @@ #define IDI_SHELL_USERS 220 #define IDI_SHELL_POWER_OFF 221 #define IDI_SHELL_DVD 222 +#define IDI_SHELL_DOCUMENTS 223 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236

1 0

Alex Henrie : shell32: Add remaining optical disc icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 12a6a58cca74ef35dd1ff06e75de74dc78ff74fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a6a58cca74ef35dd1ff06e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:37 2018 -0600 shell32: Add remaining optical disc icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 17 +++++++++++++ 2 files changed, 85 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0b0c54a..16b84b4 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -796,6 +796,14 @@ IDI_SHELL_USERS ICON resources/security.ico /* @makedep: resources/shut_down.ico */ IDI_SHELL_POWER_OFF ICON resources/shut_down.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -825,10 +833,26 @@ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico IDI_SHELL_NEW_NETWORK_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_WRITE_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_DELETE_FILE ICON resources/delete.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_ERASE_DISC ICON resources/delete.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_TO_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_BURN_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico @@ -840,13 +864,57 @@ IDI_SHELL_USERS_XP ICON resources/security.ico /* @makedep: resources/security.ico */ IDI_SHELL_USERS_XP2 ICON resources/security.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_drive.ico */ +IDI_SHELL_DVD_DRIVE ICON resources/optical_drive.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_HYBRID_CD ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_UNKNOWN_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_ROM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_R ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_RW ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_RAM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_R ICON resources/optical_disc.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_ROM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_RW ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_NEW_FOLDER ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index c529bdf..b947300 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -291,6 +291,8 @@ /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_POWER_OFF 221 +#define IDI_SHELL_DVD 222 +#define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 @@ -299,12 +301,27 @@ #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 +#define IDI_SHELL_WRITE_DISC 260 +#define IDI_SHELL_DELETE_FILE 261 +#define IDI_SHELL_ERASE_DISC 262 #define IDI_SHELL_TO_FOLDER 264 +#define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 #define IDI_SHELL_USERS_XP2 279 +#define IDI_SHELL_DVD_DRIVE 291 +#define IDI_SHELL_HYBRID_CD 292 +#define IDI_SHELL_UNKNOWN_DISC 293 +#define IDI_SHELL_CD_ROM 294 +#define IDI_SHELL_CD_R 295 +#define IDI_SHELL_CD_RW 296 +#define IDI_SHELL_DVD_RAM 297 +#define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 +#define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 +#define IDI_SHELL_BURN_DISC2 320 #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338

1 0

Alex Henrie : shell32: Rename icon 12 from "cdrom" to "optical drive".
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: f1f9b81e29fd8a23450fab9d95d5114af51e9118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1f9b81e29fd8a23450fab9d… 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> --- 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 c18369f..5bb1a33 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -255,7 +255,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 c04a37f..0b0c54a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -462,8 +462,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 61fb1e1..c529bdf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -180,7 +180,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 "power off" icon.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 9954c08dc8dc1783098a48e1188e08a8018c6092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9954c08dc8dc1783098a48e1… 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> --- 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 5ff23f9..c04a37f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -793,6 +793,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 33f28cf..61fb1e1 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -290,6 +290,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: Add remaining folder icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 5e53fb4bdf2d90b3ce276ca817f5383a76c75449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e53fb4bdf2d90b3ce276ca8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:34 2018 -0600 shell32: Add remaining folder icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 36 ++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 10 ++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0e595cb..5ff23f9 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -786,12 +786,28 @@ IDI_SHELL_NETWORK_FAX ICON resources/printer.ico IDI_SHELL_RESTRICTED ICON resources/restricted.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_DEFAULT_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_PICTURES ICON resources/mydocs.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_MUSIC ICON resources/mydocs.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/mydocs.ico */ +IDI_SHELL_MY_VIDEOS ICON resources/mydocs.ico + /* @makedep: resources/rename.ico */ IDI_SHELL_RENAME ICON resources/rename.ico @@ -802,6 +818,18 @@ IDI_SHELL_COPY ICON resources/copy.ico IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_NETWORK_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_TO_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS_XP ICON resources/security.ico @@ -812,9 +840,17 @@ IDI_SHELL_USERS_XP2 ICON resources/security.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_FOLDER ICON resources/folder.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico + /* @makedep: resources/restricted.ico */ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 73b46fd..33f28cf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -286,16 +286,26 @@ #define IDI_SHELL_DEFAULT_NETWORK_FAX 198 #define IDI_SHELL_NETWORK_FAX 199 #define IDI_SHELL_RESTRICTED 200 +/* 201 - 209 not used on Windows */ +#define IDI_SHELL_DEFAULT_FOLDER 210 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_MY_DOCUMENTS 235 +#define IDI_SHELL_MY_PICTURES 236 +#define IDI_SHELL_MY_MUSIC 237 +#define IDI_SHELL_MY_VIDEOS 238 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 +#define IDI_SHELL_NEW_NETWORK_FOLDER 258 +#define IDI_SHELL_TO_FOLDER 264 +#define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 #define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_OPTICAL_DISC 302 +#define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_FAVORITES_SMALL 322 +#define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338 /*

1 0

Alex Henrie : shell32: Add "restricted" icon.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 1cd138af46cd64e5bba96a66edf4905687ff35bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cd138af46cd64e5bba96a66… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:33 2018 -0600 shell32: Add "restricted" icon. Adapted from dialog-error in the Tango Icon Library. 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/restricted.ico | Bin 0 -> 54521 bytes dlls/shell32/resources/restricted.svg | 581 ++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 6 + dlls/shell32/shresdef.h | 2 + 5 files changed, 590 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1cd138af46cd64e5bba9…

1 0

Alex Henrie : shell32: Add fax machine icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 5feff6404505831060a9ee6627efc2345907c043 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5feff6404505831060a9ee66… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:32 2018 -0600 shell32: Add fax machine icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 16 ++++++++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index ab4a0f2..0f3fe43 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -767,6 +767,22 @@ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico IDI_SHELL_PASSWORDS ICON resources/security.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_DEFAULT_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_DEFAULT_NETWORK_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/printer.ico */ +IDI_SHELL_NETWORK_FAX ICON resources/printer.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/security.ico */ IDI_SHELL_USERS ICON resources/security.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 2b5bfbf..b0f0b2d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -280,6 +280,11 @@ #define IDI_SHELL_FULL_RECYCLE_BIN_95 192 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_PASSWORDS 194 +/* 195 not used on Windows */ +#define IDI_SHELL_FAX 196 +#define IDI_SHELL_DEFAULT_FAX 197 +#define IDI_SHELL_DEFAULT_NETWORK_FAX 198 +#define IDI_SHELL_NETWORK_FAX 199 /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_MY_DOCUMENTS 235

1 0

Alex Henrie : shell32: Add users icon and passwords icon.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: a3ee1876836ca3c3d7287474b3dfdad950fd3245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ee1876836ca3c3d7287474… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:31 2018 -0600 shell32: Add users icon and passwords icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 15 +++++++++++++++ dlls/shell32/shresdef.h | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f5e60e2..ab4a0f2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -763,6 +763,13 @@ IDI_SHELL_FULL_RECYCLE_BIN_95 ICON resources/trash_full.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico +/* @makedep: resources/security.ico */ +IDI_SHELL_PASSWORDS ICON resources/security.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/security.ico */ +IDI_SHELL_USERS ICON resources/security.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -775,6 +782,14 @@ IDI_SHELL_COPY ICON resources/copy.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/security.ico */ +IDI_SHELL_USERS_XP ICON resources/security.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/security.ico */ +IDI_SHELL_USERS_XP2 ICON resources/security.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 0340c70..2b5bfbf 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -279,10 +279,15 @@ #define IDI_SHELL_EMPTY_RECYCLE_BIN_95 191 #define IDI_SHELL_FULL_RECYCLE_BIN_95 192 #define IDI_SHELL_WEB_FOLDERS 193 +#define IDI_SHELL_PASSWORDS 194 +/* 211 - 219 not used on Windows */ +#define IDI_SHELL_USERS 220 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 +#define IDI_SHELL_USERS_XP 269 +#define IDI_SHELL_USERS_XP2 279 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_FAVORITES_SMALL 322

1 0

Alex Henrie : shell32: Rename icon 48 from "rights" to "security".
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: e7a3ce70162606c9785641b8b524340cee677532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a3ce70162606c9785641b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:30 2018 -0600 shell32: Rename icon 48 from "rights" to "security". Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/resources/{lock.ico => security.ico} | Bin dlls/shell32/resources/{lock.svg => security.svg} | 0 dlls/shell32/shell32.rc | 4 ++-- dlls/shell32/shresdef.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index e5217ea..5a56fc2 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -77,7 +77,6 @@ SVG_SRCS = \ resources/folder_open.svg \ resources/help.svg \ resources/internet.svg \ - resources/lock.svg \ resources/log_off.svg \ resources/menu.svg \ resources/mycomputer.svg \ @@ -91,6 +90,7 @@ SVG_SRCS = \ resources/recent.svg \ resources/rename.svg \ resources/search.svg \ + resources/security.svg \ resources/shortcut.svg \ resources/shut_down.svg \ resources/sleep.svg \ diff --git a/dlls/shell32/resources/lock.ico b/dlls/shell32/resources/security.ico similarity index 100% rename from dlls/shell32/resources/lock.ico rename to dlls/shell32/resources/security.ico diff --git a/dlls/shell32/resources/lock.svg b/dlls/shell32/resources/security.svg similarity index 100% rename from dlls/shell32/resources/lock.svg rename to dlls/shell32/resources/security.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6bb7aa1..f5e60e2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -566,8 +566,8 @@ IDI_SHELL_SEARCH_FOLDER ICON resources/search.ico /* @makedep: resources/update.ico */ IDI_SHELL_UPDATE ICON resources/update.ico -/* @makedep: resources/lock.ico */ -IDI_SHELL_RIGHTS ICON resources/lock.ico +/* @makedep: resources/security.ico */ +IDI_SHELL_SECURITY ICON resources/security.ico /* @makedep: resources/shut_down.ico */ IDI_SHELL_CONFIRM_SHUTDOWN ICON resources/shut_down.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 090a3fa..0340c70 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -216,7 +216,7 @@ #define IDI_SHELL_LOG_OFF 45 #define IDI_SHELL_SEARCH_FOLDER 46 #define IDI_SHELL_UPDATE 47 -#define IDI_SHELL_RIGHTS 48 +#define IDI_SHELL_SECURITY 48 #define IDI_SHELL_CONFIRM_SHUTDOWN 49 #define IDI_SHELL_BLANK1 50 #define IDI_SHELL_BLANK2 51

1 0

Alex Henrie : shell32: Add remaining recycle bin icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: ade232ada1fbf07a29f94e7241bff86b508fa2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade232ada1fbf07a29f94e72… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:29 2018 -0600 shell32: Add remaining recycle bin icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 9 +++++++++ dlls/shell32/shresdef.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 896c63d..6bb7aa1 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -754,6 +754,12 @@ IDI_SHELL_ONE_CLICK_OPEN ICON resources/folder_open.ico /* @makedep: resources/folder_open.ico */ IDI_SHELL_TWO_CLICK_OPEN ICON resources/folder_open.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_EMPTY_RECYCLE_BIN_95 ICON resources/trash_file.ico + +/* @makedep: resources/trash_full.ico */ +IDI_SHELL_FULL_RECYCLE_BIN_95 ICON resources/trash_full.ico + /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico @@ -766,6 +772,9 @@ IDI_SHELL_RENAME ICON resources/rename.ico /* @makedep: resources/copy.ico */ IDI_SHELL_COPY ICON resources/copy.ico +/* @makedep: resources/trash_file.ico */ +IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index e901460..090a3fa 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -275,10 +275,14 @@ #define IDI_SHELL_FLOATING_WINDOWS 185 #define IDI_SHELL_ONE_CLICK_OPEN 186 #define IDI_SHELL_TWO_CLICK_OPEN 187 +/* 188 - 190 not used on Windows */ +#define IDI_SHELL_EMPTY_RECYCLE_BIN_95 191 +#define IDI_SHELL_FULL_RECYCLE_BIN_95 192 #define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 +#define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_FAVORITES_SMALL 322

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018