[PATCH 5/6] reg: Ask the user if they want to delete the subkey, value, default value or all values
Hugh McMaster
hugh.mcmaster at outlook.com
Wed Feb 10 05:23:18 CST 2016
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/reg/reg.c | 15 ++++++++++++++-
programs/reg/reg.h | 3 +++
programs/reg/reg.rc | 3 +++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index f38de60..32b0d17 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -411,7 +411,20 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
if (!force)
{
- /* FIXME: Prompt for delete */
+ BOOL ret;
+
+ if (value_name || value_empty)
+ ret = ask_confirm(STRING_DELETE_VALUE, value_name);
+ else if (value_all)
+ ret = ask_confirm(STRING_DELETE_VALUEALL, key_name);
+ else
+ ret = ask_confirm(STRING_DELETE_SUBKEY, key_name);
+
+ if (!ret)
+ {
+ output_message(STRING_CANCELLED);
+ return 0;
+ }
}
/* Delete subtree only if no /v* option is given */
diff --git a/programs/reg/reg.h b/programs/reg/reg.h
index 837ef0c..592fec6 100644
--- a/programs/reg/reg.h
+++ b/programs/reg/reg.h
@@ -40,3 +40,6 @@
#define STRING_NO 117
#define STRING_CANCELLED 118
#define STRING_DEFAULT_VALUE 119
+#define STRING_DELETE_VALUE 120
+#define STRING_DELETE_VALUEALL 121
+#define STRING_DELETE_SUBKEY 122
diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc
index c9cb58c..3175a95 100644
--- a/programs/reg/reg.rc
+++ b/programs/reg/reg.rc
@@ -45,4 +45,7 @@ STRINGTABLE
STRING_NO, "#msgctxt#No key#N"
STRING_CANCELLED, "The registry operation was cancelled\n"
STRING_DEFAULT_VALUE, "#msgctxt#Name of default registry value#(Default)"
+ STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?"
+ STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?"
+ STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?"
}
--
1.9.1
More information about the wine-patches
mailing list