[PATCH 4/6] reg: Add support for the default registry value in ask_confirm()

Hugh McMaster hugh.mcmaster at outlook.com
Wed Feb 10 05:23:17 CST 2016


Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/reg/reg.c  | 4 +++-
 programs/reg/reg.h  | 1 +
 programs/reg/reg.rc | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/programs/reg/reg.c b/programs/reg/reg.c
index 8578959..f38de60 100644
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -148,16 +148,18 @@ static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info)
     HMODULE hmod;
     WCHAR Ybuffer[4];
     WCHAR Nbuffer[4];
+    WCHAR defval[32];
     WCHAR answer[MAX_PATH];
     DWORD count;
 
     hmod = GetModuleHandleW(NULL);
     LoadStringW(hmod, STRING_YES, Ybuffer, ARRAY_SIZE(Ybuffer));
     LoadStringW(hmod, STRING_NO,  Nbuffer, ARRAY_SIZE(Nbuffer));
+    LoadStringW(hmod, STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval));
 
     while (1)
     {
-        output_message(msgid, reg_info);
+        output_message(msgid, reg_info ? reg_info : defval);
         output_message(STRING_YESNO);
         ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count, NULL);
         answer[0] = toupperW(answer[0]);
diff --git a/programs/reg/reg.h b/programs/reg/reg.h
index 0617979..837ef0c 100644
--- a/programs/reg/reg.h
+++ b/programs/reg/reg.h
@@ -39,3 +39,4 @@
 #define STRING_YES              116
 #define STRING_NO               117
 #define STRING_CANCELLED        118
+#define STRING_DEFAULT_VALUE    119
diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc
index dfad9e2..c9cb58c 100644
--- a/programs/reg/reg.rc
+++ b/programs/reg/reg.rc
@@ -44,4 +44,5 @@ STRINGTABLE
     STRING_YES, "#msgctxt#Yes key#Y"
     STRING_NO, "#msgctxt#No key#N"
     STRING_CANCELLED, "The registry operation was cancelled\n"
+    STRING_DEFAULT_VALUE, "#msgctxt#Name of default registry value#(Default)"
 }
-- 
1.9.1




More information about the wine-patches mailing list