Piotr Caban : msvcp100: Export basic_istream::gcount function.

[Alexandre Julliard]

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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Tue May 20 10:46:51 2014 +0200

msvcp100: Export basic_istream::gcount function.

---

 dlls/msvcp100/msvcp100.spec |    6 +++---
 dlls/msvcp110/msvcp110.spec |   12 ++++++------
 dlls/msvcp90/ios.c          |   10 ++++++++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec
index 1dcbded..ab0b1d0 100644
--- a/dlls/msvcp100/msvcp100.spec
+++ b/dlls/msvcp100/msvcp100.spec
@@ -1736,11 +1736,11 @@
 @ cdecl -arch=win64 ?gbump@?$basic_streambuf at GU?$char_traits at G@std@@@std@@IEAAXH at Z(ptr long) basic_streambuf_wchar_gbump
 @ thiscall -arch=win32 ?gbump@?$basic_streambuf at _WU?$char_traits at _W@std@@@std@@IAEXH at Z(ptr long) basic_streambuf_wchar_gbump
 @ cdecl -arch=win64 ?gbump@?$basic_streambuf at _WU?$char_traits at _W@std@@@std@@IEAAXH at Z(ptr long) basic_streambuf_wchar_gbump
-@ stub -arch=win32 ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QBE_JXZ
+@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount
 @ cdecl -arch=win64 ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount
-@ stub -arch=win32 ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QBE_JXZ
+@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount
 @ cdecl -arch=win64 ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount
-@ stub -arch=win32 ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QBE_JXZ
+@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount
 @ cdecl -arch=win64 ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount
 @ stub -arch=win32 ?generic_category at std@@YAABVerror_category at 1@XZ
 @ stub -arch=win64 ?generic_category at std@@YAAEBVerror_category at 1@XZ
diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec
index 0527936..40f5577 100644
--- a/dlls/msvcp110/msvcp110.spec
+++ b/dlls/msvcp110/msvcp110.spec
@@ -2433,14 +2433,14 @@
 @ cdecl -arch=arm ?gbump@?$basic_streambuf at _WU?$char_traits at _W@std@@@std@@IAAXH at Z(ptr long) basic_streambuf_wchar_gbump
 @ thiscall -arch=i386 ?gbump@?$basic_streambuf at _WU?$char_traits at _W@std@@@std@@IAEXH at Z(ptr long) basic_streambuf_wchar_gbump
 @ cdecl -arch=win64 ?gbump@?$basic_streambuf at _WU?$char_traits at _W@std@@@std@@IEAAXH at Z(ptr long) basic_streambuf_wchar_gbump
-@ stub -arch=arm ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QBA_JXZ
-@ stub -arch=i386 ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QBE_JXZ
+@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QBA_JXZ(ptr) basic_istream_char_gcount
+@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount
 @ cdecl -arch=win64 ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount
-@ stub -arch=arm ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QBA_JXZ
-@ stub -arch=i386 ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QBE_JXZ
+@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount
+@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount
 @ cdecl -arch=win64 ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount
-@ stub -arch=arm ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QBA_JXZ
-@ stub -arch=i386 ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QBE_JXZ
+@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount
+@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount
 @ cdecl -arch=win64 ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount
 @ cdecl -arch=arm ?get@?$basic_istream at DU?$char_traits at D@std@@@std@@QAAAAV12 at AAD@Z(ptr ptr) basic_istream_char_get_ch
 @ thiscall -arch=i386 ?get@?$basic_istream at DU?$char_traits at D@std@@@std@@QAEAAV12 at AAD@Z(ptr ptr) basic_istream_char_get_ch
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index e8d4b06..d8f1e1c 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -7785,8 +7785,10 @@ static void basic_istream_char_sentry_destroy(basic_istream_char *istr)
 
 /* ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QBEHXZ */
 /* ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QEBA_JXZ */
+/* ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QBA_JXZ */
+/* ?gcount@?$basic_istream at DU?$char_traits at D@std@@@std@@QBE_JXZ */
 DEFINE_THISCALL_WRAPPER(basic_istream_char_gcount, 4)
-int __thiscall basic_istream_char_gcount(const basic_istream_char *this)
+streamsize __thiscall basic_istream_char_gcount(const basic_istream_char *this)
 {
     TRACE("(%p)\n", this);
     return this->count;
@@ -9066,8 +9068,12 @@ static void basic_istream_wchar_sentry_destroy(basic_istream_wchar *istr)
 /* ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QEBA_JXZ */
 /* ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QBEHXZ */
 /* ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QEBA_JXZ */
+/* ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QBA_JXZ */
+/* ?gcount@?$basic_istream at GU?$char_traits at G@std@@@std@@QBE_JXZ */
+/* ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QBA_JXZ */
+/* ?gcount@?$basic_istream at _WU?$char_traits at _W@std@@@std@@QBE_JXZ */
 DEFINE_THISCALL_WRAPPER(basic_istream_wchar_gcount, 4)
-int __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this)
+streamsize __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this)
 {
     TRACE("(%p)\n", this);
     return this->count;