- Update some icons (shell32)

- Add defines for icons (shell32)
- Add icon for .reg files (regedit)
- Some fixes for hivecls_arm.inf and hivecls_i386.inf

svn path=/trunk/; revision=38949

diff --git a/reactos/base/applications/regedit/regedit.rc b/reactos/base/applications/regedit/regedit.rc
index 64165dc..6eac2ee 100644 (file)
--- a/reactos/base/applications/regedit/regedit.rc
+++ b/reactos/base/applications/regedit/regedit.rc
@@ -37,3 +37,4 @@ IDI_ROOT      ICON    DISCARDABLE     res/computer.ico
 IDI_STRING     ICON    DISCARDABLE     res/string.ico
 IDI_BIN                ICON    DISCARDABLE     res/bin.ico
 IDI_REGEDIT    ICON    DISCARDABLE     res/regedit.ico
+IDI_REGFILE ICON    DISCARDABLE res/regfile.ico

diff --git a/reactos/base/applications/regedit/res/regfile.ico b/reactos/base/applications/regedit/res/regfile.ico
new file mode 100644 (file)
index 0000000..490c574
Binary files /dev/null and b/reactos/base/applications/regedit/res/regfile.ico differ

diff --git a/reactos/base/applications/regedit/resource.h b/reactos/base/applications/regedit/resource.h
index e348455..86676db 100644 (file)
--- a/reactos/base/applications/regedit/resource.h
+++ b/reactos/base/applications/regedit/resource.h
@@ -31,6 +31,7 @@
 #define IDS_LIST_COLUMN_LAST            93
 #define IDS_APP_TITLE                   103
 #define IDI_REGEDIT                     100
+#define IDI_REGFILE                     101
 #define IDI_SMALL                       108
 #define IDC_REGEDIT                     109
 #define IDC_REGEDIT_FRAME               110

diff --git a/reactos/boot/bootdata/hivecls_arm.inf b/reactos/boot/bootdata/hivecls_arm.inf
index ac63580..70b1c30 100644 (file)
--- a/reactos/boot/bootdata/hivecls_arm.inf
+++ b/reactos/boot/bootdata/hivecls_arm.inf
@@ -41,7 +41,7 @@ HKCR,"rtffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\wordpad.e
 HKCR,".386","",0x00000000,"vxdfile"
 HKCR,".vxd","",0x00000000,"vxdfile"
 HKCR,"vxdfile","",0x00000000,"Virtual Device Driver"
-HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-157"
+HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-156"
 
 ; Animated Cursors
 HKCR,".ani","",0x00000000,"anifile"
@@ -94,6 +94,7 @@ HKCR,"dllfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154
 HKCR,".drv","",0x00000000,"drvfile"
 HKCR,"drvfile","",0x00000000,"Device Driver"
 HKCR,"drvfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-164"
+HKCR,"drvfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154"
 
 ; Applicatons
 HKCR,".exe","",0x00000000,"exefile"

diff --git a/reactos/boot/bootdata/hivecls_i386.inf b/reactos/boot/bootdata/hivecls_i386.inf
index bd2cc79..94ea5d6 100644 (file)
--- a/reactos/boot/bootdata/hivecls_i386.inf
+++ b/reactos/boot/bootdata/hivecls_i386.inf
@@ -41,7 +41,7 @@ HKCR,"rtffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\wordpad.e
 HKCR,".386","",0x00000000,"vxdfile"
 HKCR,".vxd","",0x00000000,"vxdfile"
 HKCR,"vxdfile","",0x00000000,"Virtual Device Driver"
-HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-157"
+HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-156"
 
 ; Animated Cursors
 HKCR,".ani","",0x00000000,"anifile"
@@ -94,6 +94,7 @@ HKCR,"dllfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154
 HKCR,".drv","",0x00000000,"drvfile"
 HKCR,"drvfile","",0x00000000,"Device Driver"
 HKCR,"drvfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-164"
+HKCR,"drvfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154"
 
 ; Applicatons
 HKCR,".exe","",0x00000000,"exefile"

diff --git a/reactos/dll/win32/shell32/res/icons/151.ico b/reactos/dll/win32/shell32/res/icons/151.ico
index aa1cd3f..5d68e40 100644 (file)
Binary files a/reactos/dll/win32/shell32/res/icons/151.ico and b/reactos/dll/win32/shell32/res/icons/151.ico differ

diff --git a/reactos/dll/win32/shell32/res/icons/152.ico b/reactos/dll/win32/shell32/res/icons/152.ico
index d1ce72b..82ac3f4 100644 (file)
Binary files a/reactos/dll/win32/shell32/res/icons/152.ico and b/reactos/dll/win32/shell32/res/icons/152.ico differ

diff --git a/reactos/dll/win32/shell32/res/icons/154.ico b/reactos/dll/win32/shell32/res/icons/154.ico
index ebaeaa0..9ac408d 100644 (file)
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/2.ico b/reactos/dll/win32/shell32/res/icons/2.ico
index 7d95519..55a02a0 100644 (file)
Binary files a/reactos/dll/win32/shell32/res/icons/2.ico and b/reactos/dll/win32/shell32/res/icons/2.ico differ

diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h
index 66ae980..46061e8 100644 (file)
--- a/reactos/dll/win32/shell32/shresdef.h
+++ b/reactos/dll/win32/shell32/shresdef.h
@@ -207,6 +207,7 @@
 #define IDS_PICK_ICON_FILTER              0x4125
 
 #define IDI_SHELL_DOCUMENT           1
+#define IDI_SHELL_RICH_TEXT          2
 #define IDI_SHELL_FOLDER             4
 #define IDI_SHELL_FOLDER_OPEN        5
 #define IDI_SHELL_5_12_FLOPPY        6
@@ -237,7 +238,15 @@
 #define IDI_SHELL_FONTS_FOLDER      39
 #define IDI_SHELL_OPEN_WITH        135
 #define IDI_SHELL_TRASH_FILE       142
+#define IDI_SHELL_INF_FILE         151
+#define IDI_SHELL_TEXT_FILE        152
+#define IDI_SHELL_BAT_FILE         153
+#define IDI_SHELL_SYSTEM_FILE      154
+#define IDI_SHELL_FONT_FILE        155
+#define IDI_SHELL_TT_FONT_FILE     156
+#define IDI_SHELL_RUN2             160
 #define IDI_SHELL_CONFIRM_DELETE   161
+#define IDI_SHELL_MUSIC_FILE       225
 #define IDI_SHELL_MY_DOCUMENTS     235
 #define IDI_SHELL_CONTROL_PANEL1   330
 #define IDI_SHELL_ADMINTOOLS       328