msvcrt: Fix mbtowc_l in C locale.

23b8c4df · Akihiro Sagawa · Alexandre Julliard · 27a93bfc · 23b8c4df
Commit 23b8c4df authored Mar 27, 2013 by Akihiro Sagawa Committed by Alexandre Julliard Mar 27, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

mbcs.c dlls/msvcrt/mbcs.c +3 -1

No files found.
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -2016,7 +2016,9 @@ int CDECL MSVCRT_mbtowc_l(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n,

    if(n <= 0 || !str)
        return 0;
-    if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1))
+    if(!locinfo->lc_codepage)
+        tmpdst = (unsigned char)*str;
+    else if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1))
        return -1;
    if(dst)
        *dst = tmpdst;