Alexandre Julliard : msvcp60: Add some missing exports.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Nov 10 19:38:33 2014 +0900

msvcp60: Add some missing exports.

---

 dlls/msvcp60/locale.c     | 10 ++++++++++
 dlls/msvcp60/msvcp60.spec | 16 ++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c
index 4828dd3..53de64c 100644
--- a/dlls/msvcp60/locale.c
+++ b/dlls/msvcp60/locale.c
@@ -2715,6 +2715,16 @@ int __thiscall codecvt_char_do_length(const codecvt_char *this, const int *state
     return (from_end-from > max ? max : from_end-from);
 }
 
+/* ?length@?$codecvt(a)DDH@std@@QBEHABHPBD1I(a)Z */
+/* ?length@?$codecvt(a)DDH@std@@QEBAHAEBHPEBD1_K(a)Z */
+DEFINE_THISCALL_WRAPPER(codecvt_char_length, 20)
+int __thiscall codecvt_char_length(const codecvt_char *this, const int *state,
+        const char *from, const char *from_end, MSVCP_size_t max)
+{
+    TRACE("(%p %p %p %p %lu)\n", this, state, from, from_end, max);
+    return call_codecvt_char_do_length(this, state, from, from_end, max);
+}
+
 /* ?id@?$codecvt(a)_WDH@std@@2V0locale(a)2@A */
 static locale_id codecvt_wchar_id = {0};
 /* ?id@?$codecvt(a)GDH@std@@2V0locale(a)2@A */
diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec
index b9c94a4..b3c5604 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -2,10 +2,10 @@
 @ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z
 @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch
 @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch
-@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z
-@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAE(a)Z
-@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAC(a)Z
-@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAC(a)Z
+@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z(ptr ptr) basic_istream_char_read_ch
+@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAE(a)Z(ptr ptr) basic_istream_char_read_ch
+@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAC(a)Z(ptr ptr) basic_istream_char_read_ch
+@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAC(a)Z(ptr ptr) basic_istream_char_read_ch
 @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAD(a)Z(ptr ptr) basic_istream_char_read_str
 @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAD(a)Z(ptr ptr) basic_istream_char_read_str
 @ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAE(a)Z
@@ -2769,8 +2769,8 @@
 @ cdecl -arch=win64 ?do_is@?$ctype(a)G@std@@MEBAPEBGPEBG0PEAF(a)Z(ptr ptr ptr ptr) ctype_wchar_do_is
 @ thiscall -arch=win32 ?do_is@?$ctype(a)G@std@@MBE_NFG(a)Z(ptr long long) ctype_wchar_do_is_ch
 @ cdecl -arch=win64 ?do_is@?$ctype(a)G@std@@MEBA_NFG(a)Z(ptr long long) ctype_wchar_do_is_ch
-@ stub -arch=win32 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z
-@ stub -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z
+@ thiscall -arch=i386 ?do_length@?$codecvt(a)DDH@std@@MBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_do_length
+@ cdecl -arch=win64 ?do_length@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_do_length
 @ stub -arch=win32 ?do_length@?$codecvt(a)GDH@std@@MBEHAAHPBG1I(a)Z
 @ stub -arch=win64 ?do_length@?$codecvt(a)GDH@std@@MEBAHAEAHPEBG1_K(a)Z
 @ thiscall -arch=win32 ?do_max_length@?$codecvt(a)GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_max_length
@@ -3402,8 +3402,8 @@
 @ cdecl -arch=win64 ?length@?$char_traits(a)D@std@@SA_KPEBD(a)Z(ptr) msvcp90.?length@?$char_traits(a)D@std@@SA_KPEBD(a)Z
 @ cdecl -arch=win32 ?length@?$char_traits(a)G@std@@SAIPBG(a)Z(ptr) msvcp90.?length@?$char_traits(a)G@std@@SAIPBG(a)Z
 @ cdecl -arch=win64 ?length@?$char_traits(a)G@std@@SA_KPEBG(a)Z(ptr) msvcp90.?length@?$char_traits(a)G@std@@SA_KPEBG(a)Z
-@ stub -arch=win32 ?length@?$codecvt(a)DDH@std@@QBEHAAHPBD1I(a)Z
-@ stub -arch=win64 ?length@?$codecvt(a)DDH@std@@QEBAHAEAHPEBD1_K(a)Z
+@ thiscall -arch=i386 ?length@?$codecvt(a)DDH@std@@QBEHAAHPBD1I(a)Z(ptr ptr str str long) codecvt_char_length
+@ cdecl -arch=win64 ?length@?$codecvt(a)DDH@std@@QEBAHAEAHPEBD1_K(a)Z(ptr ptr str str long) codecvt_char_length
 @ stub -arch=win32 ?length@?$codecvt(a)GDH@std@@QBEHAAHPBG1I(a)Z
 @ stub -arch=win64 ?length@?$codecvt(a)GDH@std@@QEBAHAEAHPEBG1_K(a)Z
 @ stub -arch=win32 ?log10(a)std@@YA?AV?$complex(a)M@1(a)ABV21@@Z