Module: wine Branch: master Commit: 44691e8de328c40cd229a7bfe0a051be90623f2c URL: https://gitlab.winehq.org/wine/wine/-/commit/44691e8de328c40cd229a7bfe0a051b...
Author: Alexandre Julliard julliard@winehq.org Date: Wed May 22 13:50:48 2024 +0200
msvcp: Use RVAs in rtti and exception data on all platforms except i386.
---
dlls/msvcirt/msvcirt.c | 2 +- dlls/msvcp140_1/msvcp140_1.c | 2 +- dlls/msvcp60/ios.c | 2 +- dlls/msvcp90/cxx.h | 2 +- dlls/msvcp90/details.c | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/locale.c | 2 +- dlls/msvcp90/misc.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0fcdc52c203..05e3aee4b6a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -5162,7 +5162,7 @@ static void init_io(void *base) { filebuf *fb;
-#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_streambuf_rtti(base); init_filebuf_rtti(base); init_strstreambuf_rtti(base); diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c index c6a6ff19f13..c9ca98df268 100644 --- a/dlls/msvcp140_1/msvcp140_1.c +++ b/dlls/msvcp140_1/msvcp140_1.c @@ -263,7 +263,7 @@ static BOOL init_cxx_funcs(void)
static void init_rtti(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_type_info_rtti(base); init_base_memory_resource_rtti(base); init__Identity_equal_resource_rtti(base); diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 3da714375f4..891c126b6be 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -11154,7 +11154,7 @@ void* __thiscall _Winit_op_assign(void *this, void *rhs)
void init_io(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_iosb_rtti(base); init_ios_base_rtti(base); init_basic_ios_char_rtti(base); diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index c0b43f78256..8037d7def56 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -21,7 +21,7 @@ #include "rtlsupportapi.h" #include "wine/asm.h"
-#ifndef __x86_64__ +#ifdef __i386__ #undef RTTI_USE_RVA #else #define RTTI_USE_RVA 1 diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 98579dfa991..984a277ed12 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -1118,7 +1118,7 @@ __ASM_BLOCK_END
void init_concurrency_details(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init__Concurrent_queue_base_v4_rtti(base); init__Runtime_object_rtti(base); #endif diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 3d569d8d855..5c8e5e85e18 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1497,7 +1497,7 @@ void DECLSPEC_NORETURN throw_failure(const char *str)
void init_exception(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_type_info_rtti(base); init_exception_rtti(base); init_bad_alloc_rtti(base); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 1240bb537c9..25b5d7fe1a0 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15837,7 +15837,7 @@ void* __thiscall _Winit_op_assign(void *this, void *rhs)
void init_io(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_iosb_rtti(base); init_ios_base_rtti(base); init_basic_ios_char_rtti(base); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b6af02dea42..4eaf679139c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -13336,7 +13336,7 @@ __ASM_BLOCK_END
void init_locale(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init__Facet_base_rtti(base); init_locale_facet_rtti(base); init_locale__Locimp_rtti(base); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index e8998383ecc..a1c9c7f0646 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1781,7 +1781,7 @@ __ASM_BLOCK_END
void init_misc(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA #if _MSVCP_VER >= 100 init_error_category_rtti(base); init_generic_category_rtti(base);