msvcrt: Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l for default…

msvcrt: Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l for default buffer lengthSet MB_LEN_MAX to 5 to match MSVCRT_MB_LEN_MAX.

msvcrt: Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l for default…
8bf17329 · Orion Poplawski · Alexandre Julliard · f0fc2ba2 · 8bf17329 · 8bf17329
Commit 8bf17329 authored Feb 02, 2015 by Orion Poplawski Committed by Alexandre Julliard Feb 03, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

msvcrt.h dlls/msvcrt/msvcrt.h +1 -1

wcs.c dlls/msvcrt/wcs.c +1 -1

limits.h include/msvcrt/limits.h +1 -1

No files found.
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -47,7 +47,7 @@
 #define MSVCRT_I64_MAX    (((__int64)0x7fffffff << 32) | 0xffffffff)
 #define MSVCRT_I64_MIN    (-MSVCRT_I64_MAX-1)
 #define MSVCRT_UI64_MAX   (((unsigned __int64)0xffffffff << 32) | 0xffffffff)
-#define MSVCRT_MB_LEN_MAX 2
+#define MSVCRT_MB_LEN_MAX 5
 #ifdef _WIN64
 #define MSVCRT_SIZE_MAX MSVCRT_UI64_MAX
 #else

--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -1474,7 +1474,7 @@ int CDECL MSVCRT__wctomb_l(char *dst, MSVCRT_wchar_t ch, MSVCRT__locale_t locale
 {
    int len;
-    MSVCRT__wctomb_s_l(&len, dst, dst ? 6 : 0, ch, locale);
+    MSVCRT__wctomb_s_l(&len, dst, dst ? MSVCRT_MB_LEN_MAX : 0, ch, locale);
    return len;
 }

--- a/include/msvcrt/limits.h
+++ b/include/msvcrt/limits.h
@@ -4,7 +4,7 @@
 #include <crtdefs.h>
 #define CHAR_BIT 8
-#define MB_LEN_MAX 2
+#define MB_LEN_MAX 5
 #define SCHAR_MIN (-0x80)
 #define SCHAR_MAX   0x7f