Skip to content

W
wine-winehq
Commit 819b94b8 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcp60: Manually define virtual destructors in vtables.

parent 584a48a3
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 27 deletions
dlls/msvcp60/cxx.h
View file @ 819b94b8
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
"\t.quad " __ASM_NAME(#name "_rtti") "\n" \ "\t.quad " __ASM_NAME(#name "_rtti") "\n" \
"\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \
__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") funcs "\n\t.text")
#else #else
...@@ -61,7 +60,6 @@ ...@@ -61,7 +60,6 @@
"\t.long " __ASM_NAME(#name "_rtti") "\n" \ "\t.long " __ASM_NAME(#name "_rtti") "\n" \
"\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \
__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") funcs "\n\t.text")
#endif /* _WIN64 */ #endif /* _WIN64 */
......
dlls/msvcp60/exception.c
View file @ 819b94b8
...@@ -465,14 +465,6 @@ length_error* __thiscall MSVCP_length_error_ctor_bstr(length_error *this, const ...@@ -465,14 +465,6 @@ length_error* __thiscall MSVCP_length_error_ctor_bstr(length_error *this, const
return MSVCP_length_error_ctor(this, MSVCP_basic_string_char_c_str(str)); return MSVCP_length_error_ctor(this, MSVCP_basic_string_char_c_str(str));
} }
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);
}
/* ??4length_error@std@@QAEAAV01@ABV01@@Z */ /* ??4length_error@std@@QAEAAV01@ABV01@@Z */
/* ??4length_error@std@@QEAAAEAV01@AEBV01@@Z */ /* ??4length_error@std@@QEAAAEAV01@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_length_error_assign, 8) DEFINE_THISCALL_WRAPPER(MSVCP_length_error_assign, 8)
...@@ -542,14 +534,6 @@ out_of_range* __thiscall MSVCP_out_of_range_ctor_bstr(out_of_range *this, const ...@@ -542,14 +534,6 @@ out_of_range* __thiscall MSVCP_out_of_range_ctor_bstr(out_of_range *this, const
return MSVCP_out_of_range_ctor(this, MSVCP_basic_string_char_c_str(str)); return MSVCP_out_of_range_ctor(this, MSVCP_basic_string_char_c_str(str));
} }
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);
}
/* ??4out_of_range@std@@QAEAAV01@ABV01@@Z */ /* ??4out_of_range@std@@QAEAAV01@ABV01@@Z */
/* ??4out_of_range@std@@QEAAAEAV01@AEBV01@@Z */ /* ??4out_of_range@std@@QEAAAEAV01@AEBV01@@Z */
DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_assign, 8) DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_assign, 8)
...@@ -608,14 +592,6 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( ...@@ -608,14 +592,6 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor(
return this; 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@@"); 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 = { static const cxx_type_info invalid_argument_cxx_type_info = {
...@@ -731,26 +707,34 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) ...@@ -731,26 +707,34 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this)
#ifndef __GNUC__ #ifndef __GNUC__
void __asm_dummy_vtables(void) { void __asm_dummy_vtables(void) {
#endif #endif
__ASM_VTABLE(type_info,""); __ASM_VTABLE(type_info,
VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor));
__ASM_VTABLE(exception, __ASM_VTABLE(exception,
VTABLE_ADD_FUNC(MSVCP_exception_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_exception_what) VTABLE_ADD_FUNC(MSVCP_exception_what)
VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); VTABLE_ADD_FUNC(MSVCP_exception__Doraise));
__ASM_VTABLE(bad_alloc, __ASM_VTABLE(bad_alloc,
VTABLE_ADD_FUNC(MSVCP_bad_alloc_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_exception_what) VTABLE_ADD_FUNC(MSVCP_exception_what)
VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); VTABLE_ADD_FUNC(MSVCP_exception__Doraise));
__ASM_VTABLE(logic_error, __ASM_VTABLE(logic_error,
VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_logic_error_what) VTABLE_ADD_FUNC(MSVCP_logic_error_what)
VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); VTABLE_ADD_FUNC(MSVCP_exception__Doraise));
__ASM_VTABLE(length_error, __ASM_VTABLE(length_error,
VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_logic_error_what) VTABLE_ADD_FUNC(MSVCP_logic_error_what)
VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); VTABLE_ADD_FUNC(MSVCP_exception__Doraise));
__ASM_VTABLE(out_of_range, __ASM_VTABLE(out_of_range,
VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_logic_error_what) VTABLE_ADD_FUNC(MSVCP_logic_error_what)
VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); VTABLE_ADD_FUNC(MSVCP_exception__Doraise));
__ASM_VTABLE(invalid_argument, __ASM_VTABLE(invalid_argument,
VTABLE_ADD_FUNC(MSVCP_logic_error_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_logic_error_what) VTABLE_ADD_FUNC(MSVCP_logic_error_what)
VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); VTABLE_ADD_FUNC(MSVCP_exception__Doraise));
__ASM_VTABLE(runtime_error, __ASM_VTABLE(runtime_error,
VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_runtime_error_what) VTABLE_ADD_FUNC(MSVCP_runtime_error_what)
VTABLE_ADD_FUNC(MSVCP_exception__Doraise)); VTABLE_ADD_FUNC(MSVCP_exception__Doraise));
#ifndef __GNUC__ #ifndef __GNUC__
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment