From: Eric Pouech epouech@codeweavers.com
Regular GUI programs don't use console nor std I/O.
Signed-off-by: Eric Pouech epouech@codeweavers.com --- programs/winecfg/appdefaults.c | 28 +++++++++++++++++++++++----- programs/winecfg/audio.c | 1 - programs/winecfg/drive.c | 1 - programs/winecfg/driveui.c | 2 -- programs/winecfg/libraries.c | 1 - programs/winecfg/main.c | 14 +++++++------- programs/winecfg/theme.c | 1 - programs/winecfg/winecfg.c | 1 - programs/winecfg/x11drvdlg.c | 1 - 9 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 4900c1e14fd..0e61183e684 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -25,7 +25,6 @@ #include <windows.h> #include <commdlg.h> #include <wine/debug.h> -#include <stdio.h> #include <stdlib.h> #include <assert.h> #include "winecfg.h" @@ -510,29 +509,48 @@ BOOL set_winver_from_string(const WCHAR *version) return FALSE; }
+static char *dupWtoA(const WCHAR *wstr) +{ + DWORD len = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); + char *str = malloc(len); + if (str) + WideCharToMultiByte(CP_ACP, 0, wstr, -1, str, len, NULL, NULL); + return str; +} + void print_windows_versions(void) { int i;
for (i = 0; i < ARRAY_SIZE(win_versions); i++) { - wprintf(L" %10s %s\n", win_versions[i].szVersion, win_versions[i].szDescription); + char *vers = dupWtoA(win_versions[i].szVersion); + char *desc = dupWtoA(win_versions[i].szDescription); + + if (vers && desc) + MESSAGE(" %10s %s\n", vers, desc); + free(vers); + free(desc); } }
void print_current_winver(void) { WCHAR *winver = get_reg_key(config_key, keypath(L""), L"Version", L""); + const WCHAR *strW; + char *str;
if (!winver || !winver[0]) { int ver = get_registry_version(); - wprintf(L"%s\n", ver == -1 ? DEFAULT_WIN_VERSION : win_versions[ver].szVersion); + strW = (ver == -1) ? DEFAULT_WIN_VERSION : win_versions[ver].szVersion; } else - wprintf(L"%s\n", winver); - + strW = winver; + if ((str = dupWtoA(strW))) + MESSAGE("%s\n", str); free(winver); + free(str); }
static void on_winver_change(HWND dialog) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index a5065ee5c21..b98efbc2ec6 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -23,7 +23,6 @@
#include <assert.h> #include <stdlib.h> -#include <stdio.h> #include <string.h>
#define COBJMACROS diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index f002482f510..b113b71b199 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -23,7 +23,6 @@
#include <assert.h> #include <stdarg.h> -#include <stdio.h> #include <string.h>
#include <ntstatus.h> diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index e21c99a6697..611c467b082 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -21,8 +21,6 @@ * */
-#include <stdio.h> - #define WIN32_LEAN_AND_MEAN #define COBJMACROS
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 43cfe81a104..09fd397ab63 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -23,7 +23,6 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> -#include <stdio.h> #include <assert.h> #include <stdlib.h>
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index d218d79770c..de460673913 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -197,13 +197,13 @@ ProcessCmdLine(LPWSTR lpCmdLine)
if (lpCmdLine[1] == '?') { - printf("Usage: winecfg [options]\n\n"); - printf("Options:\n"); - printf(" [no option] Launch the graphical version of this program.\n"); - printf(" /v Display the current global Windows version.\n"); - printf(" /v version Set global Windows version to 'version'.\n"); - printf(" /? Display this information and exit.\n\n"); - printf("Valid versions for 'version':\n\n"); + MESSAGE("Usage: winecfg [options]\n\n"); + MESSAGE("Options:\n"); + MESSAGE(" [no option] Launch the graphical version of this program.\n"); + MESSAGE(" /v Display the current global Windows version.\n"); + MESSAGE(" /v version Set global Windows version to 'version'.\n"); + MESSAGE(" /? Display this information and exit.\n\n"); + MESSAGE("Valid versions for 'version':\n\n"); print_windows_versions();
return 0; diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index d52c127db0b..cc1a3c66820 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -25,7 +25,6 @@ #include <assert.h> #include <stdarg.h> #include <stdlib.h> -#include <stdio.h>
#define COBJMACROS
diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index c5c78c12b96..0433db0a728 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -30,7 +30,6 @@ #define WIN32_LEAN_AND_MEAN
#include <assert.h> -#include <stdio.h> #include <limits.h> #include <windows.h> #include <winreg.h> diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 215cd6534a2..aea52717a78 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -25,7 +25,6 @@
#include <stdarg.h> #include <stdlib.h> -#include <stdio.h>
#include <windows.h> #include <wine/debug.h>