[3/4] msvcp90: Add stubs for codecvt dtors (try 2)

William Panlener wpanlener at gmail.com
Fri Apr 20 21:42:58 CDT 2012


---
 dlls/msvcp90/locale.c     |   35 +++++++++++++++++++++++++++++++++++
 dlls/msvcp90/msvcp90.spec |   16 ++++++++--------
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 64bd1f8..3a9babc 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -680,6 +680,41 @@ _Timevec*__thiscall _Locinfo__Gettnames(const _Locinfo *this, _Timevec *ret)
     return ret;
 }
 
+/* ??1codecvt_base at std@@UAE at XZ */
+/* ??1codecvt_base at std@@UEAA at XZ */
+DEFINE_THISCALL_WRAPPER(codecvt_base_dtor, 4)
+void __thiscall codecvt_base_dtor(codecvt_base *this)
+{
+    FIXME("(%p) stub!\n", this);
+}
+
+/* ??1?$codecvt at DDH@std@@MAE at XZ */
+/* ??1?$codecvt at DDH@std@@MEAA at XZ */
+DEFINE_THISCALL_WRAPPER(codecvt_char_dtor, 4)
+void __thiscall codecvt_char_dtor(codecvt_char *this)
+{
+    FIXME("(%p)\n", this);
+    codecvt_base_dtor(&this->base);
+}
+
+/* ??1?$codecvt at GDH@std@@MAE at XZ */
+/* ??1?$codecvt at GDH@std@@MEAA at XZ */
+DEFINE_THISCALL_WRAPPER(codecvt_short_dtor, 4)
+void __thiscall codecvt_short_dtor(codecvt_wchar *this)
+{
+    FIXME("(%p)\n", this);
+    codecvt_base_dtor(&this->base);
+}
+
+/* ??1?$codecvt at _WDH@std@@MAE at XZ */
+/* ??1?$codecvt at _WDH@std@@MEAA at XZ */
+DEFINE_THISCALL_WRAPPER(codecvt_wchar_dtor, 4)
+void __thiscall codecvt_wchar_dtor(codecvt_wchar *this)
+{
+    FIXME("(%p)\n", this);
+    codecvt_base_dtor(&this->base);
+}
+
 /* ?id@?$collate at D@std@@2V0locale at 2@A */
 locale_id collate_char_id = {0};
 
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index ff2f8c5..23dd73e 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -1230,12 +1230,12 @@
 @ stub -arch=win64 ??1?$basic_stringstream at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@UEAA at XZ
 @ stub -arch=win32 ??1?$basic_stringstream at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@UAE at XZ
 @ stub -arch=win64 ??1?$basic_stringstream at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@UEAA at XZ
-@ stub -arch=win32 ??1?$codecvt at DDH@std@@MAE at XZ
-@ stub -arch=win64 ??1?$codecvt at DDH@std@@MEAA at XZ
-@ stub -arch=win32 ??1?$codecvt at GDH@std@@MAE at XZ
-@ stub -arch=win64 ??1?$codecvt at GDH@std@@MEAA at XZ
-@ stub -arch=win32 ??1?$codecvt at _WDH@std@@MAE at XZ
-@ stub -arch=win64 ??1?$codecvt at _WDH@std@@MEAA at XZ
+@ thiscall -arch=win32 ??1?$codecvt at DDH@std@@MAE at XZ(ptr) codecvt_char_dtor
+@ cdecl -arch=win64 ??1?$codecvt at DDH@std@@MEAA at XZ(ptr) codecvt_char_dtor
+@ thiscall -arch=win32 ??1?$codecvt at GDH@std@@MAE at XZ(ptr) codecvt_short_dtor
+@ cdecl -arch=win64 ??1?$codecvt at GDH@std@@MEAA at XZ(ptr) codecvt_short_dtor
+@ thiscall -arch=win32 ??1?$codecvt at _WDH@std@@MAE at XZ(ptr) codecvt_wchar_dtor
+@ cdecl -arch=win64 ??1?$codecvt at _WDH@std@@MEAA at XZ(ptr) codecvt_wchar_dtor
 @ thiscall -arch=win32 ??1?$collate at D@std@@MAE at XZ(ptr) collate_char_dtor
 @ cdecl -arch=win64 ??1?$collate at D@std@@MEAA at XZ(ptr) collate_char_dtor
 @ thiscall -arch=win32 ??1?$collate at G@std@@MAE at XZ(ptr) collate_wchar_dtor
@@ -1326,8 +1326,8 @@
 @ stub -arch=win64 ??1_UShinit at std@@QEAA at XZ
 @ stub -arch=win32 ??1_Winit at std@@QAE at XZ
 @ stub -arch=win64 ??1_Winit at std@@QEAA at XZ
-@ stub -arch=win32 ??1codecvt_base at std@@UAE at XZ
-@ stub -arch=win64 ??1codecvt_base at std@@UEAA at XZ
+@ thiscall -arch=win32 ??1codecvt_base at std@@UAE at XZ(ptr) codecvt_base_dtor
+@ cdecl -arch=win64 ??1codecvt_base at std@@UEAA at XZ(ptr) codecvt_base_dtor
 @ thiscall -arch=win32 ??1ctype_base at std@@UAE at XZ(ptr) ctype_base_dtor
 @ cdecl -arch=win64 ??1ctype_base at std@@UEAA at XZ(ptr) ctype_base_dtor
 @ thiscall -arch=win32 ??1facet at locale@std@@UAE at XZ(ptr) locale_facet_dtor
-- 
1.7.9.5




More information about the wine-patches mailing list