diff --git a/dlls/msvcp100/cxx.h b/dlls/msvcp100/cxx.h index cc3915cdfa5..f709d12f318 100644 --- a/dlls/msvcp100/cxx.h +++ b/dlls/msvcp100/cxx.h @@ -48,7 +48,6 @@ "\t.quad " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ - "\t.quad " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ funcs "\n\t.text") #else @@ -61,7 +60,6 @@ "\t.long " __ASM_NAME(#name "_rtti") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ - "\t.long " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ funcs "\n\t.text") #endif /* _WIN64 */ diff --git a/dlls/msvcp100/exception.c b/dlls/msvcp100/exception.c index 12c52a3d5c0..89fec61810d 100644 --- a/dlls/msvcp100/exception.c +++ b/dlls/msvcp100/exception.c @@ -381,14 +381,6 @@ length_error* __thiscall MSVCP_length_error_copy_ctor( return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_length_error_vector_dtor, 8) -void* __thiscall MSVCP_length_error_vector_dtor( - length_error *this, unsigned int flags) -{ - TRACE("%p %x\n", this, flags); - return MSVCP_logic_error_vector_dtor(this, flags); -} - DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error@std@@"); static const cxx_type_info length_error_cxx_type_info = { @@ -438,14 +430,6 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor( return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_vector_dtor, 8) -void* __thiscall MSVCP_out_of_range_vector_dtor( - out_of_range *this, unsigned int flags) -{ - TRACE("%p %x\n", this, flags); - return MSVCP_logic_error_vector_dtor(this, flags); -} - DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range@std@@"); static const cxx_type_info out_of_range_cxx_type_info = { @@ -495,14 +479,6 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_vector_dtor, 8) -void* __thiscall MSVCP_invalid_argument_vector_dtor( - invalid_argument *this, unsigned int flags) -{ - TRACE("%p %x\n", this, flags); - return MSVCP_logic_error_vector_dtor(this, flags); -} - DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument@std@@"); static const cxx_type_info invalid_argument_cxx_type_info = { @@ -694,15 +670,32 @@ static const cxx_exception_type failure_cxx_type = { #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_VTABLE(type_info, ""); - __ASM_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_what_exception)); - __ASM_VTABLE(bad_alloc, VTABLE_ADD_FUNC(MSVCP_what_exception)); - __ASM_VTABLE(logic_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); - __ASM_VTABLE(length_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); - __ASM_VTABLE(out_of_range, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); - __ASM_VTABLE(invalid_argument, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); - __ASM_VTABLE(runtime_error, VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); - __ASM_VTABLE(failure, VTABLE_ADD_FUNC(MSVCP_failure_what)); + __ASM_VTABLE(type_info, + VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor)); + __ASM_VTABLE(exception, + VTABLE_ADD_FUNC(MSVCP_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_what_exception)); + __ASM_VTABLE(bad_alloc, + VTABLE_ADD_FUNC(MSVCP_bad_alloc_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_what_exception)); + __ASM_VTABLE(logic_error, + VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_logic_error_what)); + __ASM_VTABLE(length_error, + VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_logic_error_what)); + __ASM_VTABLE(out_of_range, + VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_logic_error_what)); + __ASM_VTABLE(invalid_argument, + VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_logic_error_what)); + __ASM_VTABLE(runtime_error, + VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); + __ASM_VTABLE(failure, + VTABLE_ADD_FUNC(MSVCP_failure_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_failure_what)); #ifndef __GNUC__ } #endif diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 544523168a4..1bc8ee22cac 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -614,12 +614,18 @@ DEFINE_RTTI_DATA1(strstreambuf, sizeof(strstreambuf), #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_VTABLE(iosb, ""); - __ASM_VTABLE(ios_base, ""); - __ASM_VTABLE(basic_ios_char, ""); - __ASM_VTABLE(basic_ios_wchar, ""); - __ASM_VTABLE(basic_ios_short, ""); + __ASM_VTABLE(iosb, + VTABLE_ADD_FUNC(iosb_vector_dtor)); + __ASM_VTABLE(ios_base, + VTABLE_ADD_FUNC(ios_base_vector_dtor)); + __ASM_VTABLE(basic_ios_char, + VTABLE_ADD_FUNC(basic_ios_char_vector_dtor)); + __ASM_VTABLE(basic_ios_wchar, + VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor)); + __ASM_VTABLE(basic_ios_short, + VTABLE_ADD_FUNC(basic_ios_wchar_vector_dtor)); __ASM_VTABLE(basic_streambuf_char, + VTABLE_ADD_FUNC(basic_streambuf_char_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_char__Lock) VTABLE_ADD_FUNC(basic_streambuf_char__Unlock) VTABLE_ADD_FUNC(basic_streambuf_char_overflow) @@ -635,6 +641,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_sync) VTABLE_ADD_FUNC(basic_streambuf_char_imbue)); __ASM_VTABLE(basic_streambuf_wchar, + VTABLE_ADD_FUNC(basic_streambuf_wchar_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_wchar__Lock) VTABLE_ADD_FUNC(basic_streambuf_wchar__Unlock) VTABLE_ADD_FUNC(basic_streambuf_wchar_overflow) @@ -650,6 +657,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_wchar_sync) VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue)); __ASM_VTABLE(basic_streambuf_short, + VTABLE_ADD_FUNC(basic_streambuf_wchar_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_wchar__Lock) VTABLE_ADD_FUNC(basic_streambuf_wchar__Unlock) VTABLE_ADD_FUNC(basic_streambuf_wchar_overflow) @@ -665,6 +673,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_wchar_sync) VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue)); __ASM_VTABLE(basic_filebuf_char, + VTABLE_ADD_FUNC(basic_filebuf_char_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_char__Lock) VTABLE_ADD_FUNC(basic_streambuf_char__Unlock) VTABLE_ADD_FUNC(basic_filebuf_char_overflow) @@ -680,6 +689,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_filebuf_char_sync) VTABLE_ADD_FUNC(basic_filebuf_char_imbue)); __ASM_VTABLE(basic_filebuf_wchar, + VTABLE_ADD_FUNC(basic_filebuf_wchar_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_wchar__Lock) VTABLE_ADD_FUNC(basic_streambuf_wchar__Unlock) VTABLE_ADD_FUNC(basic_filebuf_wchar_overflow) @@ -695,6 +705,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_filebuf_wchar_sync) VTABLE_ADD_FUNC(basic_filebuf_wchar_imbue)); __ASM_VTABLE(basic_filebuf_short, + VTABLE_ADD_FUNC(basic_filebuf_wchar_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_wchar__Lock) VTABLE_ADD_FUNC(basic_streambuf_wchar__Unlock) VTABLE_ADD_FUNC(basic_filebuf_wchar_overflow) @@ -710,6 +721,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_filebuf_wchar_sync) VTABLE_ADD_FUNC(basic_filebuf_short_imbue)); __ASM_VTABLE(basic_stringbuf_char, + VTABLE_ADD_FUNC(basic_stringbuf_char_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_char__Lock) VTABLE_ADD_FUNC(basic_streambuf_char__Unlock) VTABLE_ADD_FUNC(basic_stringbuf_char_overflow) @@ -725,6 +737,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_sync) VTABLE_ADD_FUNC(basic_streambuf_char_imbue)); __ASM_VTABLE(basic_stringbuf_wchar, + VTABLE_ADD_FUNC(basic_stringbuf_wchar_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_wchar__Lock) VTABLE_ADD_FUNC(basic_streambuf_wchar__Unlock) VTABLE_ADD_FUNC(basic_stringbuf_wchar_overflow) @@ -740,6 +753,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_wchar_sync) VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue)); __ASM_VTABLE(basic_stringbuf_short, + VTABLE_ADD_FUNC(basic_stringbuf_wchar_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_wchar__Lock) VTABLE_ADD_FUNC(basic_streambuf_wchar__Unlock) VTABLE_ADD_FUNC(basic_stringbuf_wchar_overflow) @@ -754,34 +768,62 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_wchar_setbuf) VTABLE_ADD_FUNC(basic_streambuf_wchar_sync) VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue)); - __ASM_VTABLE(basic_ostream_char, ""); - __ASM_VTABLE(basic_ostream_wchar, ""); - __ASM_VTABLE(basic_ostream_short, ""); - __ASM_VTABLE(basic_istream_char, ""); - __ASM_VTABLE(basic_istream_wchar, ""); - __ASM_VTABLE(basic_istream_short, ""); - __ASM_VTABLE(basic_iostream_char, ""); - __ASM_VTABLE(basic_iostream_wchar, ""); - __ASM_VTABLE(basic_iostream_short, ""); - __ASM_VTABLE(basic_ofstream_char, ""); - __ASM_VTABLE(basic_ofstream_wchar, ""); - __ASM_VTABLE(basic_ofstream_short, ""); - __ASM_VTABLE(basic_ifstream_char, ""); - __ASM_VTABLE(basic_ifstream_wchar, ""); - __ASM_VTABLE(basic_ifstream_short, ""); - __ASM_VTABLE(basic_fstream_char, ""); - __ASM_VTABLE(basic_fstream_wchar, ""); - __ASM_VTABLE(basic_fstream_short, ""); - __ASM_VTABLE(basic_ostringstream_char, ""); - __ASM_VTABLE(basic_ostringstream_wchar, ""); - __ASM_VTABLE(basic_ostringstream_short, ""); - __ASM_VTABLE(basic_istringstream_char, ""); - __ASM_VTABLE(basic_istringstream_wchar, ""); - __ASM_VTABLE(basic_istringstream_short, ""); - __ASM_VTABLE(basic_stringstream_char, ""); - __ASM_VTABLE(basic_stringstream_wchar, ""); - __ASM_VTABLE(basic_stringstream_short, ""); + __ASM_VTABLE(basic_ostream_char, + VTABLE_ADD_FUNC(basic_ostream_char_vector_dtor)); + __ASM_VTABLE(basic_ostream_wchar, + VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor)); + __ASM_VTABLE(basic_ostream_short, + VTABLE_ADD_FUNC(basic_ostream_wchar_vector_dtor)); + __ASM_VTABLE(basic_istream_char, + VTABLE_ADD_FUNC(basic_istream_char_vector_dtor)); + __ASM_VTABLE(basic_istream_wchar, + VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor)); + __ASM_VTABLE(basic_istream_short, + VTABLE_ADD_FUNC(basic_istream_wchar_vector_dtor)); + __ASM_VTABLE(basic_iostream_char, + VTABLE_ADD_FUNC(basic_iostream_char_vector_dtor)); + __ASM_VTABLE(basic_iostream_wchar, + VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor)); + __ASM_VTABLE(basic_iostream_short, + VTABLE_ADD_FUNC(basic_iostream_wchar_vector_dtor)); + __ASM_VTABLE(basic_ofstream_char, + VTABLE_ADD_FUNC(basic_ofstream_char_vector_dtor)); + __ASM_VTABLE(basic_ofstream_wchar, + VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_ofstream_short, + VTABLE_ADD_FUNC(basic_ofstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_ifstream_char, + VTABLE_ADD_FUNC(basic_ifstream_char_vector_dtor)); + __ASM_VTABLE(basic_ifstream_wchar, + VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_ifstream_short, + VTABLE_ADD_FUNC(basic_ifstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_fstream_char, + VTABLE_ADD_FUNC(basic_fstream_char_vector_dtor)); + __ASM_VTABLE(basic_fstream_wchar, + VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_fstream_short, + VTABLE_ADD_FUNC(basic_fstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_ostringstream_char, + VTABLE_ADD_FUNC(basic_ostringstream_char_vector_dtor)); + __ASM_VTABLE(basic_ostringstream_wchar, + VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_ostringstream_short, + VTABLE_ADD_FUNC(basic_ostringstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_istringstream_char, + VTABLE_ADD_FUNC(basic_istringstream_char_vector_dtor)); + __ASM_VTABLE(basic_istringstream_wchar, + VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_istringstream_short, + VTABLE_ADD_FUNC(basic_istringstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_stringstream_char, + VTABLE_ADD_FUNC(basic_stringstream_char_vector_dtor)); + __ASM_VTABLE(basic_stringstream_wchar, + VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor)); + __ASM_VTABLE(basic_stringstream_short, + VTABLE_ADD_FUNC(basic_stringstream_wchar_vector_dtor)); __ASM_VTABLE(strstreambuf, + VTABLE_ADD_FUNC(strstreambuf_vector_dtor) VTABLE_ADD_FUNC(basic_streambuf_char__Lock) VTABLE_ADD_FUNC(basic_streambuf_char__Unlock) VTABLE_ADD_FUNC(strstreambuf_overflow) @@ -889,8 +931,8 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this) MSVCRT_operator_delete(this->loc); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_streambuf_char_vector_dtor, 8) -basic_streambuf_char* __thiscall MSVCP_basic_streambuf_char_vector_dtor(basic_streambuf_char *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_streambuf_char_vector_dtor, 8) +basic_streambuf_char* __thiscall basic_streambuf_char_vector_dtor(basic_streambuf_char *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -1609,8 +1651,8 @@ void __thiscall basic_streambuf_wchar_dtor(basic_streambuf_wchar *this) MSVCRT_operator_delete(this->loc); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_streambuf_wchar_vector_dtor, 8) -basic_streambuf_wchar* __thiscall MSVCP_basic_streambuf_wchar_vector_dtor(basic_streambuf_wchar *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_vector_dtor, 8) +basic_streambuf_wchar* __thiscall basic_streambuf_wchar_vector_dtor(basic_streambuf_wchar *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -1629,13 +1671,6 @@ basic_streambuf_wchar* __thiscall MSVCP_basic_streambuf_wchar_vector_dtor(basic_ return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_streambuf_short_vector_dtor, 8) -basic_streambuf_wchar* __thiscall MSVCP_basic_streambuf_short_vector_dtor(basic_streambuf_wchar *this, unsigned int flags) -{ - TRACE("(%p %x)\n", this, flags); - return MSVCP_basic_streambuf_wchar_vector_dtor(this, flags); -} - /* ?_Gnavail@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IBEHXZ */ /* ?_Gnavail@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IEBA_JXZ */ /* ?_Gnavail@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IBEHXZ */ @@ -2456,8 +2491,8 @@ void __thiscall basic_filebuf_char_dtor(basic_filebuf_char *this) basic_streambuf_char_dtor(&this->base); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_filebuf_char_vector_dtor, 8) -basic_filebuf_char* __thiscall MSVCP_basic_filebuf_char_vector_dtor(basic_filebuf_char *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_filebuf_char_vector_dtor, 8) +basic_filebuf_char* __thiscall basic_filebuf_char_vector_dtor(basic_filebuf_char *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -3063,8 +3098,8 @@ void __thiscall basic_filebuf_wchar_dtor(basic_filebuf_wchar *this) basic_streambuf_wchar_dtor(&this->base); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_filebuf_wchar_vector_dtor, 8) -basic_filebuf_wchar* __thiscall MSVCP_basic_filebuf_wchar_vector_dtor(basic_filebuf_wchar *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_vector_dtor, 8) +basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wchar *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -3083,12 +3118,6 @@ basic_filebuf_wchar* __thiscall MSVCP_basic_filebuf_wchar_vector_dtor(basic_file return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_filebuf_short_vector_dtor, 8) -basic_filebuf_wchar* __thiscall MSVCP_basic_filebuf_short_vector_dtor(basic_filebuf_wchar *this, unsigned int flags) -{ - return MSVCP_basic_filebuf_wchar_vector_dtor(this, flags); -} - /* ?is_open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QBE_NXZ */ /* ?is_open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEBA_NXZ */ /* ?is_open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QBE_NXZ */ @@ -3638,8 +3667,8 @@ void __thiscall basic_stringbuf_char_dtor(basic_stringbuf_char *this) basic_streambuf_char_dtor(&this->base); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_stringbuf_char_vector_dtor, 8) -basic_stringbuf_char* __thiscall MSVCP_basic_stringbuf_char_vector_dtor(basic_stringbuf_char *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_stringbuf_char_vector_dtor, 8) +basic_stringbuf_char* __thiscall basic_stringbuf_char_vector_dtor(basic_stringbuf_char *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); @@ -4040,8 +4069,8 @@ void __thiscall basic_stringbuf_wchar_dtor(basic_stringbuf_wchar *this) basic_streambuf_wchar_dtor(&this->base); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_stringbuf_wchar_vector_dtor, 8) -basic_stringbuf_wchar* __thiscall MSVCP_basic_stringbuf_wchar_vector_dtor(basic_stringbuf_wchar *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_stringbuf_wchar_vector_dtor, 8) +basic_stringbuf_wchar* __thiscall basic_stringbuf_wchar_vector_dtor(basic_stringbuf_wchar *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); @@ -4063,12 +4092,6 @@ basic_stringbuf_wchar* __thiscall MSVCP_basic_stringbuf_wchar_vector_dtor(basic_ return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_stringbuf_short_vector_dtor, 8) -basic_stringbuf_wchar* __thiscall MSVCP_basic_stringbuf_short_vector_dtor(basic_stringbuf_wchar *this, unsigned int flags) -{ - return MSVCP_basic_stringbuf_wchar_vector_dtor(this, flags); -} - /* ?overflow@?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@MAEGG@Z */ /* ?overflow@?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@MEAAGG@Z */ /* ?overflow@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@MAEGG@Z */ @@ -4378,8 +4401,8 @@ void __thiscall ios_base_dtor(ios_base *this) ios_base_Ios_base_dtor(this); } -DEFINE_THISCALL_WRAPPER(MSVCP_ios_base_vector_dtor, 8) -ios_base* __thiscall MSVCP_ios_base_vector_dtor(ios_base *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(ios_base_vector_dtor, 8) +ios_base* __thiscall ios_base_vector_dtor(ios_base *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -4398,8 +4421,8 @@ ios_base* __thiscall MSVCP_ios_base_vector_dtor(ios_base *this, unsigned int fla return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_iosb_vector_dtor, 8) -void* __thiscall MSVCP_iosb_vector_dtor(void *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(iosb_vector_dtor, 8) +void* __thiscall iosb_vector_dtor(void *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -4921,8 +4944,8 @@ void __thiscall basic_ios_char_dtor(basic_ios_char *this) ios_base_dtor(&this->base); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ios_char_vector_dtor, 8) -basic_ios_char* __thiscall MSVCP_basic_ios_char_vector_dtor(basic_ios_char *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ios_char_vector_dtor, 8) +basic_ios_char* __thiscall basic_ios_char_vector_dtor(basic_ios_char *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -5168,8 +5191,8 @@ void __thiscall basic_ios_wchar_dtor(basic_ios_wchar *this) ios_base_dtor(&this->base); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ios_wchar_vector_dtor, 8) -basic_ios_wchar* __thiscall MSVCP_basic_ios_wchar_vector_dtor(basic_ios_wchar *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ios_wchar_vector_dtor, 8) +basic_ios_wchar* __thiscall basic_ios_wchar_vector_dtor(basic_ios_wchar *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -5188,12 +5211,6 @@ basic_ios_wchar* __thiscall MSVCP_basic_ios_wchar_vector_dtor(basic_ios_wchar *t return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ios_short_vector_dtor, 8) -basic_ios_wchar* __thiscall MSVCP_basic_ios_short_vector_dtor(basic_ios_wchar *this, unsigned int flags) -{ - return MSVCP_basic_ios_wchar_vector_dtor(this, flags); -} - /* ?clear@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QAEXH_N@Z */ /* ?clear@?$basic_ios@_WU?$char_traits@_W@std@@@std@@QEAAXH_N@Z */ /* ?clear@?$basic_ios@GU?$char_traits@G@std@@@std@@QAEXH_N@Z */ @@ -5459,8 +5476,8 @@ void __thiscall basic_ostream_char_vbase_dtor(basic_ostream_char *this) basic_ios_char_dtor(basic_ostream_char_get_basic_ios(this)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ostream_char_vector_dtor, 8) -basic_ostream_char* __thiscall MSVCP_basic_ostream_char_vector_dtor(basic_ios_char *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ostream_char_vector_dtor, 8) +basic_ostream_char* __thiscall basic_ostream_char_vector_dtor(basic_ios_char *base, unsigned int flags) { basic_ostream_char *this = basic_ostream_char_from_basic_ios(base); @@ -6247,8 +6264,8 @@ void __thiscall basic_ostream_wchar_vbase_dtor(basic_ostream_wchar *this) basic_ios_wchar_dtor(basic_ostream_wchar_get_basic_ios(this)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ostream_wchar_vector_dtor, 8) -basic_ostream_wchar* __thiscall MSVCP_basic_ostream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ostream_wchar_vector_dtor, 8) +basic_ostream_wchar* __thiscall basic_ostream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) { basic_ostream_wchar *this = basic_ostream_wchar_from_basic_ios(base); @@ -6270,12 +6287,6 @@ basic_ostream_wchar* __thiscall MSVCP_basic_ostream_wchar_vector_dtor(basic_ios_ return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ostream_short_vector_dtor, 8) -basic_ostream_wchar* __thiscall MSVCP_basic_ostream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) -{ - return MSVCP_basic_ostream_wchar_vector_dtor(base, flags); -} - /* ?flush@?$basic_ostream@_WU?$char_traits@_W@std@@@std@@QAEAAV12@XZ */ /* ?flush@?$basic_ostream@_WU?$char_traits@_W@std@@@std@@QEAAAEAV12@XZ */ /* ?flush@?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEAAV12@XZ */ @@ -7192,8 +7203,8 @@ void __thiscall basic_istream_char_vbase_dtor(basic_istream_char *this) basic_ios_char_dtor(basic_istream_char_get_basic_ios(this)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_istream_char_vector_dtor, 8) -basic_istream_char* __thiscall MSVCP_basic_istream_char_vector_dtor(basic_ios_char *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_istream_char_vector_dtor, 8) +basic_istream_char* __thiscall basic_istream_char_vector_dtor(basic_ios_char *base, unsigned int flags) { basic_istream_char *this = basic_istream_char_from_basic_ios(base); @@ -8394,8 +8405,8 @@ void __thiscall basic_istream_wchar_vbase_dtor(basic_istream_wchar *this) basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(this)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_istream_wchar_vector_dtor, 8) -basic_istream_wchar* __thiscall MSVCP_basic_istream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_istream_wchar_vector_dtor, 8) +basic_istream_wchar* __thiscall basic_istream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) { basic_istream_wchar *this = basic_istream_wchar_from_basic_ios(base); @@ -8417,12 +8428,6 @@ basic_istream_wchar* __thiscall MSVCP_basic_istream_wchar_vector_dtor(basic_ios_ return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_istream_short_vector_dtor, 8) -basic_istream_wchar* __thiscall MSVCP_basic_istream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) -{ - return MSVCP_basic_istream_wchar_vector_dtor(base, flags); -} - /* ?_Ipfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAE_N_N@Z */ /* ?_Ipfx@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QEAA_N_N@Z */ /* ?_Ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QAE_N_N@Z */ @@ -9780,8 +9785,8 @@ void __thiscall basic_iostream_char_vbase_dtor(basic_iostream_char *this) basic_ios_char_dtor(basic_istream_char_get_basic_ios(&this->base1)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_iostream_char_vector_dtor, 8) -basic_iostream_char* __thiscall MSVCP_basic_iostream_char_vector_dtor(basic_ios_char *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_iostream_char_vector_dtor, 8) +basic_iostream_char* __thiscall basic_iostream_char_vector_dtor(basic_ios_char *base, unsigned int flags) { basic_iostream_char *this = basic_iostream_char_from_basic_ios(base); @@ -9876,8 +9881,8 @@ void __thiscall basic_iostream_wchar_vbase_dtor(basic_iostream_wchar *this) basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base1)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_iostream_wchar_vector_dtor, 8) -basic_iostream_wchar* __thiscall MSVCP_basic_iostream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_iostream_wchar_vector_dtor, 8) +basic_iostream_wchar* __thiscall basic_iostream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) { basic_iostream_wchar *this = basic_iostream_wchar_from_basic_ios(base); @@ -9899,12 +9904,6 @@ basic_iostream_wchar* __thiscall MSVCP_basic_iostream_wchar_vector_dtor(basic_io return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_iostream_short_vector_dtor, 8) -basic_iostream_wchar* __thiscall MSVCP_basic_iostream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) -{ - return MSVCP_basic_iostream_wchar_vector_dtor(base, flags); -} - static inline basic_ios_char* basic_ofstream_char_to_basic_ios(basic_ofstream_char *ptr) { return (basic_ios_char*)((char*)ptr+basic_ofstream_char_vbtable[1]); @@ -10022,8 +10021,8 @@ void __thiscall basic_ofstream_char_vbase_dtor(basic_ofstream_char *this) basic_ios_char_dtor(basic_ostream_char_get_basic_ios(&this->base)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ofstream_char_vector_dtor, 8) -basic_ofstream_char* __thiscall MSVCP_basic_ofstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ofstream_char_vector_dtor, 8) +basic_ofstream_char* __thiscall basic_ofstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) { basic_ofstream_char *this = basic_ofstream_char_from_basic_ios(base); @@ -10292,8 +10291,8 @@ void __thiscall basic_ofstream_wchar_vbase_dtor(basic_ofstream_wchar *this) basic_ios_wchar_dtor(basic_ostream_wchar_get_basic_ios(&this->base)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ofstream_wchar_vector_dtor, 8) -basic_ofstream_wchar* __thiscall MSVCP_basic_ofstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ofstream_wchar_vector_dtor, 8) +basic_ofstream_wchar* __thiscall basic_ofstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) { basic_ofstream_wchar *this = basic_ofstream_wchar_from_basic_ios(base); @@ -10315,12 +10314,6 @@ basic_ofstream_wchar* __thiscall MSVCP_basic_ofstream_wchar_vector_dtor(basic_io return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ofstream_short_vector_dtor, 8) -basic_ofstream_wchar* __thiscall MSVCP_basic_ofstream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) -{ - return MSVCP_basic_ofstream_wchar_vector_dtor(base, flags); -} - /* ?close@?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QAEXXZ */ /* ?close@?$basic_ofstream@_WU?$char_traits@_W@std@@@std@@QEAAXXZ */ /* ?close@?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAEXXZ */ @@ -10537,8 +10530,8 @@ void __thiscall basic_ifstream_char_vbase_dtor(basic_ifstream_char *this) basic_ios_char_dtor(basic_istream_char_get_basic_ios(&this->base)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ifstream_char_vector_dtor, 8) -basic_ifstream_char* __thiscall MSVCP_basic_ifstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_vector_dtor, 8) +basic_ifstream_char* __thiscall basic_ifstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) { basic_ifstream_char *this = basic_ifstream_char_from_basic_ios(base); @@ -10807,8 +10800,8 @@ void __thiscall basic_ifstream_wchar_vbase_dtor(basic_ifstream_wchar *this) basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ifstream_wchar_vector_dtor, 8) -basic_ifstream_wchar* __thiscall MSVCP_basic_ifstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_vector_dtor, 8) +basic_ifstream_wchar* __thiscall basic_ifstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) { basic_ifstream_wchar *this = basic_ifstream_wchar_from_basic_ios(base); @@ -10830,12 +10823,6 @@ basic_ifstream_wchar* __thiscall MSVCP_basic_ifstream_wchar_vector_dtor(basic_io return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ifstream_short_vector_dtor, 8) -basic_ifstream_wchar* __thiscall MSVCP_basic_ifstream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) -{ - return MSVCP_basic_ifstream_wchar_vector_dtor(base, flags); -} - /* ?close@?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAEXXZ */ /* ?close@?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAAXXZ */ /* ?close@?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAEXXZ */ @@ -11054,8 +11041,8 @@ void __thiscall basic_fstream_char_vbase_dtor(basic_fstream_char *this) basic_ios_char_dtor(basic_istream_char_get_basic_ios(&this->base.base1)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_fstream_char_vector_dtor, 8) -basic_fstream_char* __thiscall MSVCP_basic_fstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_fstream_char_vector_dtor, 8) +basic_fstream_char* __thiscall basic_fstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) { basic_fstream_char *this = basic_fstream_char_from_basic_ios(base); @@ -11326,8 +11313,8 @@ void __thiscall basic_fstream_wchar_vbase_dtor(basic_fstream_wchar *this) basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base.base1)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_fstream_wchar_vector_dtor, 8) -basic_fstream_wchar* __thiscall MSVCP_basic_fstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_fstream_wchar_vector_dtor, 8) +basic_fstream_wchar* __thiscall basic_fstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) { basic_fstream_wchar *this = basic_fstream_wchar_from_basic_ios(base); @@ -11349,12 +11336,6 @@ basic_fstream_wchar* __thiscall MSVCP_basic_fstream_wchar_vector_dtor(basic_ios_ return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_fstream_short_vector_dtor, 8) -basic_fstream_wchar* __thiscall MSVCP_basic_fstream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) -{ - return MSVCP_basic_fstream_wchar_vector_dtor(base, flags); -} - /* ?close@?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAEXXZ */ /* ?close@?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QEAAXXZ */ /* ?close@?$basic_fstream@GU?$char_traits@G@std@@@std@@QAEXXZ */ @@ -11545,8 +11526,8 @@ void __thiscall basic_ostringstream_char_vbase_dtor(basic_ostringstream_char *th basic_ios_char_dtor(basic_ostream_char_get_basic_ios(&this->base)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ostringstream_char_vector_dtor, 8) -basic_ostringstream_char* __thiscall MSVCP_basic_ostringstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ostringstream_char_vector_dtor, 8) +basic_ostringstream_char* __thiscall basic_ostringstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) { basic_ostringstream_char *this = basic_ostringstream_char_from_basic_ios(base); @@ -11721,8 +11702,8 @@ void __thiscall basic_ostringstream_wchar_vbase_dtor(basic_ostringstream_wchar * basic_ios_wchar_dtor(basic_ostream_wchar_get_basic_ios(&this->base)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ostringstream_wchar_vector_dtor, 8) -basic_ostringstream_wchar* __thiscall MSVCP_basic_ostringstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_ostringstream_wchar_vector_dtor, 8) +basic_ostringstream_wchar* __thiscall basic_ostringstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) { basic_ostringstream_wchar *this = basic_ostringstream_wchar_from_basic_ios(base); @@ -11744,12 +11725,6 @@ basic_ostringstream_wchar* __thiscall MSVCP_basic_ostringstream_wchar_vector_dto return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_ostringstream_short_vector_dtor, 8) -basic_ostringstream_wchar* __thiscall MSVCP_basic_ostringstream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) -{ - return MSVCP_basic_ostringstream_wchar_vector_dtor(base, flags); -} - /* ?rdbuf@?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEPAV?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */ /* ?rdbuf@?$basic_ostringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAPEAV?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */ /* ?rdbuf@?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPAV?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */ @@ -11874,8 +11849,8 @@ void __thiscall basic_istringstream_char_vbase_dtor(basic_istringstream_char *th basic_ios_char_dtor(basic_istream_char_get_basic_ios(&this->base)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_istringstream_char_vector_dtor, 8) -basic_istringstream_char* __thiscall MSVCP_basic_istringstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_istringstream_char_vector_dtor, 8) +basic_istringstream_char* __thiscall basic_istringstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) { basic_istringstream_char *this = basic_istringstream_char_from_basic_ios(base); @@ -12050,8 +12025,8 @@ void __thiscall basic_istringstream_wchar_vbase_dtor(basic_istringstream_wchar * basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_istringstream_wchar_vector_dtor, 8) -basic_istringstream_wchar* __thiscall MSVCP_basic_istringstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_istringstream_wchar_vector_dtor, 8) +basic_istringstream_wchar* __thiscall basic_istringstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) { basic_istringstream_wchar *this = basic_istringstream_wchar_from_basic_ios(base); @@ -12073,12 +12048,6 @@ basic_istringstream_wchar* __thiscall MSVCP_basic_istringstream_wchar_vector_dto return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_istringstream_short_vector_dtor, 8) -basic_istringstream_wchar* __thiscall MSVCP_basic_istringstream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) -{ - return MSVCP_basic_istringstream_wchar_vector_dtor(base, flags); -} - /* ?rdbuf@?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEPAV?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */ /* ?rdbuf@?$basic_istringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAPEAV?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */ /* ?rdbuf@?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPAV?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */ @@ -12206,8 +12175,8 @@ void __thiscall basic_stringstream_char_vbase_dtor(basic_stringstream_char *this basic_ios_char_dtor(basic_istream_char_get_basic_ios(&this->base.base1)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_stringstream_char_vector_dtor, 8) -basic_stringstream_char* __thiscall MSVCP_basic_stringstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_stringstream_char_vector_dtor, 8) +basic_stringstream_char* __thiscall basic_stringstream_char_vector_dtor(basic_ios_char *base, unsigned int flags) { basic_stringstream_char *this = basic_stringstream_char_from_basic_ios(base); @@ -12386,8 +12355,8 @@ void __thiscall basic_stringstream_wchar_vbase_dtor(basic_stringstream_wchar *th basic_ios_wchar_dtor(basic_istream_wchar_get_basic_ios(&this->base.base1)); } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_stringstream_wchar_vector_dtor, 8) -basic_stringstream_wchar* __thiscall MSVCP_basic_stringstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) +DEFINE_THISCALL_WRAPPER(basic_stringstream_wchar_vector_dtor, 8) +basic_stringstream_wchar* __thiscall basic_stringstream_wchar_vector_dtor(basic_ios_wchar *base, unsigned int flags) { basic_stringstream_wchar *this = basic_stringstream_wchar_from_basic_ios(base); @@ -12409,12 +12378,6 @@ basic_stringstream_wchar* __thiscall MSVCP_basic_stringstream_wchar_vector_dtor( return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_basic_stringstream_short_vector_dtor, 8) -basic_stringstream_wchar* __thiscall MSVCP_basic_stringstream_short_vector_dtor(basic_ios_wchar *base, unsigned int flags) -{ - return MSVCP_basic_stringstream_wchar_vector_dtor(base, flags); -} - /* ?rdbuf@?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEPAV?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */ /* ?rdbuf@?$basic_stringstream@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAPEAV?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@2@XZ */ /* ?rdbuf@?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEPAV?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ */ @@ -12575,8 +12538,8 @@ void __thiscall strstreambuf_dtor(strstreambuf *this) basic_streambuf_char_dtor(&this->base); } -DEFINE_THISCALL_WRAPPER(MSVCP_strstreambuf_vector_dtor, 8) -strstreambuf* __thiscall MSVCP_strstreambuf_vector_dtor(strstreambuf *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(strstreambuf_vector_dtor, 8) +strstreambuf* __thiscall strstreambuf_vector_dtor(strstreambuf *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index fedaea28547..51211d9abf4 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -178,10 +178,10 @@ void __thiscall locale_facet_dtor(locale_facet *this) TRACE("(%p)\n", this); } -DEFINE_THISCALL_WRAPPER(MSVCP_locale_facet_vector_dtor, 8) +DEFINE_THISCALL_WRAPPER(locale_facet_vector_dtor, 8) #define call_locale_facet_vector_dtor(this, flags) CALL_VTBL_FUNC(this, 0, \ locale_facet*, (locale_facet*, unsigned int), (this, flags)) -locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) +locale_facet* __thiscall locale_facet_vector_dtor(locale_facet *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -784,8 +784,8 @@ void __thiscall collate_char_dtor(collate *this) TRACE("(%p)\n", this); } -DEFINE_THISCALL_WRAPPER(MSVCP_collate_char_vector_dtor, 8) -collate* __thiscall MSVCP_collate_char_vector_dtor(collate *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(collate_char_vector_dtor, 8) +collate* __thiscall collate_char_vector_dtor(collate *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -1017,8 +1017,8 @@ void __thiscall collate_wchar_dtor(collate *this) TRACE("(%p)\n", this); } -DEFINE_THISCALL_WRAPPER(MSVCP_collate_wchar_vector_dtor, 8) -collate* __thiscall MSVCP_collate_wchar_vector_dtor(collate *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(collate_wchar_vector_dtor, 8) +collate* __thiscall collate_wchar_vector_dtor(collate *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -1037,12 +1037,6 @@ collate* __thiscall MSVCP_collate_wchar_vector_dtor(collate *this, unsigned int return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_collate_short_vector_dtor, 8) -collate* __thiscall MSVCP_collate_short_vector_dtor(collate *this, unsigned int flags) -{ - return MSVCP_collate_wchar_vector_dtor(this, flags); -} - /* ??_F?$collate@_W@std@@QAEXXZ */ /* ??_F?$collate@_W@std@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(collate_wchar_ctor, 4) @@ -1223,8 +1217,8 @@ void __thiscall ctype_base_dtor(ctype_base *this) TRACE("(%p)\n", this); } -DEFINE_THISCALL_WRAPPER(MSVCP_ctype_base_vector_dtor, 8) -ctype_base* __thiscall MSVCP_ctype_base_vector_dtor(ctype_base *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(ctype_base_vector_dtor, 8) +ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -1349,8 +1343,8 @@ void __thiscall ctype_char_dtor(ctype_char *this) ctype_char__Tidy(this); } -DEFINE_THISCALL_WRAPPER(MSVCP_ctype_char_vector_dtor, 8) -ctype_char* __thiscall MSVCP_ctype_char_vector_dtor(ctype_char *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(ctype_char_vector_dtor, 8) +ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -1923,8 +1917,8 @@ void __thiscall ctype_wchar_dtor(ctype_wchar *this) free((void*)this->ctype.table); } -DEFINE_THISCALL_WRAPPER(MSVCP_ctype_wchar_vector_dtor, 8) -ctype_wchar* __thiscall MSVCP_ctype_wchar_vector_dtor(ctype_wchar *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(ctype_wchar_vector_dtor, 8) +ctype_wchar* __thiscall ctype_wchar_vector_dtor(ctype_wchar *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -1943,12 +1937,6 @@ ctype_wchar* __thiscall MSVCP_ctype_wchar_vector_dtor(ctype_wchar *this, unsigne return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_ctype_short_vector_dtor, 8) -ctype_wchar* __thiscall MSVCP_ctype_short_vector_dtor(ctype_wchar *this, unsigned int flags) -{ - return MSVCP_ctype_wchar_vector_dtor(this, flags); -} - /* _Wcrtomb */ int __cdecl _Wcrtomb(char *s, wchar_t wch, int *state, const _Cvtvec *cvt) { @@ -2612,8 +2600,8 @@ void __thiscall codecvt_base_dtor(codecvt_base *this) locale_facet_dtor(&this->facet); } -DEFINE_THISCALL_WRAPPER(MSVCP_codecvt_base_vector_dtor, 8) -codecvt_base* __thiscall MSVCP_codecvt_base_vector_dtor(codecvt_base *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(codecvt_base_vector_dtor, 8) +codecvt_base* __thiscall codecvt_base_vector_dtor(codecvt_base *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -2742,8 +2730,8 @@ void __thiscall codecvt_char_dtor(codecvt_char *this) codecvt_base_dtor(&this->base); } -DEFINE_THISCALL_WRAPPER(MSVCP_codecvt_char_vector_dtor, 8) -codecvt_char* __thiscall MSVCP_codecvt_char_vector_dtor(codecvt_char *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(codecvt_char_vector_dtor, 8) +codecvt_char* __thiscall codecvt_char_vector_dtor(codecvt_char *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -3036,8 +3024,8 @@ void __thiscall codecvt_wchar_dtor(codecvt_wchar *this) codecvt_base_dtor(&this->base); } -DEFINE_THISCALL_WRAPPER(MSVCP_codecvt_wchar_vector_dtor, 8) -codecvt_wchar* __thiscall MSVCP_codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(codecvt_wchar_vector_dtor, 8) +codecvt_wchar* __thiscall codecvt_wchar_vector_dtor(codecvt_wchar *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -3056,12 +3044,6 @@ codecvt_wchar* __thiscall MSVCP_codecvt_wchar_vector_dtor(codecvt_wchar *this, u return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_codecvt_short_vector_dtor, 8) -codecvt_wchar* __thiscall MSVCP_codecvt_short_vector_dtor(codecvt_wchar *this, unsigned int flags) -{ - return MSVCP_codecvt_wchar_vector_dtor(this, flags); -} - /* ?_Getcat@?$codecvt@_WDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$codecvt@_WDH@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ unsigned int __cdecl codecvt_wchar__Getcat(const locale_facet **facet, const locale *loc) @@ -3511,8 +3493,8 @@ void __thiscall numpunct_char_dtor(numpunct_char *this) numpunct_char__Tidy(this); } -DEFINE_THISCALL_WRAPPER(MSVCP_numpunct_char_vector_dtor, 8) -numpunct_char* __thiscall MSVCP_numpunct_char_vector_dtor(numpunct_char *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(numpunct_char_vector_dtor, 8) +numpunct_char* __thiscall numpunct_char_vector_dtor(numpunct_char *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -3864,8 +3846,8 @@ void __thiscall numpunct_wchar_dtor(numpunct_wchar *this) numpunct_wchar__Tidy(this); } -DEFINE_THISCALL_WRAPPER(MSVCP_numpunct_wchar_vector_dtor, 8) -numpunct_wchar* __thiscall MSVCP_numpunct_wchar_vector_dtor(numpunct_wchar *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(numpunct_wchar_vector_dtor, 8) +numpunct_wchar* __thiscall numpunct_wchar_vector_dtor(numpunct_wchar *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -3884,12 +3866,6 @@ numpunct_wchar* __thiscall MSVCP_numpunct_wchar_vector_dtor(numpunct_wchar *this return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_numpunct_short_vector_dtor, 8) -numpunct_wchar* __thiscall MSVCP_numpunct_short_vector_dtor(numpunct_wchar *this, unsigned int flags) -{ - return MSVCP_numpunct_wchar_vector_dtor(this, flags); -} - /* ?_Getcat@?$numpunct@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$numpunct@_W@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ MSVCP_size_t __cdecl numpunct_wchar__Getcat(const locale_facet **facet, const locale *loc) @@ -4307,8 +4283,8 @@ void __thiscall num_get_wchar_dtor(num_get *this) locale_facet_dtor(&this->facet); } -DEFINE_THISCALL_WRAPPER(MSVCP_num_get_wchar_vector_dtor, 8) -num_get* __thiscall MSVCP_num_get_wchar_vector_dtor(num_get *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(num_get_wchar_vector_dtor, 8) +num_get* __thiscall num_get_wchar_vector_dtor(num_get *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -4327,12 +4303,6 @@ num_get* __thiscall MSVCP_num_get_wchar_vector_dtor(num_get *this, unsigned int return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_num_get_short_vector_dtor, 8) -num_get* __thiscall MSVCP_num_get_short_vector_dtor(num_get *this, unsigned int flags) -{ - return MSVCP_num_get_wchar_vector_dtor(this, flags); -} - /* ?_Getcat@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ MSVCP_size_t __cdecl num_get_wchar__Getcat(const locale_facet **facet, const locale *loc) @@ -5462,8 +5432,8 @@ void __thiscall num_get_char_dtor(num_get *this) locale_facet_dtor(&this->facet); } -DEFINE_THISCALL_WRAPPER(MSVCP_num_get_char_vector_dtor, 8) -num_get* __thiscall MSVCP_num_get_char_vector_dtor(num_get *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(num_get_char_vector_dtor, 8) +num_get* __thiscall num_get_char_vector_dtor(num_get *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -6323,8 +6293,8 @@ void __thiscall num_put_char_dtor(num_put *this) locale_facet_dtor(&this->facet); } -DEFINE_THISCALL_WRAPPER(MSVCP_num_put_char_vector_dtor, 8) -num_put* __thiscall MSVCP_num_put_char_vector_dtor(num_put *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(num_put_char_vector_dtor, 8) +num_put* __thiscall num_put_char_vector_dtor(num_put *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -6970,8 +6940,8 @@ void __thiscall num_put_wchar_dtor(num_put *this) locale_facet_dtor(&this->facet); } -DEFINE_THISCALL_WRAPPER(MSVCP_num_put_wchar_vector_dtor, 8) -num_put* __thiscall MSVCP_num_put_wchar_vector_dtor(num_put *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(num_put_wchar_vector_dtor, 8) +num_put* __thiscall num_put_wchar_vector_dtor(num_put *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -6990,12 +6960,6 @@ num_put* __thiscall MSVCP_num_put_wchar_vector_dtor(num_put *this, unsigned int return this; } -DEFINE_THISCALL_WRAPPER(MSVCP_num_put_short_vector_dtor, 8) -num_put* __thiscall MSVCP_num_put_short_vector_dtor(num_put *this, unsigned int flags) -{ - return MSVCP_num_put_wchar_vector_dtor(this, flags); -} - /* ?_Getcat@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ /* ?_Getcat@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ unsigned int __cdecl num_put_wchar__Getcat(const locale_facet **facet, const locale *loc) @@ -7874,8 +7838,8 @@ void __cdecl locale__Locimp__Locimp_dtor(locale__Locimp *this) locale__Locimp_dtor(this); } -DEFINE_THISCALL_WRAPPER(MSVCP_locale__Locimp_vector_dtor, 8) -locale__Locimp* __thiscall MSVCP_locale__Locimp_vector_dtor(locale__Locimp *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(locale__Locimp_vector_dtor, 8) +locale__Locimp* __thiscall locale__Locimp_vector_dtor(locale__Locimp *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -8237,7 +8201,7 @@ locale__Locimp* __cdecl locale__Locimp__Makeloc(const _Locinfo *locinfo, categor /* ??_7_Locimp@locale@std@@6B@ */ const vtable_ptr MSVCP_locale__Locimp_vtable[] = { - (vtable_ptr)THISCALL_NAME(MSVCP_locale__Locimp_vector_dtor) + (vtable_ptr)THISCALL_NAME(locale__Locimp_vector_dtor) }; /* ??0locale@std@@AAE@PAV_Locimp@01@@Z */ @@ -8375,8 +8339,8 @@ void __thiscall locale_dtor(locale *this) locale__Locimp_dtor(this->ptr); } -DEFINE_THISCALL_WRAPPER(MSVCP_locale_vector_dtor, 8) -locale* __thiscall MSVCP_locale_vector_dtor(locale *this, unsigned int flags) +DEFINE_THISCALL_WRAPPER(locale_vector_dtor, 8) +locale* __thiscall locale_vector_dtor(locale *this, unsigned int flags) { TRACE("(%p %x)\n", this, flags); if(flags & 2) { @@ -8569,21 +8533,27 @@ DEFINE_RTTI_DATA1(num_put_short, 0, &locale_facet_rtti_base_descriptor, ".?AV?$n #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_VTABLE(locale_facet, ""); + __ASM_VTABLE(locale_facet, + VTABLE_ADD_FUNC(locale_facet_vector_dtor)); __ASM_VTABLE(collate_char, + VTABLE_ADD_FUNC(collate_char_vector_dtor) VTABLE_ADD_FUNC(collate_char_do_compare) VTABLE_ADD_FUNC(collate_char_do_transform) VTABLE_ADD_FUNC(collate_char_do_hash)); __ASM_VTABLE(collate_wchar, + VTABLE_ADD_FUNC(collate_wchar_vector_dtor) VTABLE_ADD_FUNC(collate_wchar_do_compare) VTABLE_ADD_FUNC(collate_wchar_do_transform) VTABLE_ADD_FUNC(collate_wchar_do_hash)); __ASM_VTABLE(collate_short, + VTABLE_ADD_FUNC(collate_wchar_vector_dtor) VTABLE_ADD_FUNC(collate_wchar_do_compare) VTABLE_ADD_FUNC(collate_wchar_do_transform) VTABLE_ADD_FUNC(collate_wchar_do_hash)); - __ASM_VTABLE(ctype_base, ""); + __ASM_VTABLE(ctype_base, + VTABLE_ADD_FUNC(ctype_base_vector_dtor)); __ASM_VTABLE(ctype_char, + VTABLE_ADD_FUNC(ctype_char_vector_dtor) VTABLE_ADD_FUNC(ctype_char_do_tolower) VTABLE_ADD_FUNC(ctype_char_do_tolower_ch) VTABLE_ADD_FUNC(ctype_char_do_toupper) @@ -8593,6 +8563,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_char_do_narrow) VTABLE_ADD_FUNC(ctype_char_do_narrow_ch)); __ASM_VTABLE(ctype_wchar, + VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) VTABLE_ADD_FUNC(ctype_wchar_do_is_ch) VTABLE_ADD_FUNC(ctype_wchar_do_scan_is) @@ -8606,6 +8577,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_narrow) VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(ctype_short, + VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) VTABLE_ADD_FUNC(ctype_wchar_do_is_ch) VTABLE_ADD_FUNC(ctype_wchar_do_scan_is) @@ -8619,10 +8591,12 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_narrow) VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(codecvt_base, + VTABLE_ADD_FUNC(codecvt_base_vector_dtor) VTABLE_ADD_FUNC(codecvt_base_do_always_noconv) VTABLE_ADD_FUNC(codecvt_base_do_max_length) VTABLE_ADD_FUNC(codecvt_base_do_encoding)); __ASM_VTABLE(codecvt_char, + VTABLE_ADD_FUNC(codecvt_char_vector_dtor) VTABLE_ADD_FUNC(codecvt_base_do_always_noconv) VTABLE_ADD_FUNC(codecvt_base_do_max_length) VTABLE_ADD_FUNC(codecvt_base_do_encoding) @@ -8631,6 +8605,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(codecvt_char_do_unshift) VTABLE_ADD_FUNC(codecvt_char_do_length)); __ASM_VTABLE(codecvt_wchar, + VTABLE_ADD_FUNC(codecvt_wchar_vector_dtor) VTABLE_ADD_FUNC(codecvt_wchar_do_always_noconv) VTABLE_ADD_FUNC(codecvt_wchar_do_max_length) VTABLE_ADD_FUNC(codecvt_base_do_encoding) @@ -8639,6 +8614,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(codecvt_wchar_do_unshift) VTABLE_ADD_FUNC(codecvt_wchar_do_length)); __ASM_VTABLE(codecvt_short, + VTABLE_ADD_FUNC(codecvt_wchar_vector_dtor) VTABLE_ADD_FUNC(codecvt_wchar_do_always_noconv) VTABLE_ADD_FUNC(codecvt_wchar_do_max_length) VTABLE_ADD_FUNC(codecvt_base_do_encoding) @@ -8647,24 +8623,28 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(codecvt_wchar_do_unshift) VTABLE_ADD_FUNC(codecvt_wchar_do_length)); __ASM_VTABLE(numpunct_char, + VTABLE_ADD_FUNC(numpunct_char_vector_dtor) VTABLE_ADD_FUNC(numpunct_char_do_decimal_point) VTABLE_ADD_FUNC(numpunct_char_do_thousands_sep) VTABLE_ADD_FUNC(numpunct_char_do_grouping) VTABLE_ADD_FUNC(numpunct_char_do_falsename) VTABLE_ADD_FUNC(numpunct_char_do_truename)); __ASM_VTABLE(numpunct_wchar, + VTABLE_ADD_FUNC(numpunct_wchar_vector_dtor) VTABLE_ADD_FUNC(numpunct_wchar_do_decimal_point) VTABLE_ADD_FUNC(numpunct_wchar_do_thousands_sep) VTABLE_ADD_FUNC(numpunct_wchar_do_grouping) VTABLE_ADD_FUNC(numpunct_wchar_do_falsename) VTABLE_ADD_FUNC(numpunct_wchar_do_truename)); __ASM_VTABLE(numpunct_short, + VTABLE_ADD_FUNC(numpunct_wchar_vector_dtor) VTABLE_ADD_FUNC(numpunct_wchar_do_decimal_point) VTABLE_ADD_FUNC(numpunct_wchar_do_thousands_sep) VTABLE_ADD_FUNC(numpunct_wchar_do_grouping) VTABLE_ADD_FUNC(numpunct_wchar_do_falsename) VTABLE_ADD_FUNC(numpunct_wchar_do_truename)); __ASM_VTABLE(num_get_char, + VTABLE_ADD_FUNC(num_get_char_vector_dtor) VTABLE_ADD_FUNC(num_get_char_do_get_void) VTABLE_ADD_FUNC(num_get_char_do_get_double) VTABLE_ADD_FUNC(num_get_char_do_get_double) @@ -8677,6 +8657,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(num_get_char_do_get_ushort) VTABLE_ADD_FUNC(num_get_char_do_get_bool)); __ASM_VTABLE(num_get_short, + VTABLE_ADD_FUNC(num_get_wchar_vector_dtor) VTABLE_ADD_FUNC(num_get_short_do_get_void) VTABLE_ADD_FUNC(num_get_short_do_get_double) VTABLE_ADD_FUNC(num_get_short_do_get_double) @@ -8689,6 +8670,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(num_get_short_do_get_ushort) VTABLE_ADD_FUNC(num_get_short_do_get_bool)); __ASM_VTABLE(num_get_wchar, + VTABLE_ADD_FUNC(num_get_wchar_vector_dtor) VTABLE_ADD_FUNC(num_get_wchar_do_get_void) VTABLE_ADD_FUNC(num_get_wchar_do_get_double) VTABLE_ADD_FUNC(num_get_wchar_do_get_double) @@ -8701,6 +8683,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(num_get_wchar_do_get_ushort) VTABLE_ADD_FUNC(num_get_wchar_do_get_bool)); __ASM_VTABLE(num_put_char, + VTABLE_ADD_FUNC(num_put_char_vector_dtor) VTABLE_ADD_FUNC(num_put_char_do_put_ptr) VTABLE_ADD_FUNC(num_put_char_do_put_double) VTABLE_ADD_FUNC(num_put_char_do_put_double) @@ -8710,6 +8693,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(num_put_char_do_put_long) VTABLE_ADD_FUNC(num_put_char_do_put_bool)); __ASM_VTABLE(num_put_wchar, + VTABLE_ADD_FUNC(num_put_wchar_vector_dtor) VTABLE_ADD_FUNC(num_put_wchar_do_put_ptr) VTABLE_ADD_FUNC(num_put_wchar_do_put_double) VTABLE_ADD_FUNC(num_put_wchar_do_put_double) @@ -8719,6 +8703,7 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(num_put_wchar_do_put_long) VTABLE_ADD_FUNC(num_put_wchar_do_put_bool)); __ASM_VTABLE(num_put_short, + VTABLE_ADD_FUNC(num_put_wchar_vector_dtor) VTABLE_ADD_FUNC(num_put_short_do_put_ptr) VTABLE_ADD_FUNC(num_put_short_do_put_double) VTABLE_ADD_FUNC(num_put_short_do_put_double)