Module: wine Branch: stable Commit: e9fd796122ed679e8d15780c2de923041acdb6b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9fd796122ed679e8d15780c2...
Author: Alex Henrie alexhenrie24@gmail.com Date: Tue Aug 28 23:47:37 2018 -0600
shell32: Add remaining optical disc icons.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 12a6a58cca74ef35dd1ff06e75de74dc78ff74fd) Signed-off-by: Michael Stefaniuc mstefani@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 0f71d69..0f126e7 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -730,6 +730,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
@@ -759,10 +767,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
@@ -774,13 +798,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 d8d2f13..4d0690d 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -287,6 +287,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 @@ -295,12 +297,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
-
Alexandre Julliard