Module: wine
Branch: master
Commit: 82448136944462edcdf052edafbb6df666e840a3
URL:
http://source.winehq.org/git/wine.git/?a=commit;h=82448136944462edcdf052eda…
Author: Piotr Caban <piotr(a)codeweavers.com>
Date: Wed Sep 28 07:24:38 2016 +0200
msvcp140: Fix codecvt RTTI data.
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
dlls/msvcp90/locale.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 5c22577..b9abe8b 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -11196,9 +11196,15 @@ DEFINE_RTTI_DATA2(ctype_char, 0,
&ctype_base_rtti_base_descriptor, &locale_facet
DEFINE_RTTI_DATA2(ctype_wchar, 0, &ctype_base_rtti_base_descriptor,
&locale_facet_rtti_base_descriptor, ".?AV?$ctype@_W@std@@")
DEFINE_RTTI_DATA2(ctype_short, 0, &ctype_base_rtti_base_descriptor,
&locale_facet_rtti_base_descriptor, ".?AV?$ctype@G@std@@")
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_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
DEFINE_RTTI_DATA2(codecvt_char, 0, &codecvt_base_rtti_base_descriptor,
&locale_facet_rtti_base_descriptor, ".?AV?$codecvt@DDH@std@@")
DEFINE_RTTI_DATA2(codecvt_wchar, 0, &codecvt_base_rtti_base_descriptor,
&locale_facet_rtti_base_descriptor, ".?AV?$codecvt@_WDH@std@@")
DEFINE_RTTI_DATA2(codecvt_short, 0, &codecvt_base_rtti_base_descriptor,
&locale_facet_rtti_base_descriptor, ".?AV?$codecvt@GDH@std@@")
+#endif
DEFINE_RTTI_DATA1(numpunct_char, 0, &locale_facet_rtti_base_descriptor,
".?AV?$numpunct@D@std@@")
DEFINE_RTTI_DATA1(numpunct_wchar, 0, &locale_facet_rtti_base_descriptor,
".?AV?$numpunct@_W@std@@")
DEFINE_RTTI_DATA1(numpunct_short, 0, &locale_facet_rtti_base_descriptor,
".?AV?$numpunct@G@std@@")