Hugh McMaster : reg: Display the default value name when ask_confirm() is passed "" for reg_info.
Module: wine Branch: master Commit: 8220a32e0ab33b4ee145f29ae294c7fa1affde86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8220a32e0ab33b4ee145f29ae2... Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 2 21:31:19 2016 +1100 reg: Display the default value name when ask_confirm() is passed "" for reg_info. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6ae4aa1..6f3db63 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -151,6 +151,7 @@ static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) WCHAR Nbuffer[4]; WCHAR defval[32]; WCHAR answer[MAX_PATH]; + WCHAR *str; DWORD count; hmod = GetModuleHandleW(NULL); @@ -158,9 +159,11 @@ static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) LoadStringW(hmod, STRING_NO, Nbuffer, ARRAY_SIZE(Nbuffer)); LoadStringW(hmod, STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); + str = (reg_info && strlenW(reg_info)) ? reg_info : defval; + while (1) { - output_message(msgid, reg_info ? reg_info : defval); + output_message(msgid, str); output_message(STRING_YESNO); ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count, NULL); answer[0] = toupperW(answer[0]);
participants (1)
-
Alexandre Julliard