marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcp90: Use __ASM_BLOCK_BEGIN and __ASM_BLOCK_END macros. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Jacek Caban 2020-04-24 20:10:36 +02:00 committed by Alexandre Julliard
parent 281c58bc43
commit ddd4a7c3fb
4 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msvcp90/exception.c
View File

@ -1021,9 +1021,7 @@ void __cdecl __ExceptionPtrDestroy(exception_ptr *ep)
#define EXCEPTION_VTABLE(name,funcs) __ASM_VTABLE(name,funcs VTABLE_ADD_FUNC(MSVCP_exception__Doraise))
#endif
#ifndef __GNUC__
void __asm_dummy_vtables(void) {
#endif
__ASM_BLOCK_BEGIN(exception_vtables)
__ASM_VTABLE(type_info,
VTABLE_ADD_FUNC(MSVCP_type_info_vector_dtor));
EXCEPTION_VTABLE(exception,
@ -1066,9 +1064,7 @@ void __asm_dummy_vtables(void) {
EXCEPTION_VTABLE(range_error,
VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor)
VTABLE_ADD_FUNC(MSVCP_runtime_error_what));
#ifndef __GNUC__
}
#endif
__ASM_BLOCK_END
/* Internal: throws selected exception */
void throw_exception(exception_type et, const char *str)

8
dlls/msvcp90/ios.c
View File

@ -756,9 +756,7 @@ DEFINE_RTTI_DATA8(strstream, sizeof(strstream),
&ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor,
"?AVstrstream@std@@")
#ifndef __GNUC__
void __asm_dummy_vtables(void) {
#endif
__ASM_BLOCK_BEGIN(ios_vtables)
__ASM_VTABLE(iosb,
VTABLE_ADD_FUNC(iosb_vector_dtor));
__ASM_VTABLE(ios_base,
@ -1181,9 +1179,7 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC(basic_ios__Add_vtordisp2)
#endif
);
#ifndef __GNUC__
}
#endif
__ASM_BLOCK_END
/* ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEXPAD00@Z */
/* ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAXPEAD00@Z */

8
dlls/msvcp90/locale.c
View File

@ -12737,9 +12737,7 @@ DEFINE_RTTI_DATA1(time_base, 0, &locale_facet_rtti_base_descriptor, ".?AUtime_ba
DEFINE_RTTI_DATA2(time_get_char, 0, &time_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@")
DEFINE_RTTI_DATA2(time_get_wchar, 0, &time_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@")
#ifndef __GNUC__
void __asm_dummy_vtables(void) {
#endif
__ASM_BLOCK_BEGIN(locale_vtables)
__ASM_VTABLE(_Facet_base,
VTABLE_ADD_FUNC(locale_facet_vector_dtor)
VTABLE_ADD_FUNC(locale_facet__Incref)
@ -13104,9 +13102,7 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC(time_get_wchar_do_get)
#endif
);
#ifndef __GNUC__
}
#endif
__ASM_BLOCK_END
void init_locale(void *base)
{

8
dlls/msvcp90/misc.c
View File

@ -2391,9 +2391,7 @@ void __thiscall _Concurrent_vector_base_v4__Internal_swap(
}
#endif
#ifndef __GNUC__
void __asm_dummy_vtables(void) {
#endif
__ASM_BLOCK_BEGIN(vtables)
#if _MSVCP_VER == 100
__ASM_VTABLE(iostream_category,
VTABLE_ADD_FUNC(custom_category_vector_dtor)
@ -2434,9 +2432,7 @@ void __asm_dummy_vtables(void) {
__ASM_VTABLE(_Pad,
VTABLE_ADD_FUNC(_Pad__Go));
#endif
#ifndef __GNUC__
}
#endif
__ASM_BLOCK_END
/*********************************************************************
* __crtInitializeCriticalSectionEx (MSVCP140.@)