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=0e21f80b4b58bf0078c3ee7752308c8fe91e8efb

Author: Alexandre Julliard <julliard at 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 at DDH@std@@QBEHABHPBD1I at Z */
+/* ?length@?$codecvt at DDH@std@@QEBAHAEBHPEBD1_K at 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 at _WDH@std@@2V0locale at 2@A */
 static locale_id codecvt_wchar_id = {0};
 /* ?id@?$codecvt at GDH@std@@2V0locale at 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 at D@std@@@std@@YAAEAV?$basic_istream at DU?$char_traits at D@std@@@0 at AEAV10@AEAC at Z
 @ cdecl -arch=win32 ??$?5DU?$char_traits at D@std@@@std@@YAAAV?$basic_istream at DU?$char_traits at D@std@@@0 at AAV10@AAD at Z(ptr ptr) basic_istream_char_read_ch
 @ cdecl -arch=win64 ??$?5DU?$char_traits at D@std@@@std@@YAAEAV?$basic_istream at DU?$char_traits at D@std@@@0 at AEAV10@AEAD at Z(ptr ptr) basic_istream_char_read_ch
-@ stub -arch=win32 ??$?5DU?$char_traits at D@std@@@std@@YAAAV?$basic_istream at DU?$char_traits at D@std@@@0 at AAV10@AAE at Z
-@ stub -arch=win64 ??$?5DU?$char_traits at D@std@@@std@@YAAEAV?$basic_istream at DU?$char_traits at D@std@@@0 at AEAV10@AEAE at Z
-@ stub -arch=win32 ??$?5DU?$char_traits at D@std@@@std@@YAAAV?$basic_istream at DU?$char_traits at D@std@@@0 at AAV10@PAC at Z
-@ stub -arch=win64 ??$?5DU?$char_traits at D@std@@@std@@YAAEAV?$basic_istream at DU?$char_traits at D@std@@@0 at AEAV10@PEAC at Z
+@ cdecl -arch=win32 ??$?5DU?$char_traits at D@std@@@std@@YAAAV?$basic_istream at DU?$char_traits at D@std@@@0 at AAV10@AAE at Z(ptr ptr) basic_istream_char_read_ch
+@ cdecl -arch=win64 ??$?5DU?$char_traits at D@std@@@std@@YAAEAV?$basic_istream at DU?$char_traits at D@std@@@0 at AEAV10@AEAE at Z(ptr ptr) basic_istream_char_read_ch
+@ cdecl -arch=win32 ??$?5DU?$char_traits at D@std@@@std@@YAAAV?$basic_istream at DU?$char_traits at D@std@@@0 at AAV10@PAC at Z(ptr ptr) basic_istream_char_read_ch
+@ cdecl -arch=win64 ??$?5DU?$char_traits at D@std@@@std@@YAAEAV?$basic_istream at DU?$char_traits at D@std@@@0 at AEAV10@PEAC at Z(ptr ptr) basic_istream_char_read_ch
 @ cdecl -arch=win32 ??$?5DU?$char_traits at D@std@@@std@@YAAAV?$basic_istream at DU?$char_traits at D@std@@@0 at AAV10@PAD at Z(ptr ptr) basic_istream_char_read_str
 @ cdecl -arch=win64 ??$?5DU?$char_traits at D@std@@@std@@YAAEAV?$basic_istream at DU?$char_traits at D@std@@@0 at AEAV10@PEAD at Z(ptr ptr) basic_istream_char_read_str
 @ stub -arch=win32 ??$?5DU?$char_traits at D@std@@@std@@YAAAV?$basic_istream at DU?$char_traits at D@std@@@0 at AAV10@PAE at Z
@@ -2769,8 +2769,8 @@
 @ cdecl -arch=win64 ?do_is@?$ctype at G@std@@MEBAPEBGPEBG0PEAF at Z(ptr ptr ptr ptr) ctype_wchar_do_is
 @ thiscall -arch=win32 ?do_is@?$ctype at G@std@@MBE_NFG at Z(ptr long long) ctype_wchar_do_is_ch
 @ cdecl -arch=win64 ?do_is@?$ctype at G@std@@MEBA_NFG at Z(ptr long long) ctype_wchar_do_is_ch
-@ stub -arch=win32 ?do_length@?$codecvt at DDH@std@@MBEHAAHPBD1I at Z
-@ stub -arch=win64 ?do_length@?$codecvt at DDH@std@@MEBAHAEAHPEBD1_K at Z
+@ thiscall -arch=i386 ?do_length@?$codecvt at DDH@std@@MBEHAAHPBD1I at Z(ptr ptr str str long) codecvt_char_do_length
+@ cdecl -arch=win64 ?do_length@?$codecvt at DDH@std@@MEBAHAEAHPEBD1_K at Z(ptr ptr str str long) codecvt_char_do_length
 @ stub -arch=win32 ?do_length@?$codecvt at GDH@std@@MBEHAAHPBG1I at Z
 @ stub -arch=win64 ?do_length@?$codecvt at GDH@std@@MEBAHAEAHPEBG1_K at Z
 @ thiscall -arch=win32 ?do_max_length@?$codecvt at GDH@std@@MBEHXZ(ptr) codecvt_wchar_do_max_length
@@ -3402,8 +3402,8 @@
 @ cdecl -arch=win64 ?length@?$char_traits at D@std@@SA_KPEBD at Z(ptr) msvcp90.?length@?$char_traits at D@std@@SA_KPEBD at Z
 @ cdecl -arch=win32 ?length@?$char_traits at G@std@@SAIPBG at Z(ptr) msvcp90.?length@?$char_traits at G@std@@SAIPBG at Z
 @ cdecl -arch=win64 ?length@?$char_traits at G@std@@SA_KPEBG at Z(ptr) msvcp90.?length@?$char_traits at G@std@@SA_KPEBG at Z
-@ stub -arch=win32 ?length@?$codecvt at DDH@std@@QBEHAAHPBD1I at Z
-@ stub -arch=win64 ?length@?$codecvt at DDH@std@@QEBAHAEAHPEBD1_K at Z
+@ thiscall -arch=i386 ?length@?$codecvt at DDH@std@@QBEHAAHPBD1I at Z(ptr ptr str str long) codecvt_char_length
+@ cdecl -arch=win64 ?length@?$codecvt at DDH@std@@QEBAHAEAHPEBD1_K at Z(ptr ptr str str long) codecvt_char_length
 @ stub -arch=win32 ?length@?$codecvt at GDH@std@@QBEHAAHPBG1I at Z
 @ stub -arch=win64 ?length@?$codecvt at GDH@std@@QEBAHAEAHPEBG1_K at Z
 @ stub -arch=win32 ?log10 at std@@YA?AV?$complex at M@1 at ABV21@@Z