From 3577f06f719e854513d1015f33aa78c506ad3f32 Mon Sep 17 00:00:00 2001 From: Piotr Caban <piotr@codeweavers.com> Date: Mon, 30 Sep 2019 15:22:15 +0200 Subject: [PATCH] msvcrt: Fix _putws implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47615 Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> --- dlls/msvcrt/file.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 18d69b72058..9075b432ff2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4840,19 +4840,14 @@ int CDECL MSVCRT_puts(const char *s) */ int CDECL MSVCRT__putws(const MSVCRT_wchar_t *s) { - static const MSVCRT_wchar_t nl = '\n'; - MSVCRT_size_t len = strlenW(s); int ret; MSVCRT__lock_file(MSVCRT_stdout); - if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { - MSVCRT__unlock_file(MSVCRT_stdout); - return MSVCRT_EOF; - } - - ret = MSVCRT__fwrite_nolock(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + ret = MSVCRT_fputws(s, MSVCRT_stdout); + if(ret >= 0) + ret = MSVCRT__fputwc_nolock('\n', MSVCRT_stdout); MSVCRT__unlock_file(MSVCRT_stdout); - return ret; + return ret >= 0 ? 0 : MSVCRT_WEOF; } /********************************************************************* -- 2.24.1