ucrtbase: Support UTF8 codepage in wctomb.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ucrtbase: Support UTF8 codepage in wctomb.
5fcc3771 · Piotr Caban · Alexandre Julliard · 69b701a4 · 5fcc3771
Commit 5fcc3771 authored Oct 19, 2020 by Piotr Caban Committed by Alexandre Julliard Oct 19, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

wcs.c dlls/msvcrt/wcs.c +5 -2

No files found.
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1996,15 +1996,18 @@ INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch )
 INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar )
 {
    char out;
-    BOOL error;
+    BOOL error = FALSE;
+    BOOL *perror;
    UINT codepage = get_locinfo()->lc_codepage;

+    perror = (codepage != CP_UTF8 ? &error : NULL);
+
    if(!codepage) {
        if (wchar < 0xff)
            return (signed char)wchar;
        else
            return MSVCRT_EOF;
-    } else if(WideCharToMultiByte( codepage, 0, &wchar, 1, &out, 1, NULL, &error ) && !error)
+    } else if(WideCharToMultiByte( codepage, 0, &wchar, 1, &out, 1, NULL, perror ) && !error)
        return (INT)out;
    return MSVCRT_EOF;
 }