msvcp90: Fix errors related to name demangling.

dlls/msvcp90/ios.c

@@ -344,9 +344,9 @@ MSVCP_bool* CDECL ios_base_Sync_func(void)
 
 /* ?_Tidy@ios_base@std@@AAAXXZ */
 /* ?_Tidy@ios_base@std@@AEAAXXZ */
-void CDECL ios_base_Tidy(ios_base *this)
+void CDECL ios_base_Tidy(void)
 {
-    FIXME("(%p) stub\n", this);
+    FIXME("stub\n");
 }
 
 /* ?bad@ios_base@std@@QBE_NXZ */
@@ -454,10 +454,9 @@ IOSB_fmtflags __thiscall ios_base_flags_get(const ios_base *this)
 
 /* ?getloc@ios_base@std@@QBE?AVlocale@2@XZ */
 /* ?getloc@ios_base@std@@QEBA?AVlocale@2@XZ */
-DEFINE_THISCALL_WRAPPER(ios_base_getloc, 4)
-locale __thiscall ios_base_getloc(const ios_base *this)
+DEFINE_THISCALL_WRAPPER(ios_base_getloc, 8)
+locale* __thiscall ios_base_getloc(const ios_base *this, locale *ret)
 {
-    locale ret = { NULL };
     FIXME("(%p) stub\n", this);
     return ret;
 }
@@ -473,10 +472,9 @@ MSVCP_bool __thiscall ios_base_good(const ios_base *this)
 
 /* ?imbue@ios_base@std@@QAE?AVlocale@2@ABV32@@Z */
 /* ?imbue@ios_base@std@@QEAA?AVlocale@2@AEBV32@@Z */
-DEFINE_THISCALL_WRAPPER(ios_base_imbue, 8)
-locale __thiscall ios_base_imbue(ios_base *this, const locale *loc)
+DEFINE_THISCALL_WRAPPER(ios_base_imbue, 12)
+locale* __thiscall ios_base_imbue(ios_base *this, locale *ret, const locale *loc)
 {
-    locale ret = { NULL };
     FIXME("(%p %p) stub\n", this, loc);
     return ret;
 }
@@ -706,11 +704,10 @@ char __thiscall basic_ios_char_fill_get(basic_ios_char *this)
 
 /* ?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QAE?AVlocale@2@ABV32@@Z */
 /* ?imbue@?$basic_ios@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z */
-DEFINE_THISCALL_WRAPPER(basic_ios_char_imbue, 4)
-locale __thiscall basic_ios_char_imbue(basic_ios_char *this)
+DEFINE_THISCALL_WRAPPER(basic_ios_char_imbue, 12)
+locale *__thiscall basic_ios_char_imbue(basic_ios_char *this, locale *ret, const locale *loc)
 {
-    locale ret = { NULL };
-    FIXME("(%p) stub\n", this);
+    FIXME("(%p %p %p) stub\n", this, ret, loc);
     return ret;
 }
 
@@ -1194,10 +1191,9 @@ void __thiscall basic_streambuf_char_gbump(basic_streambuf_char *this, int off)
 
 /* ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QBE?AVlocale@2@XZ */
 /* ?getloc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEBA?AVlocale@2@XZ */
-DEFINE_THISCALL_WRAPPER(basic_streambuf_char_getloc, 4)
-locale __thiscall basic_streambuf_char_getloc(const basic_streambuf_char *this)
+DEFINE_THISCALL_WRAPPER(basic_streambuf_char_getloc, 8)
+locale* __thiscall basic_streambuf_char_getloc(const basic_streambuf_char *this, locale *ret)
 {
-    locale ret = { 0 }; /* FIXME */
     FIXME("(%p) stub\n", this);
     return ret;
 }
@@ -1274,10 +1270,9 @@ char* __thiscall basic_streambuf_char_pptr(const basic_streambuf_char *this)
 
 /* ?pubimbue@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAE?AVlocale@2@ABV32@@Z */
 /* ?pubimbue@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA?AVlocale@2@AEBV32@@Z */
