Skip to content

W
wine-winehq
Commit bd92393a authored by Daniel Lehman's avatar Daniel Lehman Committed by Alexandre Julliard
Browse files
Options

msvcp90: Add codecvt<wchar_t>::do_encoding that returns 0.

Signed-off-by: 's avatarDaniel Lehman <dlehman@esri.com> Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 66351b3d
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 32 deletions
dlls/msvcp110/msvcp110.spec
View file @ bd92393a
......@@ -1937,12 +1937,12 @@
@ stub -arch=arm ?do_date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MBA?AW4dateorder@time_base@2@XZ
@ stub -arch=i386 ?do_date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MBE?AW4dateorder@time_base@2@XZ
@ stub -arch=win64 ?do_date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MEBA?AW4dateorder@time_base@2@XZ
@ stub -arch=arm ?do_encoding@?$codecvt@GDH@std@@MBAHXZ
@ stub -arch=i386 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ
@ stub -arch=arm ?do_encoding@?$codecvt@_WDH@std@@MBAHXZ
@ stub -arch=i386 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ
@ cdecl -arch=arm ?do_encoding@?$codecvt@GDH@std@@MBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=i386 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=arm ?do_encoding@?$codecvt@_WDH@std@@MBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=i386 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=arm ?do_encoding@codecvt_base@std@@MBAHXZ(ptr) codecvt_base_do_encoding
@ thiscall -arch=i386 ?do_encoding@codecvt_base@std@@MBEHXZ(ptr) codecvt_base_do_encoding
@ cdecl -arch=win64 ?do_encoding@codecvt_base@std@@MEBAHXZ(ptr) codecvt_base_do_encoding
......
dlls/msvcp120/msvcp120.spec
View file @ bd92393a
......@@ -1897,12 +1897,12 @@
@ stub -arch=arm ?do_date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MBA?AW4dateorder@time_base@2@XZ
@ stub -arch=i386 ?do_date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MBE?AW4dateorder@time_base@2@XZ
@ stub -arch=win64 ?do_date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MEBA?AW4dateorder@time_base@2@XZ
@ stub -arch=arm ?do_encoding@?$codecvt@GDH@std@@MBAHXZ
@ stub -arch=i386 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ
@ stub -arch=arm ?do_encoding@?$codecvt@_WDH@std@@MBAHXZ
@ stub -arch=i386 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ
@ cdecl -arch=arm ?do_encoding@?$codecvt@GDH@std@@MBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=i386 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=arm ?do_encoding@?$codecvt@_WDH@std@@MBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=i386 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=arm ?do_encoding@codecvt_base@std@@MBAHXZ(ptr) codecvt_base_do_encoding
@ thiscall -arch=i386 ?do_encoding@codecvt_base@std@@MBEHXZ(ptr) codecvt_base_do_encoding
@ cdecl -arch=win64 ?do_encoding@codecvt_base@std@@MEBAHXZ(ptr) codecvt_base_do_encoding
......
dlls/msvcp120_app/msvcp120_app.spec
View file @ bd92393a
......@@ -1897,12 +1897,12 @@
@ stub -arch=arm ?do_date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MBA?AW4dateorder@time_base@2@XZ
@ stub -arch=i386 ?do_date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MBE?AW4dateorder@time_base@2@XZ
@ stub -arch=win64 ?do_date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@MEBA?AW4dateorder@time_base@2@XZ
@ stub -arch=arm ?do_encoding@?$codecvt@GDH@std@@MBAHXZ
@ stub -arch=i386 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ
@ stub -arch=arm ?do_encoding@?$codecvt@_WDH@std@@MBAHXZ
@ stub -arch=i386 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ
@ cdecl -arch=arm ?do_encoding@?$codecvt@GDH@std@@MBAHXZ(ptr) msvcp120.?do_encoding@?$codecvt@GDH@std@@MBAHXZ
@ thiscall -arch=i386 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ(ptr) msvcp120.?do_encoding@?$codecvt@GDH@std@@MBEHXZ
@ cdecl -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ(ptr) msvcp120.?do_encoding@?$codecvt@GDH@std@@MEBAHXZ
@ cdecl -arch=arm ?do_encoding@?$codecvt@_WDH@std@@MBAHXZ(ptr) msvcp120.?do_encoding@?$codecvt@_WDH@std@@MBAHXZ
@ thiscall -arch=i386 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ(ptr) msvcp120.?do_encoding@?$codecvt@_WDH@std@@MBEHXZ
@ cdecl -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ(ptr) msvcp120.?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ
@ cdecl -arch=arm ?do_encoding@codecvt_base@std@@MBAHXZ(ptr) msvcp120.?do_encoding@codecvt_base@std@@MBAHXZ
@ thiscall -arch=i386 ?do_encoding@codecvt_base@std@@MBEHXZ(ptr) msvcp120.?do_encoding@codecvt_base@std@@MBEHXZ
@ cdecl -arch=win64 ?do_encoding@codecvt_base@std@@MEBAHXZ(ptr) msvcp120.?do_encoding@codecvt_base@std@@MEBAHXZ
......
dlls/msvcp60/msvcp60.spec
View file @ bd92393a
......@@ -2665,8 +2665,8 @@
@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@D@std@@MEBADXZ(ptr) numpunct_char_do_decimal_point
@ thiscall -arch=win32 ?do_decimal_point@?$numpunct@G@std@@MBEGXZ(ptr) numpunct_wchar_do_decimal_point
@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@G@std@@MEBAGXZ(ptr) numpunct_wchar_do_decimal_point
@ stub -arch=win32 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ
@ thiscall -arch=win32 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=win32 ?do_encoding@codecvt_base@std@@MBEHXZ(ptr) codecvt_base_do_encoding
@ cdecl -arch=win64 ?do_encoding@codecvt_base@std@@MEBAHXZ(ptr) codecvt_base_do_encoding
@ thiscall -arch=win32 ?do_falsename@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_falsename
......
dlls/msvcp70/msvcp70.spec
View file @ bd92393a
......@@ -2691,10 +2691,10 @@
@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@G@std@@MEBAGXZ(ptr) numpunct_wchar_do_decimal_point
@ thiscall -arch=win32 ?do_decimal_point@?$numpunct@_W@std@@MBE_WXZ(ptr) numpunct_wchar_do_decimal_point
@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@_W@std@@MEBA_WXZ(ptr) numpunct_wchar_do_decimal_point
@ stub -arch=win32 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ
@ stub -arch=win32 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ
@ thiscall -arch=win32 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=win32 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=i386 ?do_encoding@codecvt_base@std@@MBEHXZ(ptr) codecvt_base_do_encoding
@ cdecl -arch=win64 ?do_encoding@codecvt_base@std@@MEBAHXZ(ptr) codecvt_base_do_encoding
@ thiscall -arch=win32 ?do_falsename@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_falsename
......
dlls/msvcp71/msvcp71.spec
View file @ bd92393a
......@@ -2849,10 +2849,10 @@
@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@G@std@@MEBAGXZ(ptr) numpunct_wchar_do_decimal_point
@ thiscall -arch=win32 ?do_decimal_point@?$numpunct@_W@std@@MBE_WXZ(ptr) numpunct_wchar_do_decimal_point
@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@_W@std@@MEBA_WXZ(ptr) numpunct_wchar_do_decimal_point
@ stub -arch=win32 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ
@ stub -arch=win32 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ
@ thiscall -arch=win32 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=win32 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=win32 ?do_encoding@codecvt_base@std@@MBEHXZ(ptr) codecvt_base_do_encoding
@ cdecl -arch=win64 ?do_encoding@codecvt_base@std@@MEBAHXZ(ptr) codecvt_base_do_encoding
@ thiscall -arch=win32 ?do_falsename@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_falsename
......
dlls/msvcp80/msvcp80.spec
View file @ bd92393a
......@@ -3290,10 +3290,10 @@
@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@G@std@@MEBAGXZ(ptr) numpunct_wchar_do_decimal_point
@ thiscall -arch=win32 ?do_decimal_point@?$numpunct@_W@std@@MBE_WXZ(ptr) numpunct_wchar_do_decimal_point
@ cdecl -arch=win64 ?do_decimal_point@?$numpunct@_W@std@@MEBA_WXZ(ptr) numpunct_wchar_do_decimal_point
@ stub -arch=win32 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ
@ stub -arch=win32 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ
@ stub -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ
@ thiscall -arch=win32 ?do_encoding@?$codecvt@GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=win32 ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding
@ cdecl -arch=win64 ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding
@ thiscall -arch=i386 ?do_encoding@codecvt_base@std@@MBEHXZ(ptr) codecvt_base_do_encoding
@ cdecl -arch=win64 ?do_encoding@codecvt_base@std@@MEBAHXZ(ptr) codecvt_base_do_encoding
@ thiscall -arch=win32 ?do_falsename@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ(ptr ptr) numpunct_char_do_falsename
......
dlls/msvcp90/locale.c
View file @ bd92393a
......@@ -3784,6 +3784,17 @@ int __thiscall codecvt_wchar_do_max_length(const codecvt_wchar *this)
return MB_LEN_MAX;
}
/* ?do_encoding@?$codecvt@GDH@std@@MBEHXZ */
/* ?do_encoding@?$codecvt@GDH@std@@MEBAHXZ */
/* ?do_encoding@?$codecvt@_WDH@std@@MBEHXZ */
/* ?do_encoding@?$codecvt@_WDH@std@@MEBAHXZ */
DEFINE_THISCALL_WRAPPER(codecvt_wchar_do_encoding, 4)
int __thiscall codecvt_wchar_do_encoding(const codecvt_wchar *this)
{
TRACE("(%p)\n", this);
return 0;
}
/* ?do_in@?$codecvt@GDH@std@@MBEHAAHPBD1AAPBDPAG3AAPAG@Z */
/* ?do_in@?$codecvt@GDH@std@@MEBAHAEAHPEBD1AEAPEBDPEAG3AEAPEAG@Z */
/* ?do_in@?$codecvt@_WDH@std@@MBEHAAHPBD1AAPBDPA_W3AAPA_W@Z */
......@@ -11316,7 +11327,11 @@ void __asm_dummy_vtables(void) {
#endif
VTABLE_ADD_FUNC(codecvt_wchar_do_always_noconv)
VTABLE_ADD_FUNC(codecvt_wchar_do_max_length)
#if _MSVCP_VER >= 90 && _MSVCP_VER <= 100
VTABLE_ADD_FUNC(codecvt_base_do_encoding)
#else
VTABLE_ADD_FUNC(codecvt_wchar_do_encoding)
#endif
VTABLE_ADD_FUNC(codecvt_wchar_do_in)
VTABLE_ADD_FUNC(codecvt_wchar_do_out)
VTABLE_ADD_FUNC(codecvt_wchar_do_unshift)
......@@ -11329,7 +11344,11 @@ void __asm_dummy_vtables(void) {
#endif
VTABLE_ADD_FUNC(codecvt_wchar_do_always_noconv)
VTABLE_ADD_FUNC(codecvt_wchar_do_max_length)
#if _MSVCP_VER >= 90 && _MSVCP_VER <= 100
VTABLE_ADD_FUNC(codecvt_base_do_encoding)
#else
VTABLE_ADD_FUNC(codecvt_wchar_do_encoding)
#endif
VTABLE_ADD_FUNC(codecvt_wchar_do_in)
VTABLE_ADD_FUNC(codecvt_wchar_do_out)
VTABLE_ADD_FUNC(codecvt_wchar_do_unshift)
......
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