msvcrt: Fix C locale handling in wcstombs.

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

msvcrt: Fix C locale handling in wcstombs.
c4ab42d8 · Piotr Caban · Alexandre Julliard · f091d9ed · c4ab42d8
Commit c4ab42d8 authored Jun 14, 2016 by Piotr Caban Committed by Alexandre Julliard Jun 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 0 deletions

wcs.c dlls/msvcrt/wcs.c +18 -0

No files found.
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -477,6 +477,24 @@ static MSVCRT_size_t MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t **wcst
    else
        locinfo = locale->locinfo;

+    if(!locinfo->lc_codepage) {
+        MSVCRT_size_t i;
+
+        if(!mbstr)
+            return strlenW(*wcstr);
+
+        for(i=0; i<count; i++) {
+            if((*wcstr)[i] > 255) {
+                *MSVCRT__errno() = MSVCRT_EILSEQ;
+                return -1;
+            }
+
+            mbstr[i] = (*wcstr)[i];
+            if(!(*wcstr)[i]) break;
+        }
+        return i;
+    }
+
    if(!mbstr) {
        tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS,
                *wcstr, -1, NULL, 0, NULL, &used_default)-1;