reg: Exit with an error message if RegQueryInfoKeyW fails
Hugh McMaster
hugh.mcmaster at outlook.com
Wed Apr 6 07:56:13 CDT 2016
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/reg/reg.c | 2 +-
programs/reg/reg.h | 1 +
programs/reg/reg.rc | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index f3d94fe..83d6e45 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -497,8 +497,8 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
&maxValue, NULL, NULL, NULL);
if (rc != ERROR_SUCCESS)
{
- /* FIXME: failure */
RegCloseKey(subkey);
+ output_message(STRING_GENERAL_FAILURE);
return 1;
}
maxValue++;
diff --git a/programs/reg/reg.h b/programs/reg/reg.h
index d84dbd9..dd1e43e 100644
--- a/programs/reg/reg.h
+++ b/programs/reg/reg.h
@@ -45,3 +45,4 @@
#define STRING_DELETE_SUBKEY 122
#define STRING_INVALID_STRING 123
#define STRING_VALUEALL_FAILED 124
+#define STRING_GENERAL_FAILURE 125
diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc
index 297ed48..b4888ea 100644
--- a/programs/reg/reg.rc
+++ b/programs/reg/reg.rc
@@ -50,4 +50,5 @@ STRINGTABLE
STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?"
STRING_INVALID_STRING, "reg: The option [/d] must be followed by a valid string\n"
STRING_VALUEALL_FAILED, "reg: Unable to delete all registry values in '%1'. An unexpected error occurred.\n"
+ STRING_GENERAL_FAILURE, "reg: Unable to complete the specified operation. An unexpected error occurred.\n"
}
--
1.9.1
More information about the wine-patches
mailing list