[PATCH 4/8] regedit: Update some resource strings associated with key parsing

[Hugh McMaster]

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/regedit/regedit.rc |  6 +++---
 programs/regedit/regproc.c  | 12 +++++++++---
 programs/regedit/resource.h |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc
index b12e79eb9a..8635ab751a 100644
--- a/programs/regedit/regedit.rc
+++ b/programs/regedit/regedit.rc
@@ -421,11 +421,11 @@ STRINGTABLE
     STRING_UNRECOGNIZED_LINE, "regedit: The line '%1' was not recognized.\n"
     STRING_SETVALUE_FAILED, "regedit: Unable to add the registry value '%1' to '%2'.\n"
     STRING_OPEN_KEY_FAILED, "regedit: Unable to open the registry key '%1'.\n"
-    STRING_UNSUPPORTED_TYPE, "regedit: Unsupported registry data type [%1] encountered in '%2'.\n"
+    STRING_UNSUPPORTED_TYPE, "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n"
     STRING_EXPORT_AS_BINARY, "regedit: The registry value '%1' will be exported as binary data.\n"
-    STRING_INCORRECT_REG_CLASS, "regedit: Incorrect registry class specification in '%1'.\n"
+    STRING_INVALID_SYSTEM_KEY, "regedit: Invalid system key [%1]\n"
     STRING_REG_KEY_NOT_FOUND, "regedit: Unable to export '%1'. The specified registry key was not found.\n"
-    STRING_DELETE_REG_CLASS_FAILED, "regedit: Unable to delete the registry class '%1'.\n"
+    STRING_DELETE_FAILED, "regedit: Unable to delete the registry key '%1'.\n"
     STRING_UNKNOWN_TYPE, "Unknown Type"
     STRING_INVALID_LINE_SYNTAX, "regedit: The line contains invalid syntax.\n"
 }
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 9ebe2fa9eb..4c52a19dd9 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -1478,7 +1478,10 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format)
 
         /* open the specified key */
         if (!(reg_key_class = parse_key_name(reg_key_name, &branch_name)))
-            error_exit(STRING_INCORRECT_REG_CLASS, reg_key_name);
+        {
+            if (branch_name) *(branch_name - 1) = 0;
+            error_exit(STRING_INVALID_SYSTEM_KEY, reg_key_name);
+        }
 
         if (!branch_name || !*branch_name) {
             /* no branch - registry class is specified */
@@ -1590,10 +1593,13 @@ void delete_registry_key(WCHAR *reg_key_name)
         return;
 
     if (!(key_class = parse_key_name(reg_key_name, &key_name)))
-        error_exit(STRING_INCORRECT_REG_CLASS, reg_key_name);
+    {
+        if (key_name) *(key_name - 1) = 0;
+        error_exit(STRING_INVALID_SYSTEM_KEY, reg_key_name);
+    }
 
     if (!*key_name)
-        error_exit(STRING_DELETE_REG_CLASS_FAILED, reg_key_name);
+        error_exit(STRING_DELETE_FAILED, reg_key_name);
 
     RegDeleteTreeW(key_class, key_name);
 }
diff --git a/programs/regedit/resource.h b/programs/regedit/resource.h
index 02f936095f..2bcdd39ad4 100644
--- a/programs/regedit/resource.h
+++ b/programs/regedit/resource.h
@@ -196,8 +196,8 @@
 #define STRING_OPEN_KEY_FAILED          3017
 #define STRING_UNSUPPORTED_TYPE         3018
 #define STRING_EXPORT_AS_BINARY         3019
-#define STRING_INCORRECT_REG_CLASS      3020
+#define STRING_INVALID_SYSTEM_KEY       3020
 #define STRING_REG_KEY_NOT_FOUND        3021
-#define STRING_DELETE_REG_CLASS_FAILED  3022
+#define STRING_DELETE_FAILED            3022
 #define STRING_UNKNOWN_TYPE             3023
 #define STRING_INVALID_LINE_SYNTAX      3024
-- 
2.11.0