shell32: Rename icon 12 from "cdrom" to "optical drive".

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

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 \

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;
 		}

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

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