Piotr Caban : msvcp80: Added codecvt<wchar>::_Getcat implementation.
Alexandre Julliard
julliard at winehq.org
Fri Sep 14 10:54:22 CDT 2012
Module: wine
Branch: master
Commit: 9730744b859258e932ea94f6721db6756e630c64
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9730744b859258e932ea94f6721db6756e630c64
Author: Piotr Caban <piotr at codeweavers.com>
Date: Fri Sep 14 12:43:43 2012 +0200
msvcp80: Added codecvt<wchar>::_Getcat implementation.
---
dlls/msvcp80/msvcp80.c | 20 ++++++++++++++++++++
dlls/msvcp80/msvcp80.spec | 8 ++++----
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/dlls/msvcp80/msvcp80.c b/dlls/msvcp80/msvcp80.c
index 7dcc104..d42614a 100644
--- a/dlls/msvcp80/msvcp80.c
+++ b/dlls/msvcp80/msvcp80.c
@@ -96,6 +96,8 @@ MSVCP_size_t (CDECL *pctype_char__Getcat)(const struct locale_facet**,const stru
MSVCP_size_t (CDECL *pctype_wchar__Getcat)(const struct locale_facet**,const struct locale*);
MSVCP_size_t (CDECL *pctype_short__Getcat)(const struct locale_facet**,const struct locale*);
MSVCP_size_t (CDECL *pcodecvt_char__Getcat)(const struct locale_facet**,const struct locale*);
+MSVCP_size_t (CDECL *pcodecvt_wchar__Getcat)(const struct locale_facet**,const struct locale*);
+MSVCP_size_t (CDECL *pcodecvt_short__Getcat)(const struct locale_facet**,const struct locale*);
MSVCP_size_t (CDECL *pnumpunct_char__Getcat)(const struct locale_facet**,const struct locale*);
MSVCP_size_t (CDECL *pnumpunct_wchar__Getcat)(const struct locale_facet**,const struct locale*);
MSVCP_size_t (CDECL *pnumpunct_short__Getcat)(const struct locale_facet**,const struct locale*);
@@ -115,6 +117,8 @@ static BOOL init_funcs(void)
pctype_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype at _W@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z");
pctype_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype at G@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z");
pcodecvt_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z");
+ pcodecvt_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt at _WDH@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z");
+ pcodecvt_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt at GDH@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z");
pnumpunct_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct at D@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z");
pnumpunct_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct at _W@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z");
pnumpunct_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct at G@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z");
@@ -127,6 +131,8 @@ static BOOL init_funcs(void)
pctype_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype at _W@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z");
pctype_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$ctype at G@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z");
pcodecvt_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z");
+ pcodecvt_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt at _WDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z");
+ pcodecvt_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z");
pnumpunct_char__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct at D@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z");
pnumpunct_wchar__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct at _W@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z");
pnumpunct_short__Getcat = (void*)GetProcAddress(hmod, "?_Getcat@?$numpunct at G@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z");
@@ -199,6 +205,20 @@ MSVCP_size_t __cdecl codecvt_char__Getcat(const struct locale_facet **facet)
return pcodecvt_char__Getcat(facet, plocale_classic());
}
+/* ?_Getcat@?$codecvt at _WDH@std@@SAIPAPBVfacet at locale@2@@Z */
+/* ?_Getcat@?$codecvt at _WDH@std@@SA_KPEAPEBVfacet at locale@2@@Z */
+MSVCP_size_t __cdecl codecvt_wchar__Getcat(const struct locale_facet **facet)
+{
+ return pcodecvt_wchar__Getcat(facet, plocale_classic());
+}
+
+/* ?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2@@Z */
+/* ?_Getcat@?$codecvt at GDH@std@@SA_KPEAPEBVfacet at locale@2@@Z */
+MSVCP_size_t __cdecl codecvt_short__Getcat(const struct locale_facet **facet)
+{
+ return pcodecvt_short__Getcat(facet, plocale_classic());
+}
+
/* ?_Getcat@?$numpunct at D@std@@SAIPAPBVfacet at locale@2@@Z */
/* ?_Getcat@?$numpunct at D@std@@SA_KPEAPEBVfacet at locale@2@@Z */
MSVCP_size_t __cdecl numpunct_char__Getcat(const struct locale_facet **facet)
diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec
index 1df2a63..4790fa5 100644
--- a/dlls/msvcp80/msvcp80.spec
+++ b/dlls/msvcp80/msvcp80.spec
@@ -2220,10 +2220,10 @@
@ cdecl -arch=win64 ?_Fpz_func at std@@YAAEA_JXZ() msvcp90.?_Fpz_func at std@@YAAEA_JXZ
@ cdecl -arch=win32 ?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2@@Z(ptr) codecvt_char__Getcat
@ cdecl -arch=win64 ?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) codecvt_char__Getcat
-@ stub -arch=win32 ?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2@@Z
-@ stub -arch=win64 ?_Getcat@?$codecvt at GDH@std@@SA_KPEAPEBVfacet at locale@2@@Z
-@ stub -arch=win32 ?_Getcat@?$codecvt at _WDH@std@@SAIPAPBVfacet at locale@2@@Z
-@ stub -arch=win64 ?_Getcat@?$codecvt at _WDH@std@@SA_KPEAPEBVfacet at locale@2@@Z
+@ cdecl -arch=win32 ?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2@@Z(ptr) codecvt_short__Getcat
+@ cdecl -arch=win64 ?_Getcat@?$codecvt at GDH@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) codecvt_short__Getcat
+@ cdecl -arch=win32 ?_Getcat@?$codecvt at _WDH@std@@SAIPAPBVfacet at locale@2@@Z(ptr) codecvt_wchar__Getcat
+@ cdecl -arch=win64 ?_Getcat@?$codecvt at _WDH@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) codecvt_wchar__Getcat
@ cdecl -arch=win32 ?_Getcat@?$collate at D@std@@SAIPAPBVfacet at locale@2@@Z(ptr) collate_char__Getcat
@ cdecl -arch=win64 ?_Getcat@?$collate at D@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) collate_char__Getcat
@ cdecl -arch=win32 ?_Getcat@?$collate at G@std@@SAIPAPBVfacet at locale@2@@Z(ptr) collate_short__Getcat
More information about the wine-cvs
mailing list