-DEFINE_THISCALL_WRAPPER(basic_streambuf_char_pubimbue, 8)
-locale __thiscall basic_streambuf_char_pubimbue(basic_streambuf_char *this, const locale *loc)
+DEFINE_THISCALL_WRAPPER(basic_streambuf_char_pubimbue, 12)
+locale* __thiscall basic_streambuf_char_pubimbue(basic_streambuf_char *this, locale *ret, const locale *loc)
 {
-    locale ret = { 0 }; /* FIXME */
     FIXME("(%p %p) stub\n", this, loc);
     return ret;
 }

dlls/msvcp90/math.c

@@ -412,8 +412,8 @@ const BOOLEAN std_Num_float_base_traps = TRUE;
 /* ??4_Num_float_base@std@@QEAAAEAU01@AEBU01@@Z -> public: struct std::_Num_float_base & __ptr64 __cdecl std::_Num_float_base::operator=(struct std::_Num_float_base const & __ptr64) __ptr64 */
 /* ??4_Num_int_base@std@@QAEAAU01@ABU01@@Z -> public: struct std::_Num_int_base & __thiscall std::_Num_int_base::operator=(struct std::_Num_int_base const &) */
 /* ??4_Num_int_base@std@@QEAAAEAU01@AEBU01@@Z -> public: struct std::_Num_int_base & __ptr64 __cdecl std::_Num_int_base::operator=(struct std::_Num_int_base const & __ptr64) __ptr64 */
-DEFINE_THISCALL_WRAPPER( std_Num_base_op_assign, 4 )
-std_Num_base * __thiscall std_Num_base_op_assign( std_Num_base *this )
+DEFINE_THISCALL_WRAPPER( std_Num_base_op_assign, 8 )
+std_Num_base * __thiscall std_Num_base_op_assign( std_Num_base *this, std_Num_base *right )
 {
     return this;
 }
@@ -808,8 +808,8 @@ WCHAR __cdecl std_numeric_limits_wchar_t_signaling_NaN(void) { return 0; }
 /* ??4?$_Ctraits@N@std@@QEAAAEAV01@AEBV01@@Z -> public: class std::_Ctraits<double> & __ptr64 __cdecl std::_Ctraits<double>::operator=(class std::_Ctraits<double> const & __ptr64) __ptr64 */
 /* ??4?$_Ctraits@O@std@@QAEAAV01@ABV01@@Z -> public: class std::_Ctraits<long double> & __thiscall std::_Ctraits<long double>::operator=(class std::_Ctraits<long double> const &) */
 /* ??4?$_Ctraits@O@std@@QEAAAEAV01@AEBV01@@Z -> public: class std::_Ctraits<long double> & __ptr64 __cdecl std::_Ctraits<long double>::operator=(class std::_Ctraits<long double> const & __ptr64) __ptr64 */
-DEFINE_THISCALL_WRAPPER( std_Ctraits_op_assign, 4 )
-std_Ctraits * __thiscall std_Ctraits_op_assign( std_Ctraits *this )
+DEFINE_THISCALL_WRAPPER( std_Ctraits_op_assign, 8 )
+std_Ctraits * __thiscall std_Ctraits_op_assign( std_Ctraits *this, std_Ctraits *right )
 {
     return this;
 }

dlls/msvcp90/string.c

@@ -2476,10 +2476,9 @@ MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, Str
 /* ?get_allocator@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBA?AV?$allocator@_W@2@XZ */
 /* ?get_allocator@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE?AV?$allocator@G@2@XZ */
 /* ?get_allocator@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA?AV?$allocator@G@2@XZ */
-DEFINE_THISCALL_WRAPPER(basic_string_wchar_get_allocator, 4)
-allocator __thiscall basic_string_wchar_get_allocator(const basic_string_wchar *this)
+DEFINE_THISCALL_WRAPPER(basic_string_wchar_get_allocator, 8)
+allocator* __thiscall basic_string_wchar_get_allocator(const basic_string_wchar *this, allocator *ret)
 {
-    allocator ret = {0};
     TRACE("%p\n", this);
     return ret;
 }