Piotr Caban : msvcp71: Add locale::facet::_Getcat implementation.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Feb 24 10:33:24 CST 2015


Module: wine
Branch: master
Commit: 575628743d07b2c6eb7073afd02736bf0ced7aff
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=575628743d07b2c6eb7073afd02736bf0ced7aff

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Tue Feb 24 14:12:41 2015 +0100

msvcp71: Add locale::facet::_Getcat implementation.

---

 dlls/msvcp70/msvcp70.spec | 4 ++--
 dlls/msvcp71/msvcp71.spec | 4 ++--
 dlls/msvcp80/msvcp80.spec | 4 ++--
 dlls/msvcp90/locale.c     | 8 ++++++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec
index 2e98230..bdbce65 100644
--- a/dlls/msvcp70/msvcp70.spec
+++ b/dlls/msvcp70/msvcp70.spec
@@ -1892,8 +1892,8 @@
 @ cdecl -arch=win64 ?_Getcat@?$time_put at GV?$ostreambuf_iterator at GU?$char_traits at G@std@@@std@@@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) time_put_short__Getcat_old
 @ cdecl -arch=win32 ?_Getcat@?$time_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@SAIPAPBVfacet at locale@2@@Z(ptr) time_put_wchar__Getcat_old
 @ cdecl -arch=win64 ?_Getcat@?$time_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) time_put_wchar__Getcat_old
-@ stub -arch=win32 ?_Getcat at facet@locale at std@@SAIPAPBV123@@Z
-@ stub -arch=win64 ?_Getcat at facet@locale at std@@SA_KPEAPEBV123@@Z
+@ cdecl -arch=win32 ?_Getcat at facet@locale at std@@SAIPAPBV123@@Z(ptr) locale_facet__Getcat_old
+@ cdecl -arch=win64 ?_Getcat at facet@locale at std@@SA_KPEAPEBV123@@Z(ptr) locale_facet__Getcat_old
 @ thiscall -arch=i386 ?_Getcoll at _Locinfo@std@@QBE?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll
 @ cdecl -arch=win64 ?_Getcoll at _Locinfo@std@@QEBA?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll
 @ thiscall -arch=i386 ?_Getctype at _Locinfo@std@@QBE?AU_Ctypevec@@XZ(ptr ptr) _Locinfo__Getctype
diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec
index 48bbd40..08c133c 100644
--- a/dlls/msvcp71/msvcp71.spec
+++ b/dlls/msvcp71/msvcp71.spec
@@ -2079,8 +2079,8 @@
 @ cdecl -arch=win64 ?_Getcat@?$time_put at GV?$ostreambuf_iterator at GU?$char_traits at G@std@@@std@@@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) time_put_short__Getcat_old
 @ cdecl -arch=win32 ?_Getcat@?$time_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@SAIPAPBVfacet at locale@2@@Z(ptr) time_put_wchar__Getcat_old
 @ cdecl -arch=win64 ?_Getcat@?$time_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) time_put_wchar__Getcat_old
-@ stub -arch=win32 ?_Getcat at facet@locale at std@@SAIPAPBV123@@Z
-@ stub -arch=win64 ?_Getcat at facet@locale at std@@SA_KPEAPEBV123@@Z
+@ cdecl -arch=win32 ?_Getcat at facet@locale at std@@SAIPAPBV123@@Z(ptr) locale_facet__Getcat_old
+@ cdecl -arch=win64 ?_Getcat at facet@locale at std@@SA_KPEAPEBV123@@Z(ptr) locale_facet__Getcat_old
 @ thiscall -arch=win32 ?_Getcoll at _Locinfo@std@@QBE?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll
 @ cdecl -arch=win64 ?_Getcoll at _Locinfo@std@@QEBA?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll
 @ thiscall -arch=win32 ?_Getctype at _Locinfo@std@@QBE?AU_Ctypevec@@XZ(ptr ptr) _Locinfo__Getctype
diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec
index 5d263fa..8f3c43e 100644
--- a/dlls/msvcp80/msvcp80.spec
+++ b/dlls/msvcp80/msvcp80.spec
@@ -2296,8 +2296,8 @@
 @ cdecl -arch=win64 ?_Getcat@?$time_put at GV?$ostreambuf_iterator at GU?$char_traits at G@std@@@std@@@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) time_put_short__Getcat_old
 @ cdecl -arch=win32 ?_Getcat@?$time_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@SAIPAPBVfacet at locale@2@@Z(ptr) time_put_wchar__Getcat_old
 @ cdecl -arch=win64 ?_Getcat@?$time_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@SA_KPEAPEBVfacet at locale@2@@Z(ptr) time_put_wchar__Getcat_old
-@ stub -arch=win32 ?_Getcat at facet@locale at std@@SAIPAPBV123@@Z
-@ stub -arch=win64 ?_Getcat at facet@locale at std@@SA_KPEAPEBV123@@Z
+@ cdecl -arch=win32 ?_Getcat at facet@locale at std@@SAIPAPBV123@@Z(ptr) locale_facet__Getcat_old
+@ cdecl -arch=win64 ?_Getcat at facet@locale at std@@SA_KPEAPEBV123@@Z(ptr) locale_facet__Getcat_old
 @ thiscall -arch=i386 ?_Getcoll at _Locinfo@std@@QBE?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll
 @ cdecl -arch=win64 ?_Getcoll at _Locinfo@std@@QEBA?AU_Collvec@@XZ(ptr ptr) _Locinfo__Getcoll
 @ thiscall -arch=i386 ?_Getctype at _Locinfo@std@@QBE?AU_Ctypevec@@XZ(ptr ptr) _Locinfo__Getctype
diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 568585c..a0fbc66 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -408,6 +408,14 @@ MSVCP_size_t __cdecl locale_facet__Getcat(const locale_facet **facet, const loca
     return -1;
 }
 
+/* ?_Getcat at facet@locale at std@@SAIPAPBV123@@Z */
+/* ?_Getcat at facet@locale at std@@SA_KPEAPEBV123@@Z */
+MSVCP_size_t __cdecl locale_facet__Getcat_old(const locale_facet **facet)
+{
+    TRACE("(%p)\n", facet);
+    return -1;
+}
+
 /* ??0_Timevec at std@@QAE at ABV01@@Z */
 /* ??0_Timevec at std@@QEAA at AEBV01@@Z */
 /* This copy constructor modifies copied object */




More information about the wine-cvs mailing list