[SHELL32] Big Icon Update by Henry Tang Ih and Jared Smudde

-Fix blurry icons.
-Make the icons sharper and clearer in all size.
-Modified the design of some icons.
-Brand new Fax icons!
-Remove unneeded icon sizes

Things I have changed from the original patch:
-Fix 2 copypasta and 1 double definition errors
-Changed the icon back to the floppy one in folders.cpp and drvdefext.cpp because this would have resulted an a regression for floppy drives

svn path=/trunk/; revision=69847

reactos/dll/win32/shell32/dialogs/drvdefext.cpp

@@ -303,7 +303,7 @@ CDrvDefExt::InitGeneralPage(HWND hwndDlg)
     switch (DriveType)
     {
         case DRIVE_CDROM: IconId = IDI_SHELL_CDROM; TypeStrId = IDS_DRIVE_CDROM; break;
-        case DRIVE_REMOVABLE: IconId = IDI_SHELL_FLOPPY; break;
+        case DRIVE_REMOVABLE: IconId = IDI_SHELL_3_14_FLOPPY; break;
         case DRIVE_RAMDISK: IconId = IDI_SHELL_RAMDISK; break;
         default: IconId = IDI_SHELL_DRIVE; TypeStrId = IDS_DRIVE_FIXED;
     }

reactos/dll/win32/shell32/folders.cpp

