From: Eric Pouech <epouech(a)codeweavers.com> regedit is in GUI subsystem and shoudln't interact with console. Keeping unix I/O output in silent mode (forcing English locale for Unix integration). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/regedit/main.h | 2 +- programs/regedit/regedit.c | 93 ++++++++++++++++++-------------------- programs/regedit/regproc.c | 11 +++-- 3 files changed, 52 insertions(+), 54 deletions(-) diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 310469f83f6..d9998d743a2 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -154,7 +154,7 @@ BOOL IsDefaultValue(HWND hwndLV, int i); /* regedit.c */ void WINAPIV output_message(unsigned int id, ...); -void WINAPIV error_exit(unsigned int id, ...); +void WINAPIV error_exit(void); /* regproc.c */ char *GetMultiByteString(const WCHAR *strW); diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 03e0ec9c7cb..769b515f8bc 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -28,74 +28,65 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); -static void output_writeconsole(const WCHAR *str, DWORD wlen) +static BOOL silent; + +static void output_formatstring(BOOL with_help, UINT id, va_list va_args) { - DWORD count; + WCHAR buffer[4096]; + WCHAR fmt[1536]; + DWORD len; + + if (silent && with_help) return; - if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL)) + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { - DWORD len; - char *msgA; - - /* WriteConsole() fails on Windows if its output is redirected. If this occurs, - * we should call WriteFile() with OEM code page. - */ - len = WideCharToMultiByte(GetOEMCP(), 0, str, wlen, NULL, 0, NULL, NULL); - msgA = malloc(len); - if (!msgA) return; - - WideCharToMultiByte(GetOEMCP(), 0, str, wlen, msgA, len, NULL, NULL); - WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - free(msgA); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); + return; } -} -static void output_formatstring(const WCHAR *fmt, va_list va_args) -{ - WCHAR *str; - DWORD len; - - len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, - fmt, 0, 0, (WCHAR *)&str, 0, &va_args); + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, + fmt, 0, 0, buffer, ARRAY_SIZE(buffer), &va_args); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return; } - output_writeconsole(str, len); - LocalFree(str); + if (with_help && + !LoadStringW(GetModuleHandleW(NULL), STRING_HELP, + &buffer[wcslen(buffer)], ARRAY_SIZE(buffer) - wcslen(buffer))) + { + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); + return; + } + if (silent) + MESSAGE("%ls", buffer); + else + MessageBoxW(NULL, buffer, MAKEINTRESOURCEW(IDS_APP_TITLE), MB_OK | MB_ICONHAND); } void WINAPIV output_message(unsigned int id, ...) { - WCHAR fmt[1536]; va_list va_args; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) - { - WINE_FIXME("LoadString failed with %ld\n", GetLastError()); - return; - } va_start(va_args, id); - output_formatstring(fmt, va_args); + output_formatstring(FALSE, id, va_args); va_end(va_args); } -void WINAPIV error_exit(unsigned int id, ...) +void WINAPIV error_exit(void) +{ + exit(0); /* regedit.exe always terminates with error code zero */ +} + +static void WINAPIV usage(unsigned int id, ...) { - WCHAR fmt[1536]; va_list va_args; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) - { - WINE_FIXME("LoadString failed with %lu\n", GetLastError()); - return; - } va_start(va_args, id); - output_formatstring(fmt, va_args); + output_formatstring(TRUE, id, va_args); va_end(va_args); - exit(0); /* regedit.exe always terminates with error code zero */ + error_exit(); } typedef enum { @@ -159,8 +150,8 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) break; } default: - error_exit(STRING_UNHANDLED_ACTION); - break; + output_message(STRING_UNHANDLED_ACTION); + error_exit(); } } @@ -195,7 +186,8 @@ BOOL ProcessCmdLine(WCHAR *cmdline) switch (towupper(argv[i][1])) { case '?': - error_exit(STRING_USAGE); + output_message(STRING_USAGE); + error_exit(); break; case 'D': action = ACTION_DELETE; @@ -210,12 +202,14 @@ BOOL ProcessCmdLine(WCHAR *cmdline) /* unhandled */; break; case 'S': + SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)); + silent = TRUE; + break; case 'V': /* ignored */; break; default: - output_message(STRING_INVALID_SWITCH, argv[i]); - error_exit(STRING_HELP); + usage(STRING_INVALID_SWITCH, argv[i]); } } @@ -225,13 +219,12 @@ BOOL ProcessCmdLine(WCHAR *cmdline) { case ACTION_ADD: case ACTION_EXPORT: - output_message(STRING_NO_FILENAME); + usage(STRING_NO_FILENAME); break; case ACTION_DELETE: - output_message(STRING_NO_REG_KEY); + usage(STRING_NO_REG_KEY); break; } - error_exit(STRING_HELP); } for (; i < argc; i++) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 15a64fdf97d..0a580f0cd12 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1091,11 +1091,15 @@ void delete_registry_key(WCHAR *reg_key_name) if (!(key_class = parse_key_name(reg_key_name, &key_name))) { if (key_name) *(key_name - 1) = 0; - error_exit(STRING_INVALID_SYSTEM_KEY, reg_key_name); + output_message(STRING_INVALID_SYSTEM_KEY, reg_key_name); + error_exit(); } if (!key_name || !*key_name) - error_exit(STRING_DELETE_FAILED, reg_key_name); + { + output_message(STRING_DELETE_FAILED, reg_key_name); + error_exit(); + } RegDeleteTreeW(key_class, key_name); } @@ -1411,7 +1415,8 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) if (!file) { _wperror(L"regedit"); - error_exit(STRING_CANNOT_OPEN_FILE, file_name); + output_message(STRING_CANNOT_OPEN_FILE, file_name); + error_exit(); } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4440