From: Jactry Zeng jzeng@codeweavers.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47609 --- dlls/msvcp140/msvcp140.spec | 104 +++++++-------- dlls/msvcp90/locale.c | 247 ++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 14 ++ 3 files changed, 313 insertions(+), 52 deletions(-)
diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index a1a33787f31..32cdb9b8166 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -181,15 +181,15 @@ @ stub -arch=win64 ??0?$codecvt@_SDU_Mbstatet@@@std@@QEAA@AEBV_Locinfo@1@KW4_Codecvt_mode@1@_K@Z @ stub -arch=win64 ??0?$codecvt@_SDU_Mbstatet@@@std@@QEAA@AEBV_Locinfo@1@_K@Z @ stub -arch=win64 ??0?$codecvt@_SDU_Mbstatet@@@std@@QEAA@_K@Z -@ stub -arch=arm ??0?$codecvt@_UDU_Mbstatet@@@std@@QAA@ABV_Locinfo@1@I@Z -@ stub -arch=arm ??0?$codecvt@_UDU_Mbstatet@@@std@@QAA@ABV_Locinfo@1@KW4_Codecvt_mode@1@I@Z -@ stub -arch=arm ??0?$codecvt@_UDU_Mbstatet@@@std@@QAA@I@Z -@ stub -arch=i386 ??0?$codecvt@_UDU_Mbstatet@@@std@@QAE@ABV_Locinfo@1@I@Z -@ stub -arch=i386 ??0?$codecvt@_UDU_Mbstatet@@@std@@QAE@ABV_Locinfo@1@KW4_Codecvt_mode@1@I@Z -@ stub -arch=i386 ??0?$codecvt@_UDU_Mbstatet@@@std@@QAE@I@Z -@ stub -arch=win64 ??0?$codecvt@_UDU_Mbstatet@@@std@@QEAA@AEBV_Locinfo@1@KW4_Codecvt_mode@1@_K@Z -@ stub -arch=win64 ??0?$codecvt@_UDU_Mbstatet@@@std@@QEAA@AEBV_Locinfo@1@_K@Z -@ stub -arch=win64 ??0?$codecvt@_UDU_Mbstatet@@@std@@QEAA@_K@Z +@ cdecl -arch=arm ??0?$codecvt@_UDU_Mbstatet@@@std@@QAA@ABV_Locinfo@1@I@Z(ptr ptr long) codecvt_char32_ctor_locinfo +@ cdecl -arch=arm ??0?$codecvt@_UDU_Mbstatet@@@std@@QAA@ABV_Locinfo@1@KW4_Codecvt_mode@1@I@Z(ptr long long long) codecvt_char32_ctor_mode +@ cdecl -arch=arm ??0?$codecvt@_UDU_Mbstatet@@@std@@QAA@I@Z(ptr long) codecvt_char32_ctor_refs +@ thiscall -arch=i386 ??0?$codecvt@_UDU_Mbstatet@@@std@@QAE@ABV_Locinfo@1@I@Z(ptr ptr long) codecvt_char32_ctor_locinfo +@ thiscall -arch=i386 ??0?$codecvt@_UDU_Mbstatet@@@std@@QAE@ABV_Locinfo@1@KW4_Codecvt_mode@1@I@Z(ptr long long long) codecvt_char32_ctor_mode +@ thiscall -arch=i386 ??0?$codecvt@_UDU_Mbstatet@@@std@@QAE@I@Z(ptr long) codecvt_char32_ctor_refs +@ cdecl -arch=win64 ??0?$codecvt@_UDU_Mbstatet@@@std@@QEAA@AEBV_Locinfo@1@KW4_Codecvt_mode@1@_K@Z(ptr long long long) codecvt_char32_ctor_mode +@ cdecl -arch=win64 ??0?$codecvt@_UDU_Mbstatet@@@std@@QEAA@AEBV_Locinfo@1@_K@Z(ptr ptr long) codecvt_char32_ctor_locinfo +@ cdecl -arch=win64 ??0?$codecvt@_UDU_Mbstatet@@@std@@QEAA@_K@Z(ptr long) codecvt_char32_ctor_refs @ cdecl -arch=arm ??0?$codecvt@_WDU_Mbstatet@@@std@@QAA@ABV_Locinfo@1@I@Z(ptr ptr long) codecvt_wchar_ctor_locinfo @ cdecl -arch=arm ??0?$codecvt@_WDU_Mbstatet@@@std@@QAA@I@Z(ptr long) codecvt_wchar_ctor_refs @ thiscall -arch=i386 ??0?$codecvt@_WDU_Mbstatet@@@std@@QAE@ABV_Locinfo@1@I@Z(ptr ptr long) codecvt_wchar_ctor_locinfo @@ -427,9 +427,9 @@ @ stub -arch=arm ??1?$codecvt@_SDU_Mbstatet@@@std@@MAA@XZ @ stub -arch=i386 ??1?$codecvt@_SDU_Mbstatet@@@std@@MAE@XZ @ stub -arch=win64 ??1?$codecvt@_SDU_Mbstatet@@@std@@MEAA@XZ -@ stub -arch=arm ??1?$codecvt@_UDU_Mbstatet@@@std@@MAA@XZ -@ stub -arch=i386 ??1?$codecvt@_UDU_Mbstatet@@@std@@MAE@XZ -@ stub -arch=win64 ??1?$codecvt@_UDU_Mbstatet@@@std@@MEAA@XZ +@ cdecl -arch=arm ??1?$codecvt@_UDU_Mbstatet@@@std@@MAA@XZ(ptr) codecvt_char32_dtor +@ thiscall -arch=i386 ??1?$codecvt@_UDU_Mbstatet@@@std@@MAE@XZ(ptr) codecvt_char32_dtor +@ cdecl -arch=win64 ??1?$codecvt@_UDU_Mbstatet@@@std@@MEAA@XZ(ptr) codecvt_char32_dtor @ cdecl -arch=arm ??1?$codecvt@_WDU_Mbstatet@@@std@@MAA@XZ(ptr) codecvt_wchar_dtor @ thiscall -arch=i386 ??1?$codecvt@_WDU_Mbstatet@@@std@@MAE@XZ(ptr) codecvt_wchar_dtor @ cdecl -arch=win64 ??1?$codecvt@_WDU_Mbstatet@@@std@@MEAA@XZ(ptr) codecvt_wchar_dtor @@ -937,7 +937,7 @@ @ extern ??_7?$codecvt@DDU_Mbstatet@@@std@@6B@ codecvt_char_vtable @ extern ??_7?$codecvt@GDU_Mbstatet@@@std@@6B@ codecvt_short_vtable # extern ??_7?$codecvt@_SDU_Mbstatet@@@std@@6B@ -# extern ??_7?$codecvt@_UDU_Mbstatet@@@std@@6B@ +@ extern ??_7?$codecvt@_UDU_Mbstatet@@@std@@6B@ codecvt_char32_vtable @ extern ??_7?$codecvt@_WDU_Mbstatet@@@std@@6B@ codecvt_wchar_vtable @ extern ??_7?$ctype@D@std@@6B@ ctype_char_vtable @ extern ??_7?$ctype@G@std@@6B@ ctype_short_vtable @@ -1009,9 +1009,9 @@ @ stub -arch=arm ??_F?$codecvt@_SDU_Mbstatet@@@std@@QAAXXZ @ stub -arch=i386 ??_F?$codecvt@_SDU_Mbstatet@@@std@@QAEXXZ @ stub -arch=win64 ??_F?$codecvt@_SDU_Mbstatet@@@std@@QEAAXXZ -@ stub -arch=arm ??_F?$codecvt@_UDU_Mbstatet@@@std@@QAAXXZ -@ stub -arch=i386 ??_F?$codecvt@_UDU_Mbstatet@@@std@@QAEXXZ -@ stub -arch=win64 ??_F?$codecvt@_UDU_Mbstatet@@@std@@QEAAXXZ +@ cdecl -arch=arm ??_F?$codecvt@_UDU_Mbstatet@@@std@@QAAXXZ(ptr) codecvt_char32_ctor +@ thiscall -arch=i386 ??_F?$codecvt@_UDU_Mbstatet@@@std@@QAEXXZ(ptr) codecvt_char32_ctor +@ cdecl -arch=win64 ??_F?$codecvt@_UDU_Mbstatet@@@std@@QEAAXXZ(ptr) codecvt_char32_ctor @ cdecl -arch=arm ??_F?$codecvt@_WDU_Mbstatet@@@std@@QAAXXZ(ptr) codecvt_wchar_ctor @ thiscall -arch=i386 ??_F?$codecvt@_WDU_Mbstatet@@@std@@QAEXXZ(ptr) codecvt_wchar_ctor @ cdecl -arch=win64 ??_F?$codecvt@_WDU_Mbstatet@@@std@@QEAAXXZ(ptr) codecvt_wchar_ctor @@ -1356,9 +1356,9 @@ @ stub -arch=arm ?_Init@?$codecvt@_SDU_Mbstatet@@@std@@IAAXABV_Locinfo@2@@Z @ stub -arch=i386 ?_Init@?$codecvt@_SDU_Mbstatet@@@std@@IAEXABV_Locinfo@2@@Z @ stub -arch=win64 ?_Init@?$codecvt@_SDU_Mbstatet@@@std@@IEAAXAEBV_Locinfo@2@@Z -@ stub -arch=arm ?_Init@?$codecvt@_UDU_Mbstatet@@@std@@IAAXABV_Locinfo@2@@Z -@ stub -arch=i386 ?_Init@?$codecvt@_UDU_Mbstatet@@@std@@IAEXABV_Locinfo@2@@Z -@ stub -arch=win64 ?_Init@?$codecvt@_UDU_Mbstatet@@@std@@IEAAXAEBV_Locinfo@2@@Z +@ cdecl -arch=arm ?_Init@?$codecvt@_UDU_Mbstatet@@@std@@IAAXABV_Locinfo@2@@Z(ptr ptr) codecvt_char32__Init +@ thiscall -arch=i386 ?_Init@?$codecvt@_UDU_Mbstatet@@@std@@IAEXABV_Locinfo@2@@Z(ptr ptr) codecvt_char32__Init +@ cdecl -arch=win64 ?_Init@?$codecvt@_UDU_Mbstatet@@@std@@IEAAXAEBV_Locinfo@2@@Z(ptr ptr) codecvt_char32__Init @ cdecl -arch=arm ?_Init@?$codecvt@_WDU_Mbstatet@@@std@@IAAXABV_Locinfo@2@@Z(ptr ptr) codecvt_wchar__Init @ thiscall -arch=i386 ?_Init@?$codecvt@_WDU_Mbstatet@@@std@@IAEXABV_Locinfo@2@@Z(ptr ptr) codecvt_wchar__Init @ cdecl -arch=win64 ?_Init@?$codecvt@_WDU_Mbstatet@@@std@@IEAAXAEBV_Locinfo@2@@Z(ptr ptr) codecvt_wchar__Init @@ -1789,9 +1789,9 @@ @ stub -arch=arm ?do_always_noconv@?$codecvt@_SDU_Mbstatet@@@std@@MBA_NXZ @ stub -arch=i386 ?do_always_noconv@?$codecvt@_SDU_Mbstatet@@@std@@MBE_NXZ @ stub -arch=win64 ?do_always_noconv@?$codecvt@_SDU_Mbstatet@@@std@@MEBA_NXZ -@ stub -arch=arm ?do_always_noconv@?$codecvt@_UDU_Mbstatet@@@std@@MBA_NXZ -@ stub -arch=i386 ?do_always_noconv@?$codecvt@_UDU_Mbstatet@@@std@@MBE_NXZ -@ stub -arch=win64 ?do_always_noconv@?$codecvt@_UDU_Mbstatet@@@std@@MEBA_NXZ +@ cdecl -arch=arm ?do_always_noconv@?$codecvt@_UDU_Mbstatet@@@std@@MBA_NXZ(ptr) codecvt_char32_do_always_noconv +@ thiscall -arch=i386 ?do_always_noconv@?$codecvt@_UDU_Mbstatet@@@std@@MBE_NXZ(ptr) codecvt_char32_do_always_noconv +@ cdecl -arch=win64 ?do_always_noconv@?$codecvt@_UDU_Mbstatet@@@std@@MEBA_NXZ(ptr) codecvt_char32_do_always_noconv @ cdecl -arch=arm ?do_always_noconv@?$codecvt@_WDU_Mbstatet@@@std@@MBA_NXZ(ptr) codecvt_wchar_do_always_noconv @ thiscall -arch=i386 ?do_always_noconv@?$codecvt@_WDU_Mbstatet@@@std@@MBE_NXZ(ptr) codecvt_wchar_do_always_noconv @ cdecl -arch=win64 ?do_always_noconv@?$codecvt@_WDU_Mbstatet@@@std@@MEBA_NXZ(ptr) codecvt_wchar_do_always_noconv @@ -1813,9 +1813,9 @@ @ stub -arch=arm ?do_encoding@?$codecvt@_SDU_Mbstatet@@@std@@MBAHXZ @ stub -arch=i386 ?do_encoding@?$codecvt@_SDU_Mbstatet@@@std@@MBEHXZ @ stub -arch=win64 ?do_encoding@?$codecvt@_SDU_Mbstatet@@@std@@MEBAHXZ -@ stub -arch=arm ?do_encoding@?$codecvt@_UDU_Mbstatet@@@std@@MBAHXZ -@ stub -arch=i386 ?do_encoding@?$codecvt@_UDU_Mbstatet@@@std@@MBEHXZ -@ stub -arch=win64 ?do_encoding@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHXZ +@ cdecl -arch=arm ?do_encoding@?$codecvt@_UDU_Mbstatet@@@std@@MBAHXZ(ptr) codecvt_char32_do_encoding +@ thiscall -arch=i386 ?do_encoding@?$codecvt@_UDU_Mbstatet@@@std@@MBEHXZ(ptr) codecvt_char32_do_encoding +@ cdecl -arch=win64 ?do_encoding@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHXZ(ptr) codecvt_char32_do_encoding @ cdecl -arch=arm ?do_encoding@?$codecvt@_WDU_Mbstatet@@@std@@MBAHXZ(ptr) codecvt_wchar_do_encoding @ thiscall -arch=i386 ?do_encoding@?$codecvt@_WDU_Mbstatet@@@std@@MBEHXZ(ptr) codecvt_wchar_do_encoding @ cdecl -arch=win64 ?do_encoding@?$codecvt@_WDU_Mbstatet@@@std@@MEBAHXZ(ptr) codecvt_wchar_do_encoding @@ -1984,9 +1984,9 @@ @ stub -arch=arm ?do_in@?$codecvt@_SDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PBD1AAPBDPA_S3AAPA_S@Z @ stub -arch=i386 ?do_in@?$codecvt@_SDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1AAPBDPA_S3AAPA_S@Z @ stub -arch=win64 ?do_in@?$codecvt@_SDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_S3AEAPEA_S@Z -@ stub -arch=arm ?do_in@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z -@ stub -arch=i386 ?do_in@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z -@ stub -arch=win64 ?do_in@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_U3AEAPEA_U@Z +@ cdecl -arch=arm ?do_in@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_char32_do_in +@ thiscall -arch=i386 ?do_in@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_char32_do_in +@ cdecl -arch=win64 ?do_in@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_U3AEAPEA_U@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_char32_do_in @ cdecl -arch=arm ?do_in@?$codecvt@_WDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PBD1AAPBDPA_W3AAPA_W@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_wchar_do_in @ thiscall -arch=i386 ?do_in@?$codecvt@_WDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1AAPBDPA_W3AAPA_W@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_wchar_do_in @ cdecl -arch=win64 ?do_in@?$codecvt@_WDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_W3AEAPEA_W@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_wchar_do_in @@ -2011,9 +2011,9 @@ @ stub -arch=arm ?do_length@?$codecvt@_SDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PBD1I@Z @ stub -arch=i386 ?do_length@?$codecvt@_SDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1I@Z @ stub -arch=win64 ?do_length@?$codecvt@_SDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1_K@Z -@ stub -arch=arm ?do_length@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PBD1I@Z -@ stub -arch=i386 ?do_length@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1I@Z -@ stub -arch=win64 ?do_length@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1_K@Z +@ cdecl -arch=arm ?do_length@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PBD1I@Z(ptr ptr str str long) codecvt_char32_do_length +@ thiscall -arch=i386 ?do_length@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1I@Z(ptr ptr str str long) codecvt_char32_do_length +@ cdecl -arch=win64 ?do_length@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1_K@Z(ptr ptr str str long) codecvt_char32_do_length @ cdecl -arch=arm ?do_length@?$codecvt@_WDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PBD1I@Z(ptr ptr str str long) codecvt_wchar_do_length @ thiscall -arch=i386 ?do_length@?$codecvt@_WDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1I@Z(ptr ptr str str long) codecvt_wchar_do_length @ cdecl -arch=win64 ?do_length@?$codecvt@_WDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1_K@Z(ptr ptr str str long) codecvt_wchar_do_length @@ -2023,9 +2023,9 @@ @ stub -arch=arm ?do_max_length@?$codecvt@_SDU_Mbstatet@@@std@@MBAHXZ @ stub -arch=i386 ?do_max_length@?$codecvt@_SDU_Mbstatet@@@std@@MBEHXZ @ stub -arch=win64 ?do_max_length@?$codecvt@_SDU_Mbstatet@@@std@@MEBAHXZ -@ stub -arch=arm ?do_max_length@?$codecvt@_UDU_Mbstatet@@@std@@MBAHXZ -@ stub -arch=i386 ?do_max_length@?$codecvt@_UDU_Mbstatet@@@std@@MBEHXZ -@ stub -arch=win64 ?do_max_length@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHXZ +@ cdecl -arch=arm ?do_max_length@?$codecvt@_UDU_Mbstatet@@@std@@MBAHXZ(ptr) codecvt_char32_do_max_length +@ thiscall -arch=i386 ?do_max_length@?$codecvt@_UDU_Mbstatet@@@std@@MBEHXZ(ptr) codecvt_char32_do_max_length +@ cdecl -arch=win64 ?do_max_length@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHXZ(ptr) codecvt_char32_do_max_length @ cdecl -arch=arm ?do_max_length@?$codecvt@_WDU_Mbstatet@@@std@@MBAHXZ(ptr) codecvt_wchar_do_max_length @ thiscall -arch=i386 ?do_max_length@?$codecvt@_WDU_Mbstatet@@@std@@MBEHXZ(ptr) codecvt_wchar_do_max_length @ cdecl -arch=win64 ?do_max_length@?$codecvt@_WDU_Mbstatet@@@std@@MEBAHXZ(ptr) codecvt_wchar_do_max_length @@ -2059,9 +2059,9 @@ @ stub -arch=arm ?do_out@?$codecvt@_SDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PB_S1AAPB_SPAD3AAPAD@Z @ stub -arch=i386 ?do_out@?$codecvt@_SDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PB_S1AAPB_SPAD3AAPAD@Z @ stub -arch=win64 ?do_out@?$codecvt@_SDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEB_S1AEAPEB_SPEAD3AEAPEAD@Z -@ stub -arch=arm ?do_out@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z -@ stub -arch=i386 ?do_out@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z -@ stub -arch=win64 ?do_out@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEB_U1AEAPEB_UPEAD3AEAPEAD@Z +@ cdecl -arch=arm ?do_out@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z(ptr ptr ptr ptr ptr ptr ptr ptr) codecvt_char32_do_out +@ thiscall -arch=i386 ?do_out@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z(ptr ptr ptr ptr ptr ptr ptr ptr) codecvt_char32_do_out +@ cdecl -arch=win64 ?do_out@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEB_U1AEAPEB_UPEAD3AEAPEAD@Z(ptr ptr ptr ptr ptr ptr ptr ptr) codecvt_char32_do_out @ cdecl -arch=arm ?do_out@?$codecvt@_WDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PB_W1AAPB_WPAD3AAPAD@Z(ptr ptr wstr wstr ptr ptr ptr ptr) codecvt_wchar_do_out @ thiscall -arch=i386 ?do_out@?$codecvt@_WDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PB_W1AAPB_WPAD3AAPAD@Z(ptr ptr wstr wstr ptr ptr ptr ptr) codecvt_wchar_do_out @ cdecl -arch=win64 ?do_out@?$codecvt@_WDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEB_W1AEAPEB_WPEAD3AEAPEAD@Z(ptr ptr wstr wstr ptr ptr ptr ptr) codecvt_wchar_do_out @@ -2203,9 +2203,9 @@ @ stub -arch=arm ?do_unshift@?$codecvt@_SDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PAD1AAPAD@Z @ stub -arch=i386 ?do_unshift@?$codecvt@_SDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PAD1AAPAD@Z @ stub -arch=win64 ?do_unshift@?$codecvt@_SDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z -@ stub -arch=arm ?do_unshift@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PAD1AAPAD@Z -@ stub -arch=i386 ?do_unshift@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PAD1AAPAD@Z -@ stub -arch=win64 ?do_unshift@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z +@ cdecl -arch=arm ?do_unshift@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PAD1AAPAD@Z(ptr ptr ptr ptr ptr) codecvt_char32_do_unshift +@ thiscall -arch=i386 ?do_unshift@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PAD1AAPAD@Z(ptr ptr ptr ptr ptr) codecvt_char32_do_unshift +@ cdecl -arch=win64 ?do_unshift@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z(ptr ptr ptr ptr ptr) codecvt_char32_do_unshift @ cdecl -arch=arm ?do_unshift@?$codecvt@_WDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PAD1AAPAD@Z(ptr ptr ptr ptr ptr) codecvt_wchar_do_unshift @ thiscall -arch=i386 ?do_unshift@?$codecvt@_WDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PAD1AAPAD@Z(ptr ptr ptr ptr ptr) codecvt_wchar_do_unshift @ cdecl -arch=win64 ?do_unshift@?$codecvt@_WDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z(ptr ptr ptr ptr ptr) codecvt_wchar_do_unshift @@ -2672,9 +2672,9 @@ @ stub -arch=arm ?in@?$codecvt@_SDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1AAPBDPA_S3AAPA_S@Z @ stub -arch=i386 ?in@?$codecvt@_SDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1AAPBDPA_S3AAPA_S@Z @ stub -arch=win64 ?in@?$codecvt@_SDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_S3AEAPEA_S@Z -@ stub -arch=arm ?in@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z -@ stub -arch=i386 ?in@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z -@ stub -arch=win64 ?in@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_U3AEAPEA_U@Z +@ cdecl -arch=arm ?in@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_char32_in +@ thiscall -arch=i386 ?in@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_char32_in +@ cdecl -arch=win64 ?in@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_U3AEAPEA_U@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_char32_in @ cdecl -arch=arm ?in@?$codecvt@_WDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1AAPBDPA_W3AAPA_W@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_wchar_in @ thiscall -arch=i386 ?in@?$codecvt@_WDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1AAPBDPA_W3AAPA_W@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_wchar_in @ cdecl -arch=win64 ?in@?$codecvt@_WDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_W3AEAPEA_W@Z(ptr ptr str str ptr ptr ptr ptr) codecvt_wchar_in @@ -2750,9 +2750,9 @@ @ stub -arch=arm ?length@?$codecvt@_SDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1I@Z @ stub -arch=i386 ?length@?$codecvt@_SDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1I@Z @ stub -arch=win64 ?length@?$codecvt@_SDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1_K@Z -@ stub -arch=arm ?length@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1I@Z -@ stub -arch=i386 ?length@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1I@Z -@ stub -arch=win64 ?length@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1_K@Z +@ cdecl -arch=arm ?length@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1I@Z(ptr ptr str str long) codecvt_char32_length +@ thiscall -arch=i386 ?length@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1I@Z(ptr ptr str str long) codecvt_char32_length +@ cdecl -arch=win64 ?length@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1_K@Z(ptr ptr str str long) codecvt_char32_length @ cdecl -arch=arm ?length@?$codecvt@_WDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1I@Z(ptr ptr str str long) codecvt_wchar_length @ thiscall -arch=i386 ?length@?$codecvt@_WDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1I@Z(ptr ptr str str long) codecvt_wchar_length @ cdecl -arch=win64 ?length@?$codecvt@_WDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1_K@Z(ptr ptr str str long) codecvt_wchar_length @@ -2831,9 +2831,9 @@ @ stub -arch=arm ?out@?$codecvt@_SDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PB_S1AAPB_SPAD3AAPAD@Z @ stub -arch=i386 ?out@?$codecvt@_SDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PB_S1AAPB_SPAD3AAPAD@Z @ stub -arch=win64 ?out@?$codecvt@_SDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEB_S1AEAPEB_SPEAD3AEAPEAD@Z -@ stub -arch=arm ?out@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z -@ stub -arch=i386 ?out@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z -@ stub -arch=win64 ?out@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEB_U1AEAPEB_UPEAD3AEAPEAD@Z +@ cdecl -arch=arm ?out@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z(ptr ptr ptr ptr ptr ptr ptr ptr) codecvt_char32_out +@ thiscall -arch=i386 ?out@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z(ptr ptr ptr ptr ptr ptr ptr ptr) codecvt_char32_out +@ cdecl -arch=win64 ?out@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEB_U1AEAPEB_UPEAD3AEAPEAD@Z(ptr ptr ptr ptr ptr ptr ptr ptr) codecvt_char32_out @ cdecl -arch=arm ?out@?$codecvt@_WDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PB_W1AAPB_WPAD3AAPAD@Z(ptr ptr wstr wstr ptr ptr ptr ptr) codecvt_wchar_out @ thiscall -arch=i386 ?out@?$codecvt@_WDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PB_W1AAPB_WPAD3AAPAD@Z(ptr ptr wstr wstr ptr ptr ptr ptr) codecvt_wchar_out @ cdecl -arch=win64 ?out@?$codecvt@_WDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEB_W1AEAPEB_WPEAD3AEAPEAD@Z(ptr ptr wstr wstr ptr ptr ptr ptr) codecvt_wchar_out @@ -3544,9 +3544,9 @@ @ stub -arch=arm ?unshift@?$codecvt@_SDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PAD1AAPAD@Z @ stub -arch=i386 ?unshift@?$codecvt@_SDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PAD1AAPAD@Z @ stub -arch=win64 ?unshift@?$codecvt@_SDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z -@ stub -arch=arm ?unshift@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PAD1AAPAD@Z -@ stub -arch=i386 ?unshift@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PAD1AAPAD@Z -@ stub -arch=win64 ?unshift@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z +@ cdecl -arch=arm ?unshift@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PAD1AAPAD@Z(ptr ptr ptr ptr ptr) codecvt_char32_unshift +@ thiscall -arch=i386 ?unshift@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PAD1AAPAD@Z(ptr ptr ptr ptr ptr) codecvt_char32_unshift +@ cdecl -arch=win64 ?unshift@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z(ptr ptr ptr ptr ptr) codecvt_char32_unshift @ cdecl -arch=arm ?unshift@?$codecvt@_WDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PAD1AAPAD@Z(ptr ptr ptr ptr ptr) codecvt_wchar_unshift @ thiscall -arch=i386 ?unshift@?$codecvt@_WDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PAD1AAPAD@Z(ptr ptr ptr ptr ptr) codecvt_wchar_unshift @ cdecl -arch=win64 ?unshift@?$codecvt@_WDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z(ptr ptr ptr ptr ptr) codecvt_wchar_unshift diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6f2288bce1c..4a5049ef75e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -27,6 +27,7 @@ #include "stdio.h" #include "wchar.h" #include "wctype.h" +#include "uchar.h" #include "time.h" #include "windef.h" #include "winbase.h" @@ -3994,6 +3995,235 @@ int __thiscall codecvt_wchar_length(const codecvt_wchar *this, const _Mbstatet * return call_codecvt_wchar_do_length(this, state, from, from_end, max); }
+#if _MSVCP_VER >= 140 + +/* ??_7?$codecvt@_UDU_Mbstatet@@@std@@6B@ */ +extern const vtable_ptr codecvt_char32_vtable; + +/* ?_Init@?$codecvt@_UDU_Mbstatet@@@std@@IAAXABV_Locinfo@2@@Z */ +/* ?_Init@?$codecvt@_UDU_Mbstatet@@@std@@IAEXABV_Locinfo@2@@Z */ +/* ?_Init@?$codecvt@_UDU_Mbstatet@@@std@@IEAAXAEBV_Locinfo@2@@Z */ +DEFINE_THISCALL_WRAPPER(codecvt_char32__Init, 8) +void __thiscall codecvt_char32__Init(codecvt_char32 *this, const _Locinfo *locinfo) +{ + FIXME("(%p %p) stub\n", this, locinfo); +} + +/* ??0?$codecvt@_UDU_Mbstatet@@@std@@QAA@ABV_Locinfo@1@I@Z */ +/* ??0?$codecvt@_UDU_Mbstatet@@@std@@QAE@ABV_Locinfo@1@I@Z */ +/* ??0?$codecvt@_UDU_Mbstatet@@@std@@QEAA@AEBV_Locinfo@1@_K@Z */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_ctor_locinfo, 12) +codecvt_char32* __thiscall codecvt_char32_ctor_locinfo(codecvt_char32 *this, const _Locinfo *locinfo, size_t refs) +{ + FIXME("(%p %p %Iu) stub\n", this, locinfo, refs); + return NULL; +} + +/* ??0?$codecvt@_UDU_Mbstatet@@@std@@QAA@I@Z */ +/* ??0?$codecvt@_UDU_Mbstatet@@@std@@QAE@I@Z */ +/* ??0?$codecvt@_UDU_Mbstatet@@@std@@QEAA@_K@Z */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_ctor_refs, 8) +codecvt_char* __thiscall codecvt_char32_ctor_refs(codecvt_char32 *this, size_t refs) +{ + FIXME("(%p %Iu) stub\n", this, refs); + return NULL; +} + +/* ??0?$codecvt@_UDU_Mbstatet@@@std@@QAA@ABV_Locinfo@1@KW4_Codecvt_mode@1@I@Z */ +/* ??0?$codecvt@_UDU_Mbstatet@@@std@@QAE@ABV_Locinfo@1@KW4_Codecvt_mode@1@I@Z */ +/* ??0?$codecvt@_UDU_Mbstatet@@@std@@QEAA@AEBV_Locinfo@1@KW4_Codecvt_mode@1@_K@Z */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_ctor_mode, 16) +codecvt_char32* __thiscall codecvt_char32_ctor_mode(codecvt_char32 *this, ULONG max_code, + codecvt_convert_mode mode, size_t refs) +{ + FIXME("(%p %ld %d %Iu) stub\n", this, max_code, mode, refs); + return NULL; +} + +/* ??_F?$codecvt@_UDU_Mbstatet@@@std@@QAAXXZ */ +/* ??_F?$codecvt@_UDU_Mbstatet@@@std@@QAEXXZ */ +/* ??_F?$codecvt@_UDU_Mbstatet@@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_ctor, 4) +codecvt_char* __thiscall codecvt_char32_ctor(codecvt_char32 *this) +{ + FIXME("(%p) stub\n", this); + return NULL; +} + +/* ??1?$codecvt@_UDU_Mbstatet@@@std@@MAA@XZ */ +/* ??1?$codecvt@_UDU_Mbstatet@@@std@@MAE@XZ */ +/* ??1?$codecvt@_UDU_Mbstatet@@@std@@MEAA@XZ */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_dtor, 4) +void __thiscall codecvt_char32_dtor(codecvt_char32 *this) +{ + FIXME("(%p) stub\n", this); +} + +DEFINE_THISCALL_WRAPPER(codecvt_char32_vector_dtor, 8) +codecvt_char32* __thiscall codecvt_char32_vector_dtor(codecvt_char32 *this, unsigned int flags) +{ + TRACE("(%p %x)\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + INT_PTR i, *ptr = (INT_PTR *)this-1; + + for(i=*ptr-1; i>=0; i--) + codecvt_char32_dtor(this+i); + operator_delete(ptr); + } else { + codecvt_char32_dtor(this); + if(flags & 1) + operator_delete(this); + } + + return this; +} + +/* ?do_always_noconv@?$codecvt@_UDU_Mbstatet@@@std@@MBA_NXZ */ +/* ?do_always_noconv@?$codecvt@_UDU_Mbstatet@@@std@@MBE_NXZ */ +/* ?do_always_noconv@?$codecvt@_UDU_Mbstatet@@@std@@MEBA_NXZ */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_do_always_noconv, 4) +bool __thiscall codecvt_char32_do_always_noconv(const codecvt_char32 *this) +{ + FIXME("(%p) stub\n", this); + return 0; +} + +/* ?do_encoding@?$codecvt@_UDU_Mbstatet@@@std@@MBAHXZ */ +/* ?do_encoding@?$codecvt@_UDU_Mbstatet@@@std@@MBEHXZ */ +/* ?do_encoding@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHXZ */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_do_encoding, 4) +int __thiscall codecvt_char32_do_encoding(const codecvt_char32 *this) +{ + FIXME("(%p) stub\n", this); + return 0; +} + +/* ?do_in@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z */ +/* ?do_in@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z */ +/* ?do_in@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_U3AEAPEA_U@Z */ +#define call_codecvt_char32_do_in(this, state, from, from_end, from_next, to, to_end, to_next) \ + CALL_VTBL_FUNC(this, 24, int, \ + (const codecvt_char32*, _Mbstatet*, const char*, const char*, const char**, \ + char32_t*, char32_t*, char32_t**), \ + (this, state, from, from_end, from_next, to, to_end, to_next)) +DEFINE_THISCALL_WRAPPER(codecvt_char32_do_in, 32) +int __thiscall codecvt_char32_do_in(const codecvt_char32 *this, _Mbstatet *state, + const char *from, const char *from_end, const char **from_next, + char32_t *to, char32_t *to_end, char32_t **to_next) +{ + FIXME("(%p %p %p %p %p %p %p %p) stub\n", this, state, from, + from_end, from_next, to, to_end, to_next); + return 0; +} + +/* ?in@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z */ +/* ?in@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1AAPBDPA_U3AAPA_U@Z */ +/* ?in@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1AEAPEBDPEA_U3AEAPEA_U@Z */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_in, 32) +int __thiscall codecvt_char32_in(const codecvt_char32 *this, _Mbstatet *state, + const char *from, const char *from_end, const char **from_next, + char32_t *to, char32_t *to_end, char32_t **to_next) +{ + TRACE("(%p %p %p %p %p %p %p %p)\n", this, state, from, from_end, + from_next, to, to_end, to_next); + return call_codecvt_char32_do_in(this, state, from, from_end, from_next, + to, to_end, to_next); +} + +/* ?do_length@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PBD1I@Z */ +/* ?do_length@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PBD1I@Z */ +/* ?do_length@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEBD1_K@Z */ +#define call_codecvt_char32_do_length(this, state, from, from_end, max) CALL_VTBL_FUNC(this, 36, \ + int, (const codecvt_char32*, const _Mbstatet*, const char*, const char*, size_t), \ + (this, state, from, from_end, max)) +DEFINE_THISCALL_WRAPPER(codecvt_char32_do_length, 20) +int __thiscall codecvt_char32_do_length(const codecvt_char32 *this, const _Mbstatet *state, + const char *from, const char *from_end, size_t max) +{ + FIXME("(%p %p %p %p %Iu) stub\n", this, state, from, from_end, max); + return 0; +} + + +/* ?length@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1I@Z */ +/* ?length@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PBD1I@Z */ +/* ?length@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEBD1_K@Z */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_length, 20) +int __thiscall codecvt_char32_length(const codecvt_char32 *this, const _Mbstatet *state, + const char *from, const char *from_end, size_t max) +{ + TRACE("(%p %p %p %p %Iu)\n", this, state, from, from_end, max); + return call_codecvt_char32_do_length(this, state, from, from_end, max); +} + +/* ?do_max_length@?$codecvt@_UDU_Mbstatet@@@std@@MBAHXZ */ +/* ?do_max_length@?$codecvt@_UDU_Mbstatet@@@std@@MBEHXZ */ +/* ?do_max_length@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHXZ */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_do_max_length, 4) +int __thiscall codecvt_char32_do_max_length(const codecvt_char32 *this) +{ + FIXME("(%p) stub\n", this); + return 0; +} + +/* ?do_out@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z */ +/* ?do_out@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z */ +/* ?do_out@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEB_U1AEAPEB_UPEAD3AEAPEAD@Z */ +#define call_codecvt_char32_do_out(this, state, from, from_end, from_next, to, to_end, to_next) \ + CALL_VTBL_FUNC(this, 28, int, \ + (const codecvt_char32*, _Mbstatet*, const char32_t*, const char32_t*, const char32_t**, \ + char*, char*, char**), \ + (this, state, from, from_end, from_next, to, to_end, to_next)) +DEFINE_THISCALL_WRAPPER(codecvt_char32_do_out, 32) +int __thiscall codecvt_char32_do_out(const codecvt_char32 *this, _Mbstatet *state, + const char32_t *from, const char32_t *from_end, const char32_t **from_next, + char *to, char *to_end, char **to_next) +{ + FIXME("(%p %p %p %p %p %p %p %p) stub\n", this, state, from, + from_end, from_next, to, to_end, to_next); + return 0; +} + +/* ?out@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z */ +/* ?out@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PB_U1AAPB_UPAD3AAPAD@Z */ +/* ?out@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEB_U1AEAPEB_UPEAD3AEAPEAD@Z */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_out, 32) +int __thiscall codecvt_char32_out(const codecvt_char32 *this, _Mbstatet *state, + const char32_t *from, const char32_t *from_end, const char32_t **from_next, + char *to, char *to_end, char **to_next) +{ + TRACE("(%p %p %p %p %p %p %p %p)\n", this, state, from, + from_end, from_next, to, to_end, to_next); + return call_codecvt_char32_do_out(this, state, from, + from_end, from_next, to, to_end, to_next); +} + +/* ?do_unshift@?$codecvt@_UDU_Mbstatet@@@std@@MBAHAAU_Mbstatet@@PAD1AAPAD@Z */ +/* ?do_unshift@?$codecvt@_UDU_Mbstatet@@@std@@MBEHAAU_Mbstatet@@PAD1AAPAD@Z */ +/* ?do_unshift@?$codecvt@_UDU_Mbstatet@@@std@@MEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z */ +#define call_codecvt_char32_do_unshift(this, state, to, to_end, to_next) CALL_VTBL_FUNC(this, 32, \ + int, (const codecvt_char32*, _Mbstatet*, char*, char*, char**), (this, state, to, to_end, to_next)) +DEFINE_THISCALL_WRAPPER(codecvt_char32_do_unshift, 20) +int __thiscall codecvt_char32_do_unshift(const codecvt_char32 *this, + _Mbstatet *state, char *to, char *to_end, char **to_next) +{ + FIXME("(%p %p %p %p %p) stub\n", this, state, to, to_end, to_next); + return 0; +} + +/* ?unshift@?$codecvt@_UDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PAD1AAPAD@Z */ +/* ?unshift@?$codecvt@_UDU_Mbstatet@@@std@@QBEHAAU_Mbstatet@@PAD1AAPAD@Z */ +/* ?unshift@?$codecvt@_UDU_Mbstatet@@@std@@QEBAHAEAU_Mbstatet@@PEAD1AEAPEAD@Z */ +DEFINE_THISCALL_WRAPPER(codecvt_char32_unshift, 20) +int __thiscall codecvt_char32_unshift(const codecvt_char32 *this, + _Mbstatet *state, char *to, char *to_end, char **to_next) +{ + TRACE("(%p %p %p %p %p)\n", this, state, to, to_end, to_next); + return call_codecvt_char32_do_unshift(this, state, to, to_end, to_next); +} +#endif + /* ?id@?$numpunct@D@std@@2V0locale@2@A */ locale_id numpunct_char_id = {0};
@@ -12444,6 +12674,7 @@ DEFINE_RTTI_DATA2(ctype_short, 0, &ctype_base_rtti_base_descriptor, &locale_face DEFINE_RTTI_DATA1(codecvt_base, 0, &locale_facet_rtti_base_descriptor, ".?AVcodecvt_base@std@@") #if _MSVCP_VER >= 140 DEFINE_RTTI_DATA2(codecvt_char, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt@DDU_Mbstatet@@@std@@") +DEFINE_RTTI_DATA2(codecvt_char32, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt@_UDU@std@@") DEFINE_RTTI_DATA2(codecvt_wchar, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt@_WDU_Mbstatet@@@std@@") DEFINE_RTTI_DATA2(codecvt_short, 0, &codecvt_base_rtti_base_descriptor, &locale_facet_rtti_base_descriptor, ".?AV?$codecvt@GDU_Mbstatet@@@std@@") #else @@ -12619,6 +12850,19 @@ __ASM_BLOCK_BEGIN(locale_vtables) VTABLE_ADD_FUNC(codecvt_char_do_out) VTABLE_ADD_FUNC(codecvt_char_do_unshift) VTABLE_ADD_FUNC(codecvt_char_do_length)); +#if _MSVCP_VER >= 140 + __ASM_VTABLE(codecvt_char32, + VTABLE_ADD_FUNC(codecvt_char32_vector_dtor) + VTABLE_ADD_FUNC(locale_facet__Incref) + VTABLE_ADD_FUNC(locale_facet__Decref) + VTABLE_ADD_FUNC(codecvt_char32_do_always_noconv) + VTABLE_ADD_FUNC(codecvt_char32_do_max_length) + VTABLE_ADD_FUNC(codecvt_char32_do_encoding) + VTABLE_ADD_FUNC(codecvt_char32_do_in) + VTABLE_ADD_FUNC(codecvt_char32_do_out) + VTABLE_ADD_FUNC(codecvt_char32_do_unshift) + VTABLE_ADD_FUNC(codecvt_char32_do_length)); +#endif __ASM_VTABLE(codecvt_wchar, VTABLE_ADD_FUNC(codecvt_wchar_vector_dtor) #if _MSVCP_VER >= 110 @@ -12849,6 +13093,9 @@ void init_locale(void *base) init_ctype_short_rtti(base); init_codecvt_base_rtti(base); init_codecvt_char_rtti(base); +#if _MSVCP_VER >= 140 + init_codecvt_char32_rtti(base); +#endif init_codecvt_wchar_rtti(base); init_codecvt_short_rtti(base); init_numpunct_char_rtti(base); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 69f1785a32b..b9359c33ff1 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -236,6 +236,20 @@ typedef struct { codecvt_base base; } codecvt_char;
+#if _MSVCP_VER >= 140 +typedef enum convert_mode +{ + consume_header = 4, + generate_header = 2, + little_endian = 1 +} codecvt_convert_mode; + +/* class codecvt<char32> */ +typedef struct { + codecvt_base base; +} codecvt_char32; +#endif + bool __thiscall codecvt_base_always_noconv(const codecvt_base*); int __thiscall codecvt_char_unshift(const codecvt_char*, _Mbstatet*, char*, char*, char**); int __thiscall codecvt_char_out(const codecvt_char*, _Mbstatet*, const char*,