msvcrt: Fix _putws implementation.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47615Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Fix _putws implementation.
3577f06f · Piotr Caban · Alexandre Julliard · 5a67b266 · 3577f06f
Commit 3577f06f authored Sep 30, 2019 by Piotr Caban Committed by Alexandre Julliard Sep 30, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 9 deletions

file.c dlls/msvcrt/file.c +4 -9

No files found.
--- 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;
 }

 /*********************************************************************