msvcrt: Fix C locale handling in mbstowcs.

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

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

Showing with 11 additions and 0 deletions

mbcs.c dlls/msvcrt/mbcs.c +11 -0

No files found.
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -2253,6 +2253,17 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr,
    else
        locinfo = locale->locinfo;

+    if(!locinfo->lc_codepage) {
+        if(!wcstr)
+            return strlen(mbstr);
+
+        for(i=0; i<count; i++) {
+            wcstr[i] = (unsigned char)mbstr[i];
+            if(!wcstr[i]) break;
+        }
+        return i;
+    }
+
    /* Ignore count parameter */
    if(!wcstr)
        return MultiByteToWideChar(locinfo->lc_codepage, 0, mbstr, -1, NULL, 0)-1;