Support for adding Expandable string and multi string values

svn path=/trunk/; revision=19471

diff --git a/reactos/subsys/system/regedit/En.rc b/reactos/subsys/system/regedit/En.rc
index 3d5d3da..be3b1de 100644 (file)
--- a/reactos/subsys/system/regedit/En.rc
+++ b/reactos/subsys/system/regedit/En.rc
@@ -38,13 +38,16 @@ END
 
 IDR_REGEDIT_MENU MENU DISCARDABLE
 BEGIN
-    POPUP "&Registry"
+    POPUP "&File"
     BEGIN
-        MENUITEM "&Import Registry File...",    ID_REGISTRY_IMPORTREGISTRYFILE
+        MENUITEM "&Import ...",    ID_REGISTRY_IMPORTREGISTRYFILE
 
-        MENUITEM "&Export Registry File...",    ID_REGISTRY_EXPORTREGISTRYFILE
+        MENUITEM "&Export...",    ID_REGISTRY_EXPORTREGISTRYFILE
 
         MENUITEM SEPARATOR
+               MENUITEM "Load Hive...",                                ID_REGISTRY_LOADHIVE, GRAYED
+               MENUITEM "Unload Hive...",                              ID_REGISTRY_UNLOADHIVE, GRAYED
+               MENUITEM SEPARATOR
         MENUITEM "&Connect Network Registry...",
                                                 ID_REGISTRY_CONNECTNETWORKREGISTRY
 
@@ -67,6 +70,8 @@ BEGIN
             MENUITEM "&String Value",               ID_EDIT_NEW_STRINGVALUE
             MENUITEM "&Binary Value",               ID_EDIT_NEW_BINARYVALUE
             MENUITEM "&DWORD Value",                ID_EDIT_NEW_DWORDVALUE
+                       MENUITEM "&Multi-String Value",                 ID_EDIT_NEW_MULTISTRINGVALUE
+                       MENUITEM "&Expandable String Value",    ID_EDIT_NEW_EXPANDABLESTRINGVALUE
         END
         MENUITEM SEPARATOR
         MENUITEM "&Permissions...",            ID_EDIT_PERMISSIONS

diff --git a/reactos/subsys/system/regedit/framewnd.c b/reactos/subsys/system/regedit/framewnd.c
index 983d598..fe6e9a4 100644 (file)
--- a/reactos/subsys/system/regedit/framewnd.c
+++ b/reactos/subsys/system/regedit/framewnd.c
@@ -921,6 +921,13 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     case ID_EDIT_NEW_DWORDVALUE:
         CreateNewValue(hKeyRoot, keyPath, REG_DWORD);
         break;
+       case ID_EDIT_NEW_MULTISTRINGVALUE:
+        CreateNewValue(hKeyRoot, keyPath, REG_MULTI_SZ);
+        break;
+       case ID_EDIT_NEW_EXPANDABLESTRINGVALUE:
+        CreateNewValue(hKeyRoot, keyPath, REG_EXPAND_SZ);
+        break;
+
     }
     case ID_EDIT_COPYKEYNAME:
         CopyKeyName(hWnd, hKeyRoot, keyPath);

diff --git a/reactos/subsys/system/regedit/resource.h b/reactos/subsys/system/regedit/resource.h
index 02a5ab9..b9755a3 100644 (file)
--- a/reactos/subsys/system/regedit/resource.h
+++ b/reactos/subsys/system/regedit/resource.h
@@ -60,6 +60,7 @@
 #define ID_EDIT_NEW_STRINGVALUE         32786
 #define ID_EDIT_NEW_BINARYVALUE         32787
 #define ID_EDIT_NEW_DWORDVALUE          32788
+
 #define ID_REGISTRY_IMPORTREGISTRYFILE  32789
 #define ID_REGISTRY_EXPORTREGISTRYFILE  32790
 #define ID_REGISTRY_CONNECTNETWORKREGISTRY 32791
@@ -126,6 +127,10 @@
 #define IDS_ERR_DELETEVALUE            32855
 #define IDS_ERR_RENVAL_CAPTION         32856
 #define IDS_ERR_RENVAL_TOEMPTY         32857
+
+#define ID_EDIT_NEW_MULTISTRINGVALUE           32860
+#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE      32861
+
 #define ID_SWITCH_PANELS                32871
 #define ID_EDIT_PERMISSIONS            32872
 #define ID_TREE_DELETE                  32873