Skip to content

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

msvcp100: Manually define virtual destructors in vtables.

parent 819b94b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 35 deletions
dlls/msvcp100/cxx.h
View file @ 5a5de655
...@@ -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/msvcp100/exception.c
View file @ 5a5de655
...@@ -381,14 +381,6 @@ length_error* __thiscall MSVCP_length_error_copy_ctor( ...@@ -381,14 +381,6 @@ length_error* __thiscall MSVCP_length_error_copy_ctor(
return this; 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@@"); 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 = { static const cxx_type_info length_error_cxx_type_info = {
...@@ -438,14 +430,6 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor( ...@@ -438,14 +430,6 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor(
return this; 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@@"); 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 = { static const cxx_type_info out_of_range_cxx_type_info = {
...@@ -495,14 +479,6 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( ...@@ -495,14 +479,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 = {
...@@ -694,15 +670,32 @@ static const cxx_exception_type failure_cxx_type = { ...@@ -694,15 +670,32 @@ static const cxx_exception_type failure_cxx_type = {
#ifndef __GNUC__ #ifndef __GNUC__
void __asm_dummy_vtables(void) { void __asm_dummy_vtables(void) {
#endif #endif
__ASM_VTABLE(type_info, ""); __ASM_VTABLE(type_info,
__ASM_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_what_exception)); VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor));
__ASM_VTABLE(bad_alloc, VTABLE_ADD_FUNC(MSVCP_what_exception)); __ASM_VTABLE(exception,
__ASM_VTABLE(logic_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); VTABLE_ADD_FUNC(MSVCP_exception_vector_dtor)
__ASM_VTABLE(length_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); VTABLE_ADD_FUNC(MSVCP_what_exception));
__ASM_VTABLE(out_of_range, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); __ASM_VTABLE(bad_alloc,
__ASM_VTABLE(invalid_argument, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); VTABLE_ADD_FUNC(MSVCP_bad_alloc_vector_dtor)
__ASM_VTABLE(runtime_error, VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); VTABLE_ADD_FUNC(MSVCP_what_exception));
__ASM_VTABLE(failure, VTABLE_ADD_FUNC(MSVCP_failure_what)); __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__ #ifndef __GNUC__
} }
#endif #endif
......
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