ucrtbase: Support UTF8 codepage in _wcstombs_l.

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

ucrtbase: Support UTF8 codepage in _wcstombs_l.
6180c2fc · Piotr Caban · Alexandre Julliard · ab2a0d7f · 6180c2fc
Commit 6180c2fc authored Oct 19, 2020 by Piotr Caban Committed by Alexandre Julliard Oct 19, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

wcs.c dlls/msvcrt/wcs.c +6 -3

No files found.
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -545,7 +545,8 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst
 {
    MSVCRT_pthreadlocinfo locinfo;
    MSVCRT_size_t tmp = 0;
-    BOOL used_default;
+    BOOL used_default = FALSE;
+    BOOL *pused_default;

    if(!locale)
        locinfo = get_locinfo();
@@ -570,9 +571,11 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst
        return i;
    }

+    pused_default = (locinfo->lc_codepage != CP_UTF8 ? &used_default : NULL);
+
    if(!mbstr) {
        tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS,
-                *wcstr, -1, NULL, 0, NULL, &used_default);
+                *wcstr, -1, NULL, 0, NULL, pused_default);
        if(!tmp || used_default) {
            *MSVCRT__errno() = MSVCRT_EILSEQ;
            return -1;
@@ -585,7 +588,7 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst
        MSVCRT_size_t i, size;

        size = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS,
-                *wcstr, 1, buf, 3, NULL, &used_default);
+                *wcstr, 1, buf, 3, NULL, pused_default);
        if(!size || used_default) {
            *MSVCRT__errno() = MSVCRT_EILSEQ;
            return -1;