msvcp140: Introduce _Mbstatet structure.

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

msvcp140: Introduce _Mbstatet structure.
3b620834 · Piotr Caban · Alexandre Julliard · bbab63cf · 3b620834 · 3b620834
Commit 3b620834 authored Sep 27, 2016 by Piotr Caban Committed by Alexandre Julliard Sep 27, 2016
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 6 deletions

ios.c dlls/msvcp90/ios.c +0 -0

locale.c dlls/msvcp90/locale.c +0 -0

msvcp90.h dlls/msvcp90/msvcp90.h +17 -6

No files found.
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
--- a/dlls/msvcp90/msvcp90.h
+++ b/dlls/msvcp90/msvcp90.h
@@ -187,6 +187,17 @@ typedef struct {
 #endif
 } _Ctypevec;

+#if _MSVCP_VER >= 140
+typedef struct {
+    int wchar;
+    unsigned short byte, state;
+} _Mbstatet;
+#define MBSTATET_TO_INT(state) ((state)->wchar)
+#else
+typedef int _Mbstatet;
+#define MBSTATET_TO_INT(state) (*(state))
+#endif
+
 /* class codecvt_base */
 typedef struct {
    locale_facet facet;
@@ -198,10 +209,10 @@ typedef struct {
 } codecvt_char;

 MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*);
-int __thiscall codecvt_char_unshift(const codecvt_char*, int*, char*, char*, char**);
-int __thiscall codecvt_char_out(const codecvt_char*, int*, const char*,
+int __thiscall codecvt_char_unshift(const codecvt_char*, _Mbstatet*, char*, char*, char**);
+int __thiscall codecvt_char_out(const codecvt_char*, _Mbstatet*, const char*,
        const char*, const char**, char*, char*, char**);
-int __thiscall codecvt_char_in(const codecvt_char*, int*, const char*,
+int __thiscall codecvt_char_in(const codecvt_char*, _Mbstatet*, const char*,
        const char*, const char**, char*, char*, char**);
 int __thiscall codecvt_base_max_length(const codecvt_base*);

@@ -223,10 +234,10 @@ typedef struct {
    _Cvtvec cvt;
 } codecvt_wchar;

-int __thiscall codecvt_wchar_unshift(const codecvt_wchar*, int*, char*, char*, char**);
-int __thiscall codecvt_wchar_out(const codecvt_wchar*, int*, const wchar_t*,
+int __thiscall codecvt_wchar_unshift(const codecvt_wchar*, _Mbstatet*, char*, char*, char**);
+int __thiscall codecvt_wchar_out(const codecvt_wchar*, _Mbstatet*, const wchar_t*,
        const wchar_t*, const wchar_t**, char*, char*, char**);
-int __thiscall codecvt_wchar_in(const codecvt_wchar*, int*, const char*,
+int __thiscall codecvt_wchar_in(const codecvt_wchar*, _Mbstatet*, const char*,
        const char*, const char**, wchar_t*, wchar_t*, wchar_t**);

 /* class ctype_base */