Piotr Caban : msvcp110: Fix num_put<char> structure layout.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: ba34505057c20b8f9aff03954cf390c467b82da0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ba34505057c20b8f9aff03954c...

Author: Piotr Caban <piotr(a)codeweavers.com>
Date:   Tue May 10 15:24:12 2016 +0200

msvcp110: Fix num_put<char> structure layout.

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 77184106c8c2bff7db9ea5d20b3b3330196befc1)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/msvcp90/locale.c  | 37 ++++++++++++++++++++++++++++++++-----
 dlls/msvcp90/msvcp90.h |  2 ++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index f3ad140..6b8a035 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -7116,7 +7116,9 @@ DEFINE_THISCALL_WRAPPER(num_put_char__Init, 8)
 void __thiscall num_put_char__Init(num_put *this, const _Locinfo *locinfo)
 {
     TRACE("(%p %p)\n", this, locinfo);
+#if _MSVCP_VER < 110
     _Locinfo__Getcvt(locinfo, &this->cvt);
+#endif
 }
 
 /* ??0?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */
@@ -7861,7 +7863,9 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar__Init, 8)
 void __thiscall num_put_wchar__Init(num_put *this, const _Locinfo *locinfo)
 {
     TRACE("(%p %p)\n", this, locinfo);
+#if _MSVCP_VER < 110
     _Locinfo__Getcvt(locinfo, &this->cvt);
+#endif
 }
 
 /* ??0?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */
@@ -8096,6 +8100,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Put(const num_put *this, ostre
     return ret;
 }
 
+#if _MSVCP_VER < 110
 /* ?_Putc@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PBDI(a)Z */
 /* ?_Putc@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEBD_K(a)Z */
 /* ?_Putc@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@PBDI(a)Z */
@@ -8116,6 +8121,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Putc(const num_put *this, ostr
     *ret = dest;
     return ret;
 }
+#endif
 
 /* ?_Putgrouped@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PBDI_W(a)Z */
 /* ?_Putgrouped@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEBD_K_W(a)Z */
@@ -8200,6 +8206,27 @@ ostreambuf_iterator_wchar* __cdecl num_put_short__Fput(const num_put *this, ostr
     return NULL;
 }
 
+#if _MSVCP_VER < 110
+static void num_put_wchar_wide_put(const num_put *this,
+        ostreambuf_iterator_wchar *dest, ios_base *base,
+        const char *buf, MSVCP_size_t count)
+{
+    num_put_wchar__Putc(this, dest, *dest, buf, count);
+}
+#else
+static void num_put_wchar_wide_put(const num_put *this,
+        ostreambuf_iterator_wchar *dest, ios_base *base,
+                const char *buf, MSVCP_size_t count)
+{
+    ctype_wchar *ctype;
+    MSVCP_size_t i;
+
+    ctype = ctype_wchar_use_facet(IOS_LOCALE(base));
+    for(i=0; i<count; i++)
+        ostreambuf_iterator_wchar_put(dest, ctype_wchar_widen_ch(ctype, buf[i]));
+}
+#endif
+
 /* TODO: This function should be removed when num_put_wchar__Fput is implemented */
 static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_iterator_wchar *ret,
         ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, char *buf,
@@ -8250,7 +8277,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_
     base->wide = 0;
 
     if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) {
-        num_put_wchar__Putc(this, &dest, dest, buf, 1);
+        num_put_wchar_wide_put(this, &dest, base, buf, 1);
         buf++;
     }
     if(adjustfield != FMTFLAG_left) {
@@ -8264,7 +8291,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_
         else if(!buf[i])
             num_put_wchar__Rep(this, &dest, dest, sep, 1);
         else
-            num_put_wchar__Putc(this, &dest, dest, buf+i, 1);
+            num_put_wchar_wide_put(this, &dest, base, buf+i, 1);
     }
 
     return num_put_wchar__Rep(this, ret, dest, fill, pad);
@@ -8343,10 +8370,10 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_
     base->wide = 0;
 
     if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) {
-        num_put_wchar__Putc(this, &dest, dest, buf, 1);
+        num_put_wchar_wide_put(this, &dest, base, buf, 1);
         buf++;
     }else if((adjustfield & FMTFLAG_internal) && (buf[1]=='x' || buf[1]=='X')) {
-        num_put_wchar__Putc(this, &dest, dest, buf, 2);
+        num_put_wchar_wide_put(this, &dest, base, buf, 2);
         buf += 2;
     }
     if(adjustfield != FMTFLAG_left) {
@@ -8358,7 +8385,7 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_
         if(!buf[i])
             num_put_wchar__Rep(this, &dest, dest, sep, 1);
         else
-            num_put_wchar__Putc(this, &dest, dest, buf+i, 1);
+            num_put_wchar_wide_put(this, &dest, base, buf+i, 1);
     }
 
     return num_put_wchar__Rep(this, ret, dest, fill, pad);
diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h
index 2d0f4f8..545bce0 100644
--- a/dlls/msvcp90/msvcp90.h
+++ b/dlls/msvcp90/msvcp90.h
@@ -549,7 +549,9 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get*, ist
 /* class num_put<wchar> */
 typedef struct {
     locale_facet facet;
+#if _MSVCP_VER < 110
     _Cvtvec cvt;
+#endif
 } num_put;
 
 num_put* num_put_char_use_facet(const locale*);