diff --git a/reactos/dll/win32/shell32/dialogs/drvdefext.cpp b/reactos/dll/win32/shell32/dialogs/drvdefext.cpp index 7ac1c53ef62..331eb8749d6 100644 --- a/reactos/dll/win32/shell32/dialogs/drvdefext.cpp +++ b/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; } diff --git a/reactos/dll/win32/shell32/folders.cpp b/reactos/dll/win32/shell32/folders.cpp index 90704e130cd..6fea64701ab 100644 --- a/reactos/dll/win32/shell32/folders.cpp +++ b/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; diff --git a/reactos/dll/win32/shell32/icon_res.rc b/reactos/dll/win32/shell32/icon_res.rc index 20b924b038b..0c212a612b2 100644 --- a/reactos/dll/win32/shell32/icon_res.rc +++ b/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" diff --git a/reactos/dll/win32/shell32/res/icons/1001.ico b/reactos/dll/win32/shell32/res/icons/1001.ico index e7b9f8c1f33..e6838287cda 100644 Binary files a/reactos/dll/win32/shell32/res/icons/1001.ico and b/reactos/dll/win32/shell32/res/icons/1001.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/1008.ico b/reactos/dll/win32/shell32/res/icons/1008.ico new file mode 100644 index 00000000000..e050254c7ee Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/1008.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/1009.ico b/reactos/dll/win32/shell32/res/icons/1009.ico new file mode 100644 index 00000000000..ef88abece30 Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/1009.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/1010.ico b/reactos/dll/win32/shell32/res/icons/1010.ico new file mode 100644 index 00000000000..60bdcd1b8c8 Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/1010.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/1011.ico b/reactos/dll/win32/shell32/res/icons/1011.ico new file mode 100644 index 00000000000..1438e5766d7 Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/1011.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/12.ico b/reactos/dll/win32/shell32/res/icons/12.ico index 56c69a256d7..c85f0f3585e 100644 Binary files a/reactos/dll/win32/shell32/res/icons/12.ico and b/reactos/dll/win32/shell32/res/icons/12.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/13.ico b/reactos/dll/win32/shell32/res/icons/13.ico index bcafb16a18c..9e0473587dd 100644 Binary files a/reactos/dll/win32/shell32/res/icons/13.ico and b/reactos/dll/win32/shell32/res/icons/13.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/135.ico b/reactos/dll/win32/shell32/res/icons/135.ico index a35009600a0..08bc566b559 100644 Binary files a/reactos/dll/win32/shell32/res/icons/135.ico and b/reactos/dll/win32/shell32/res/icons/135.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/137.ico b/reactos/dll/win32/shell32/res/icons/137.ico index 311d3cc3717..55223f0d0af 100644 Binary files a/reactos/dll/win32/shell32/res/icons/137.ico and b/reactos/dll/win32/shell32/res/icons/137.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/138.ico b/reactos/dll/win32/shell32/res/icons/138.ico index df01d44caa7..12f44628b99 100644 Binary files a/reactos/dll/win32/shell32/res/icons/138.ico and b/reactos/dll/win32/shell32/res/icons/138.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/139.ico b/reactos/dll/win32/shell32/res/icons/139.ico index 5b16e966d0e..5eecaf5106c 100644 Binary files a/reactos/dll/win32/shell32/res/icons/139.ico and b/reactos/dll/win32/shell32/res/icons/139.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/140.ico b/reactos/dll/win32/shell32/res/icons/140.ico index 5160ff76fd0..8659609841a 100644 Binary files a/reactos/dll/win32/shell32/res/icons/140.ico and b/reactos/dll/win32/shell32/res/icons/140.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/141.ico b/reactos/dll/win32/shell32/res/icons/141.ico index a97ed823d20..3fbc610b1f2 100644 Binary files a/reactos/dll/win32/shell32/res/icons/141.ico and b/reactos/dll/win32/shell32/res/icons/141.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/154.ico b/reactos/dll/win32/shell32/res/icons/154.ico index c3d380dbdcf..cfb0038381d 100644 Binary files a/reactos/dll/win32/shell32/res/icons/154.ico and b/reactos/dll/win32/shell32/res/icons/154.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/156.ico b/reactos/dll/win32/shell32/res/icons/156.ico index 33c6fc769fb..146468b44a5 100644 Binary files a/reactos/dll/win32/shell32/res/icons/156.ico and b/reactos/dll/win32/shell32/res/icons/156.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/157.ico b/reactos/dll/win32/shell32/res/icons/157.ico index 33c6fc769fb..530089e8092 100644 Binary files a/reactos/dll/win32/shell32/res/icons/157.ico and b/reactos/dll/win32/shell32/res/icons/157.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/161.ico b/reactos/dll/win32/shell32/res/icons/161.ico index 706daeffdab..bc84190e6f4 100644 Binary files a/reactos/dll/win32/shell32/res/icons/161.ico and b/reactos/dll/win32/shell32/res/icons/161.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/165.ico b/reactos/dll/win32/shell32/res/icons/165.ico index 72875ebe771..2f3c44155b8 100644 Binary files a/reactos/dll/win32/shell32/res/icons/165.ico and b/reactos/dll/win32/shell32/res/icons/165.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/166.ico b/reactos/dll/win32/shell32/res/icons/166.ico index cfc98acff1e..0263df0f8d8 100644 Binary files a/reactos/dll/win32/shell32/res/icons/166.ico and b/reactos/dll/win32/shell32/res/icons/166.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/168.ico b/reactos/dll/win32/shell32/res/icons/168.ico index b7517af1a39..603b737fe07 100644 Binary files a/reactos/dll/win32/shell32/res/icons/168.ico and b/reactos/dll/win32/shell32/res/icons/168.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/169.ico b/reactos/dll/win32/shell32/res/icons/169.ico index b568b37aad4..a8d6e2f6e36 100644 Binary files a/reactos/dll/win32/shell32/res/icons/169.ico and b/reactos/dll/win32/shell32/res/icons/169.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/170.ico b/reactos/dll/win32/shell32/res/icons/170.ico index 905d6d2301c..5f76b3a2b06 100644 Binary files a/reactos/dll/win32/shell32/res/icons/170.ico and b/reactos/dll/win32/shell32/res/icons/170.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/1700.ico b/reactos/dll/win32/shell32/res/icons/1700.ico index 3850b53d7be..af0618ec77f 100644 Binary files a/reactos/dll/win32/shell32/res/icons/1700.ico and b/reactos/dll/win32/shell32/res/icons/1700.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/172.ico b/reactos/dll/win32/shell32/res/icons/172.ico index cf3a1413d1d..e1fbdfd3984 100644 Binary files a/reactos/dll/win32/shell32/res/icons/172.ico and b/reactos/dll/win32/shell32/res/icons/172.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/176.ico b/reactos/dll/win32/shell32/res/icons/176.ico index f0282c7f688..830284aebef 100644 Binary files a/reactos/dll/win32/shell32/res/icons/176.ico and b/reactos/dll/win32/shell32/res/icons/176.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/178.ico b/reactos/dll/win32/shell32/res/icons/178.ico index 650fcbf46ee..cf4e7dbdaaa 100644 Binary files a/reactos/dll/win32/shell32/res/icons/178.ico and b/reactos/dll/win32/shell32/res/icons/178.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/182.ico b/reactos/dll/win32/shell32/res/icons/182.ico index 56c8f24b994..a5c73c0226c 100644 Binary files a/reactos/dll/win32/shell32/res/icons/182.ico and b/reactos/dll/win32/shell32/res/icons/182.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/183.ico b/reactos/dll/win32/shell32/res/icons/183.ico index 5f3251917ba..16f873c362f 100644 Binary files a/reactos/dll/win32/shell32/res/icons/183.ico and b/reactos/dll/win32/shell32/res/icons/183.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/184.ico b/reactos/dll/win32/shell32/res/icons/184.ico index 5eee0af44ec..0dab4b9eb12 100644 Binary files a/reactos/dll/win32/shell32/res/icons/184.ico and b/reactos/dll/win32/shell32/res/icons/184.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/185.ico b/reactos/dll/win32/shell32/res/icons/185.ico index 6b4dc9303e5..a88e3fcc8b1 100644 Binary files a/reactos/dll/win32/shell32/res/icons/185.ico and b/reactos/dll/win32/shell32/res/icons/185.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/186.ico b/reactos/dll/win32/shell32/res/icons/186.ico index d09411113a0..294b1d9f94d 100644 Binary files a/reactos/dll/win32/shell32/res/icons/186.ico and b/reactos/dll/win32/shell32/res/icons/186.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/187.ico b/reactos/dll/win32/shell32/res/icons/187.ico index 38b924da89a..5a50fc5c585 100644 Binary files a/reactos/dll/win32/shell32/res/icons/187.ico and b/reactos/dll/win32/shell32/res/icons/187.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/193.ico b/reactos/dll/win32/shell32/res/icons/193.ico index e93baea8b92..4d73f3a6fe9 100644 Binary files a/reactos/dll/win32/shell32/res/icons/193.ico and b/reactos/dll/win32/shell32/res/icons/193.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/194.ico b/reactos/dll/win32/shell32/res/icons/194.ico index f48db0ebe60..94143e26e2a 100644 Binary files a/reactos/dll/win32/shell32/res/icons/194.ico and b/reactos/dll/win32/shell32/res/icons/194.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/196.ico b/reactos/dll/win32/shell32/res/icons/196.ico new file mode 100644 index 00000000000..1438e5766d7 Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/196.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/197.ico b/reactos/dll/win32/shell32/res/icons/197.ico new file mode 100644 index 00000000000..65c80790134 Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/197.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/198.ico b/reactos/dll/win32/shell32/res/icons/198.ico new file mode 100644 index 00000000000..af748221819 Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/198.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/199.ico b/reactos/dll/win32/shell32/res/icons/199.ico new file mode 100644 index 00000000000..e16c00d908b Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/199.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/20.ico b/reactos/dll/win32/shell32/res/icons/20.ico index cba2cbcd935..dd0f0656e9e 100644 Binary files a/reactos/dll/win32/shell32/res/icons/20.ico and b/reactos/dll/win32/shell32/res/icons/20.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/22.ico b/reactos/dll/win32/shell32/res/icons/22.ico index 311d3cc3717..55223f0d0af 100644 Binary files a/reactos/dll/win32/shell32/res/icons/22.ico and b/reactos/dll/win32/shell32/res/icons/22.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/222.ico b/reactos/dll/win32/shell32/res/icons/222.ico index 06c5be54099..8b1b01131db 100644 Binary files a/reactos/dll/win32/shell32/res/icons/222.ico and b/reactos/dll/win32/shell32/res/icons/222.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/223.ico b/reactos/dll/win32/shell32/res/icons/223.ico index 0a48261901e..778d08b7acc 100644 Binary files a/reactos/dll/win32/shell32/res/icons/223.ico and b/reactos/dll/win32/shell32/res/icons/223.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/226.ico b/reactos/dll/win32/shell32/res/icons/226.ico index 4045c348bc4..3a5ddebdcb8 100644 Binary files a/reactos/dll/win32/shell32/res/icons/226.ico and b/reactos/dll/win32/shell32/res/icons/226.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/227.ico b/reactos/dll/win32/shell32/res/icons/227.ico index d8e784c6c77..6b987070e1f 100644 Binary files a/reactos/dll/win32/shell32/res/icons/227.ico and b/reactos/dll/win32/shell32/res/icons/227.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/228.ico b/reactos/dll/win32/shell32/res/icons/228.ico index 879feb09624..d5c025f619c 100644 Binary files a/reactos/dll/win32/shell32/res/icons/228.ico and b/reactos/dll/win32/shell32/res/icons/228.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/229.ico b/reactos/dll/win32/shell32/res/icons/229.ico index 5e9a3b91020..306927aa269 100644 Binary files a/reactos/dll/win32/shell32/res/icons/229.ico and b/reactos/dll/win32/shell32/res/icons/229.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/249.ico b/reactos/dll/win32/shell32/res/icons/249.ico index 9aecb582b81..71bbcb6dd94 100644 Binary files a/reactos/dll/win32/shell32/res/icons/249.ico and b/reactos/dll/win32/shell32/res/icons/249.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/252.ico b/reactos/dll/win32/shell32/res/icons/252.ico index af2d0a6eecf..a3bf5b935f3 100644 Binary files a/reactos/dll/win32/shell32/res/icons/252.ico and b/reactos/dll/win32/shell32/res/icons/252.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/259.ico b/reactos/dll/win32/shell32/res/icons/259.ico index a098b89d0cf..0ba1a032e73 100644 Binary files a/reactos/dll/win32/shell32/res/icons/259.ico and b/reactos/dll/win32/shell32/res/icons/259.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/263.ico b/reactos/dll/win32/shell32/res/icons/263.ico index 6008790389d..8c6b5918ab6 100644 Binary files a/reactos/dll/win32/shell32/res/icons/263.ico and b/reactos/dll/win32/shell32/res/icons/263.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/267.ico b/reactos/dll/win32/shell32/res/icons/267.ico index 74729a4c995..4a296ff0ce0 100644 Binary files a/reactos/dll/win32/shell32/res/icons/267.ico and b/reactos/dll/win32/shell32/res/icons/267.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/268.ico b/reactos/dll/win32/shell32/res/icons/268.ico index b0565ca436b..254dd3bfa6d 100644 Binary files a/reactos/dll/win32/shell32/res/icons/268.ico and b/reactos/dll/win32/shell32/res/icons/268.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/270.ico b/reactos/dll/win32/shell32/res/icons/270.ico index e62cf47237d..c52cc7647fb 100644 Binary files a/reactos/dll/win32/shell32/res/icons/270.ico and b/reactos/dll/win32/shell32/res/icons/270.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/271.ico b/reactos/dll/win32/shell32/res/icons/271.ico index 350486328aa..0ae7a7a2a18 100644 Binary files a/reactos/dll/win32/shell32/res/icons/271.ico and b/reactos/dll/win32/shell32/res/icons/271.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/277.ico b/reactos/dll/win32/shell32/res/icons/277.ico index 5cda537e17a..749e10a63b0 100644 Binary files a/reactos/dll/win32/shell32/res/icons/277.ico and b/reactos/dll/win32/shell32/res/icons/277.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/281.ico b/reactos/dll/win32/shell32/res/icons/281.ico new file mode 100644 index 00000000000..a53feda5232 Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/281.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/283.ico b/reactos/dll/win32/shell32/res/icons/283.ico index 29a655acbbe..bbc297ae0f4 100644 Binary files a/reactos/dll/win32/shell32/res/icons/283.ico and b/reactos/dll/win32/shell32/res/icons/283.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/289.ico b/reactos/dll/win32/shell32/res/icons/289.ico index 6008790389d..8c6b5918ab6 100644 Binary files a/reactos/dll/win32/shell32/res/icons/289.ico and b/reactos/dll/win32/shell32/res/icons/289.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/29.ico b/reactos/dll/win32/shell32/res/icons/29.ico index f33ac25e692..c0502b351a6 100644 Binary files a/reactos/dll/win32/shell32/res/icons/29.ico and b/reactos/dll/win32/shell32/res/icons/29.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/291.ico b/reactos/dll/win32/shell32/res/icons/291.ico index 06c5be54099..10438330358 100644 Binary files a/reactos/dll/win32/shell32/res/icons/291.ico and b/reactos/dll/win32/shell32/res/icons/291.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/293.ico b/reactos/dll/win32/shell32/res/icons/293.ico index 94a2e1e67b2..2192ef56ded 100644 Binary files a/reactos/dll/win32/shell32/res/icons/293.ico and b/reactos/dll/win32/shell32/res/icons/293.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/294.ico b/reactos/dll/win32/shell32/res/icons/294.ico index 94a2e1e67b2..4832044ef37 100644 Binary files a/reactos/dll/win32/shell32/res/icons/294.ico and b/reactos/dll/win32/shell32/res/icons/294.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/295.ico b/reactos/dll/win32/shell32/res/icons/295.ico index 94a2e1e67b2..839c0621e54 100644 Binary files a/reactos/dll/win32/shell32/res/icons/295.ico and b/reactos/dll/win32/shell32/res/icons/295.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/296.ico b/reactos/dll/win32/shell32/res/icons/296.ico index 94a2e1e67b2..11005de0895 100644 Binary files a/reactos/dll/win32/shell32/res/icons/296.ico and b/reactos/dll/win32/shell32/res/icons/296.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/297.ico b/reactos/dll/win32/shell32/res/icons/297.ico index 94a2e1e67b2..acdae409297 100644 Binary files a/reactos/dll/win32/shell32/res/icons/297.ico and b/reactos/dll/win32/shell32/res/icons/297.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/298.ico b/reactos/dll/win32/shell32/res/icons/298.ico index 94a2e1e67b2..236029a30e8 100644 Binary files a/reactos/dll/win32/shell32/res/icons/298.ico and b/reactos/dll/win32/shell32/res/icons/298.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/30.ico b/reactos/dll/win32/shell32/res/icons/30.ico index 3a8081fdb37..0abd5aaf8e2 100644 Binary files a/reactos/dll/win32/shell32/res/icons/30.ico and b/reactos/dll/win32/shell32/res/icons/30.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/303.ico b/reactos/dll/win32/shell32/res/icons/303.ico new file mode 100644 index 00000000000..7277af27d34 Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/303.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/304.ico b/reactos/dll/win32/shell32/res/icons/304.ico index 94a2e1e67b2..3f391255710 100644 Binary files a/reactos/dll/win32/shell32/res/icons/304.ico and b/reactos/dll/win32/shell32/res/icons/304.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/307.ico b/reactos/dll/win32/shell32/res/icons/307.ico new file mode 100644 index 00000000000..c4a89cb597f Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/307.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/31.ico b/reactos/dll/win32/shell32/res/icons/31.ico index 7ad4935082e..13cbb6735be 100644 Binary files a/reactos/dll/win32/shell32/res/icons/31.ico and b/reactos/dll/win32/shell32/res/icons/31.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/312.ico b/reactos/dll/win32/shell32/res/icons/312.ico index 8c285872d09..202bff59924 100644 Binary files a/reactos/dll/win32/shell32/res/icons/312.ico and b/reactos/dll/win32/shell32/res/icons/312.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/313.ico b/reactos/dll/win32/shell32/res/icons/313.ico index 9279f870d3c..d8b542bb46d 100644 Binary files a/reactos/dll/win32/shell32/res/icons/313.ico and b/reactos/dll/win32/shell32/res/icons/313.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/316.ico b/reactos/dll/win32/shell32/res/icons/316.ico index e0fd898c432..cf19362422f 100644 Binary files a/reactos/dll/win32/shell32/res/icons/316.ico and b/reactos/dll/win32/shell32/res/icons/316.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/318.ico b/reactos/dll/win32/shell32/res/icons/318.ico index 94a2e1e67b2..9ddc8224304 100644 Binary files a/reactos/dll/win32/shell32/res/icons/318.ico and b/reactos/dll/win32/shell32/res/icons/318.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/321.ico b/reactos/dll/win32/shell32/res/icons/321.ico index 311d3cc3717..57ef827166b 100644 Binary files a/reactos/dll/win32/shell32/res/icons/321.ico and b/reactos/dll/win32/shell32/res/icons/321.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/326.ico b/reactos/dll/win32/shell32/res/icons/326.ico index b962c371bfd..db56f8bf929 100644 Binary files a/reactos/dll/win32/shell32/res/icons/326.ico and b/reactos/dll/win32/shell32/res/icons/326.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/327.ico b/reactos/dll/win32/shell32/res/icons/327.ico index 7d9a45ed533..b2d8b876687 100644 Binary files a/reactos/dll/win32/shell32/res/icons/327.ico and b/reactos/dll/win32/shell32/res/icons/327.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/330.ico b/reactos/dll/win32/shell32/res/icons/330.ico index b4960d6026d..96333b9d893 100644 Binary files a/reactos/dll/win32/shell32/res/icons/330.ico and b/reactos/dll/win32/shell32/res/icons/330.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/337.ico b/reactos/dll/win32/shell32/res/icons/337.ico index a35009600a0..514211801e6 100644 Binary files a/reactos/dll/win32/shell32/res/icons/337.ico and b/reactos/dll/win32/shell32/res/icons/337.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/36.ico b/reactos/dll/win32/shell32/res/icons/36.ico index 311d3cc3717..55223f0d0af 100644 Binary files a/reactos/dll/win32/shell32/res/icons/36.ico and b/reactos/dll/win32/shell32/res/icons/36.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/37.ico b/reactos/dll/win32/shell32/res/icons/37.ico index cba2cbcd935..766842af555 100644 Binary files a/reactos/dll/win32/shell32/res/icons/37.ico and b/reactos/dll/win32/shell32/res/icons/37.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/39.ico b/reactos/dll/win32/shell32/res/icons/39.ico index ff2110ca824..bdab55f5c1d 100644 Binary files a/reactos/dll/win32/shell32/res/icons/39.ico and b/reactos/dll/win32/shell32/res/icons/39.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/42.ico b/reactos/dll/win32/shell32/res/icons/42.ico index ccdec735163..57973fc4ae6 100644 Binary files a/reactos/dll/win32/shell32/res/icons/42.ico and b/reactos/dll/win32/shell32/res/icons/42.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/43.ico b/reactos/dll/win32/shell32/res/icons/43.ico index 31bb267ad42..4138aab61d0 100644 Binary files a/reactos/dll/win32/shell32/res/icons/43.ico and b/reactos/dll/win32/shell32/res/icons/43.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/46.ico b/reactos/dll/win32/shell32/res/icons/46.ico index bc5711c71a0..d55959c14f9 100644 Binary files a/reactos/dll/win32/shell32/res/icons/46.ico and b/reactos/dll/win32/shell32/res/icons/46.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/47.ico b/reactos/dll/win32/shell32/res/icons/47.ico index 10cea4e3f84..940dd9a47be 100644 Binary files a/reactos/dll/win32/shell32/res/icons/47.ico and b/reactos/dll/win32/shell32/res/icons/47.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/49.ico b/reactos/dll/win32/shell32/res/icons/49.ico new file mode 100644 index 00000000000..17d3f3ca2f1 Binary files /dev/null and b/reactos/dll/win32/shell32/res/icons/49.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/512.ico b/reactos/dll/win32/shell32/res/icons/512.ico index 8a1ea7c3696..883335f50dc 100644 Binary files a/reactos/dll/win32/shell32/res/icons/512.ico and b/reactos/dll/win32/shell32/res/icons/512.ico differ diff --git a/reactos/dll/win32/shell32/res/icons/6.ico b/reactos/dll/win32/shell32/res/icons/6.ico index 5b9f6a789b0..df70b0bf416 100644 Binary files a/reactos/dll/win32/shell32/res/icons/6.ico and b/reactos/dll/win32/shell32/res/icons/6.ico differ diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h index ddb9c0a73c8..a918e4c4d0e 100644 --- a/reactos/dll/win32/shell32/shresdef.h +++ b/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