From f1f9b81e29fd8a23450fab9d95d5114af51e9118 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Tue, 28 Aug 2018 23:47:36 -0600 Subject: [PATCH] shell32: Rename icon 12 from "cdrom" to "optical drive". Signed-off-by: Alex Henrie Signed-off-by: Alexandre Julliard --- 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(-) rename dlls/shell32/resources/{cdrom.ico => optical_drive.ico} (100%) rename dlls/shell32/resources/{cdrom.svg => optical_drive.svg} (100%) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 7411def7a2f..74a3c13f2bf 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 c18369f0809..5bb1a33d5dc 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 c04a37f4417..0b0c54a3d06 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 61fb1e144b2..c529bdfc0b1 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 -- 2.11.4.GIT