@@ -289,7 +289,7 @@ IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl)
             switch(GetDriveTypeA(sTemp))
             {
                 case DRIVE_REMOVABLE:
-                    icon_idx = IDI_SHELL_FLOPPY;
+                    icon_idx = IDI_SHELL_3_14_FLOPPY;
                     break;
                 case DRIVE_CDROM:
                     icon_idx = IDI_SHELL_CDROM;

reactos/dll/win32/shell32/icon_res.rc

@@ -5,7 +5,7 @@ IDI_SHELL_FOLDER ICON "res/icons/4.ico"
 IDI_SHELL_FOLDER_OPEN ICON "res/icons/5.ico"
 IDI_SHELL_5_12_FLOPPY ICON "res/icons/6.ico"
 IDI_SHELL_3_14_FLOPPY ICON "res/icons/7.ico"
-IDI_SHELL_FLOPPY ICON "res/icons/7.ico"
+IDI_SHELL_REMOVEABLE ICON "res/icons/8.ico"
 IDI_SHELL_DRIVE ICON "res/icons/9.ico"
 IDI_SHELL_NETDRIVE ICON "res/icons/10.ico"
 IDI_SHELL_NETDRIVE_OFF ICON "res/icons/11.ico"
@@ -46,6 +46,7 @@ IDI_SHELL_LOGOFF ICON "res/icons/45.ico"
 IDI_SHELL_EXPLORER ICON "res/icons/46.ico"
 IDI_SHELL_UPDATE ICON "res/icons/47.ico"
 IDI_SHELL_LOCKED ICON "res/icons/48.ico"
+IDI_SHELL_DISCONN ICON "res/icons/49.ico"
 IDI_SHELL_NOT_CONNECTED_HDD ICON "res/icons/54.ico"
 IDI_SHELL_MULTIPLE_FILES ICON "res/icons/133.ico"
 IDI_SHELL_FIND_IN_FILE ICON "res/icons/134.ico"
@@ -101,7 +102,10 @@ IDI_SHELL_EMPTY_RECYCLE_BIN1 ICON "res/icons/191.ico"
 IDI_SHELL_FULL_RECYCLE_BIN1 ICON "res/icons/192.ico"
 IDI_SHELL_WEB_FOLDERS ICON "res/icons/193.ico"
 IDI_SHELL_SECURITY ICON "res/icons/194.ico"
-/* TODO: 196.ico, 197.ico, 198.ico, 199.ico */
+IDI_SHELL_FAX ICON "res/icons/196.ico"
+IDI_SHELL_FAX_OK ICON "res/icons/197.ico"
+IDI_SHELL_NET_FAX_OK ICON "res/icons/198.ico"
+IDI_SHELL_NET_FAX ICON "res/icons/199.ico"
 IDI_SHELL_NO ICON "res/icons/200.ico"
 IDI_SHELL_FOLDER_OPTIONS ICON "res/icons/210.ico"
 IDI_SHELL_USERS2 ICON "res/icons/220.ico"
@@ -164,7 +168,7 @@ IDI_SHELL_INTERNET_DATE ICON "res/icons/276.ico"
 IDI_SHELL_TUNES ICON "res/icons/277.ico"
 IDI_SHELL_CMD ICON "res/icons/278.ico"
 IDI_SHELL_USER_ACCOUNTS ICON "res/icons/279.ico"
-//IDI_SHELL_WINDOWS_SEARCH ICON "res/icons/281.ico"
+IDI_SHELL_WINDOWS_SEARCH ICON "res/icons/281.ico"
 IDI_SHELL_COMPUTER_TEXT ICON "res/icons/282.ico"
 IDI_SHELL_OSK ICON "res/icons/283.ico"
 IDI_SHELL_ICON_284 ICON "res/icons/284.ico"
@@ -182,10 +186,11 @@ IDI_SHELL_MP3_PLAYER ICON "res/icons/299.ico"
 IDI_SHELL_SERVER ICON "res/icons/300.ico"
 IDI_SHELL_SERVER1 ICON "res/icons/301.ico"
 IDI_SHELL_CD_ROM1 ICON "res/icons/302.ico"
-/* TODO: 303.ico */
+IDI_SHELL_COMPACT_FLASH ICON "res/icons/303.ico"
 IDI_SHELL_DVD_ROM1 ICON "res/icons/304.ico"
 IDI_SHELL_FDD2 ICON "res/icons/305.ico"
-/* TODO: 306.ico, 307.ico */
+/* TODO: 306.ico */
+IDI_SHELL_SD_MMC ICON "res/icons/307.ico"
 IDI_SHELL_SMART_MEDIA ICON "res/icons/308.ico"
 IDI_SHELL_CAMERA1 ICON "res/icons/309.ico"
 IDI_SHELL_PHONE ICON "res/icons/310.ico"
@@ -220,7 +225,10 @@ IDI_SHELL_HELP_FILE1 ICON "res/icons/1004.ico"
 IDI_SHELL_FILE_MOVE1 ICON "res/icons/1005.ico"
 IDI_SHELL_FILE_PRINT ICON "res/icons/1006.ico"
 IDI_SHELL_FILE_OK ICON "res/icons/1007.ico"
-/* TODO: 1008.ico, 1009.ico, 1010.ico, 1011.ico */
+IDI_SHELL_PRINT_PAUSE ICON "res/icons/1008.ico"
+IDI_SHELL_PRINT_PLAY ICON "res/icons/1009.ico"
+IDI_SHELL_PRINT_SHARE ICON "res/icons/1010.ico"
+IDI_SHELL_FAX2 ICON "res/icons/1011.ico"
 IDI_SHELL_SHUTDOWN2 ICON "res/icons/8240.ico"
 IDI_SHELL_DELETE1 ICON "res/icons/16710.ico"
 IDI_SHELL_DELETE2 ICON "res/icons/16715.ico"

reactos/dll/win32/shell32/shresdef.h

@@ -319,7 +319,7 @@
 #define IDI_SHELL_FOLDER_OPEN        5
 #define IDI_SHELL_5_12_FLOPPY        6
 #define IDI_SHELL_3_14_FLOPPY        7
-#define IDI_SHELL_FLOPPY             8
+#define IDI_SHELL_REMOVEABLE         8
 #define IDI_SHELL_DRIVE              9
 #define IDI_SHELL_NETDRIVE          10
 #define IDI_SHELL_NETDRIVE_OFF      11
@@ -337,8 +337,8 @@
 #define IDI_SHELL_SEARCH            23
 #define IDI_SHELL_HELP              24
 #define IDI_SHELL_RUN               25
-#define IDI_SHELL_SLEEP				26
-#define IDI_SHELL_HARDWARE_REMOVE	27
+#define IDI_SHELL_SLEEP             26
+#define IDI_SHELL_HARDWARE_REMOVE   27
 #define IDI_SHELL_SHUTDOWN          28
 #define IDI_SHELL_SHARE             29
 #define IDI_SHELL_SHORTCUT          30
@@ -360,6 +360,7 @@
 #define IDI_SHELL_EXPLORER          46
 #define IDI_SHELL_UPDATE            47
 #define IDI_SHELL_LOCKED            48
+#define IDI_SHELL_DISCONN           49
 #define IDI_SHELL_NOT_CONNECTED_HDD 54
 #define IDI_SHELL_MULTIPLE_FILES   133
 #define IDI_SHELL_FIND_IN_FILE     134
@@ -415,7 +416,10 @@
 #define IDI_SHELL_FULL_RECYCLE_BIN1  192
 #define IDI_SHELL_WEB_FOLDERS      193
 #define IDI_SHELL_SECURITY         194
-/* TODO: 196.ico, 197.ico, 198.ico, 199.ico */
+#define IDI_SHELL_FAX              196
+#define IDI_SHELL_FAX_OK           197
+#define IDI_SHELL_NET_FAX_OK       198
+#define IDI_SHELL_NET_FAX          199
 #define IDI_SHELL_NO               200
 #define IDI_SHELL_FOLDER_OPTIONS   210
 #define IDI_SHELL_USERS2           220
@@ -497,10 +501,11 @@
 #define IDI_SHELL_SERVER           300
 #define IDI_SHELL_SERVER1          301
 #define IDI_SHELL_CD_ROM1          302
-/* TODO: 303.ico */
+#define IDI_SHELL_COMPACT_FLASH    303
 #define IDI_SHELL_DVD_ROM1         304
 #define IDI_SHELL_FDD2             305
-/* TODO: 306.ico, 307.ico */
+/* TODO: 306.ico */
+#define IDI_SHELL_SD_MMC           307
 #define IDI_SHELL_SMART_MEDIA      308
 #define IDI_SHELL_CAMERA1          309
 #define IDI_SHELL_PHONE            310
@@ -535,7 +540,10 @@
 #define IDI_SHELL_FILE_MOVE1       1005
 #define IDI_SHELL_FILE_PRINT       1006
 #define IDI_SHELL_FILE_OK          1007
-/* TODO: 1008.ico, 1009.ico, 1010.ico, 1011.ico */
+#define IDI_SHELL_PRINT_PAUSE      1008
+#define IDI_SHELL_PRINT_PLAY       1009
+#define IDI_SHELL_PRINT_SHARE      1010
+#define IDI_SHELL_FAX2             1011
 #define IDI_SHELL_SHUTDOWN2        8240
 
 #define IDI_SHELL_DELETE1 16710