[PATCH 6/6] reg: Better indicate when a registry value is not found

Hugh McMaster hugh.mcmaster at outlook.com
Thu Apr 1 07:20:52 CDT 2021


Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/reg/delete.c   | 2 +-
 programs/reg/query.c    | 2 +-
 programs/reg/reg.rc     | 2 +-
 programs/reg/resource.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/programs/reg/delete.c b/programs/reg/delete.c
index c80b622bccb..519d4b880ec 100644
--- a/programs/reg/delete.c
+++ b/programs/reg/delete.c
@@ -96,7 +96,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
         if (RegDeleteValueW(key, value_empty ? NULL : value_name) != ERROR_SUCCESS)
         {
             RegCloseKey(key);
-            output_message(STRING_CANNOT_FIND);
+            output_message(STRING_VALUE_NONEXIST);
             return 1;
         }
     }
diff --git a/programs/reg/query.c b/programs/reg/query.c
index a82101a0a29..656ac875ec4 100644
--- a/programs/reg/query.c
+++ b/programs/reg/query.c
@@ -174,7 +174,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse)
         {
             if (value_name && *value_name)
             {
-                output_message(STRING_CANNOT_FIND);
+                output_message(STRING_VALUE_NONEXIST);
                 return 1;
             }
             output_string(fmt, path);
diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc
index 87ea1e2323d..abfed18b93b 100644
--- a/programs/reg/reg.rc
+++ b/programs/reg/reg.rc
@@ -116,7 +116,7 @@ STRINGTABLE
     STRING_INVALID_KEY, "reg: Invalid registry key\n"
     STRING_INVALID_CMDLINE, "reg: Invalid command line parameters\n"
     STRING_NO_REMOTE, "reg: Unable to access remote machine\n"
-    STRING_CANNOT_FIND, "reg: The system was unable to find the specified registry key or value\n"
+    STRING_VALUE_NONEXIST, "reg: Unable to find the specified registry value\n"
     STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n"
     STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n"
     STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n"
diff --git a/programs/reg/resource.h b/programs/reg/resource.h
index 188b2d13cf4..8b0d9de7653 100644
--- a/programs/reg/resource.h
+++ b/programs/reg/resource.h
@@ -29,7 +29,7 @@
 #define STRING_INVALID_KEY            106
 #define STRING_INVALID_CMDLINE        107
 #define STRING_NO_REMOTE              108
-#define STRING_CANNOT_FIND            109
+#define STRING_VALUE_NONEXIST         109
 #define STRING_UNSUPPORTED_TYPE       110
 #define STRING_MISSING_INTEGER        111
 #define STRING_MISSING_HEXDATA        112
-- 
2.31.0




More information about the wine-devel mailing list