Skip to content

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

msvcp110: Add _Facet_base_vtable export.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7ba79ca9
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
dlls/msvcp110/msvcp110.spec
View file @ d8c5ef33
...@@ -949,7 +949,7 @@ ...@@ -949,7 +949,7 @@
@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable @ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
# extern ??_7_Facet_base@std@@6B@ @ extern ??_7_Facet_base@std@@6B@ MSVCP__Facet_base_vtable
@ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable
@ extern ??_7_Pad@std@@6B@ MSVCP__Pad_vtable @ extern ??_7_Pad@std@@6B@ MSVCP__Pad_vtable
@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable @ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
......
dlls/msvcp120/msvcp120.spec
View file @ d8c5ef33
...@@ -949,7 +949,7 @@ ...@@ -949,7 +949,7 @@
@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable @ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
# extern ??_7_Facet_base@std@@6B@ @ extern ??_7_Facet_base@std@@6B@ MSVCP__Facet_base_vtable
@ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable
@ extern ??_7_Pad@std@@6B@ MSVCP__Pad_vtable @ extern ??_7_Pad@std@@6B@ MSVCP__Pad_vtable
@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable @ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
......
dlls/msvcp120_app/msvcp120_app.spec
View file @ d8c5ef33
...@@ -949,7 +949,7 @@ ...@@ -949,7 +949,7 @@
@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ @ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ @ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ @ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@
# extern ??_7_Facet_base@std@@6B@ @ extern ??_7_Facet_base@std@@6B@ msvcp120.??_7_Facet_base@std@@6B@
@ extern ??_7_Locimp@locale@std@@6B@ msvcp120.??_7_Locimp@locale@std@@6B@ @ extern ??_7_Locimp@locale@std@@6B@ msvcp120.??_7_Locimp@locale@std@@6B@
@ extern ??_7_Pad@std@@6B@ msvcp120.??_7_Pad@std@@6B@ @ extern ??_7_Pad@std@@6B@ msvcp120.??_7_Pad@std@@6B@
@ extern ??_7codecvt_base@std@@6B@ msvcp120.??_7codecvt_base@std@@6B@ @ extern ??_7codecvt_base@std@@6B@ msvcp120.??_7codecvt_base@std@@6B@
......
dlls/msvcp140/msvcp140.spec
View file @ d8c5ef33
...@@ -954,7 +954,7 @@ ...@@ -954,7 +954,7 @@
@ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable
@ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable
@ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable @ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable
# extern ??_7_Facet_base@std@@6B@ @ extern ??_7_Facet_base@std@@6B@ MSVCP__Facet_base_vtable
@ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable
@ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable @ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable
@ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable @ extern ??_7ctype_base@std@@6B@ MSVCP_ctype_base_vtable
......
dlls/msvcp90/locale.c
View file @ d8c5ef33
...@@ -11224,7 +11224,7 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s ...@@ -11224,7 +11224,7 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s
} }
#endif #endif
DEFINE_RTTI_DATA0(_Facet_base, 0, ".?AV_Facet_base@std@@")
DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet@locale@std@@") DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet@locale@std@@")
DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp@locale@std@@") DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp@locale@std@@")
DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@D@std@@") DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@D@std@@")
...@@ -11262,6 +11262,11 @@ DEFINE_RTTI_DATA2(time_get_char, 0, &time_base_rtti_base_descriptor, &locale_fac ...@@ -11262,6 +11262,11 @@ DEFINE_RTTI_DATA2(time_get_char, 0, &time_base_rtti_base_descriptor, &locale_fac
#ifndef __GNUC__ #ifndef __GNUC__
void __asm_dummy_vtables(void) { void __asm_dummy_vtables(void) {
#endif #endif
__ASM_VTABLE(_Facet_base,
VTABLE_ADD_FUNC(locale_facet_vector_dtor)
VTABLE_ADD_FUNC(locale_facet__Incref)
VTABLE_ADD_FUNC(locale_facet__Incref)
);
__ASM_VTABLE(locale_facet, __ASM_VTABLE(locale_facet,
VTABLE_ADD_FUNC(locale_facet_vector_dtor) VTABLE_ADD_FUNC(locale_facet_vector_dtor)
#if _MSVCP_VER >= 110 #if _MSVCP_VER >= 110
...@@ -11608,6 +11613,7 @@ void __asm_dummy_vtables(void) { ...@@ -11608,6 +11613,7 @@ void __asm_dummy_vtables(void) {
void init_locale(void *base) void init_locale(void *base)
{ {
#ifdef __x86_64__ #ifdef __x86_64__
init__Facet_base_rtti(base);
init_locale_facet_rtti(base); init_locale_facet_rtti(base);
init_locale__Locimp_rtti(base); init_locale__Locimp_rtti(base);
init_collate_char_rtti(base); init_collate_char_rtti(base);
......
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