Piotr Caban : msvcp60: Added basic_stringbuf::_Mode implementation.

Alexandre Julliard julliard at winehq.org
Mon Nov 19 13:38:37 CST 2012


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Sun Nov 18 21:43:48 2012 +0100

msvcp60: Added basic_stringbuf::_Mode implementation.

---

 dlls/msvcp60/ios.c        |   12 +++++++++---
 dlls/msvcp60/msvcp60.spec |    8 ++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c
index 02e903d..e597a7e 100644
--- a/dlls/msvcp60/ios.c
+++ b/dlls/msvcp60/ios.c
@@ -275,9 +275,9 @@ typedef enum {
 
 typedef struct {
     basic_streambuf_char base;
-    streamsize minsize;
     char *endsave;
     char *seekhigh;
+    streamsize minsize;
     int strmode;
     void* (__cdecl *palloc)(MSVCP_size_t);
     void (__cdecl *pfree)(void*);
@@ -3279,7 +3279,10 @@ int __thiscall basic_filebuf_wchar_sync(basic_filebuf_wchar *this)
 
 /* ?_Getstate@?$basic_stringbuf at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@AAEHH at Z */
 /* ?_Getstate@?$basic_stringbuf at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@AEAAHH at Z */
-static int basic_stringbuf_char__Getstate(basic_stringbuf_char *this, IOSB_openmode mode)
+/* ?_Mode@?$basic_stringbuf at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@AAEHH at Z */
+/* ?_Mode@?$basic_stringbuf at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@AEAAHH at Z */
+DEFINE_THISCALL_WRAPPER(basic_stringbuf_char__Getstate, 8)
+int __thiscall basic_stringbuf_char__Getstate(basic_stringbuf_char *this, IOSB_openmode mode)
 {
     int state = 0;
 
@@ -3645,7 +3648,10 @@ basic_string_char* __thiscall basic_stringbuf_char_str_get(const basic_stringbuf
 /* ?_Getstate@?$basic_stringbuf at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@AEAAHH at Z */
 /* ?_Getstate@?$basic_stringbuf at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@AAEHH at Z */
 /* ?_Getstate@?$basic_stringbuf at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@AEAAHH at Z */
-static int basic_stringbuf_wchar__Getstate(basic_stringbuf_wchar *this, IOSB_openmode mode)
+/* ?_Mode@?$basic_stringbuf at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@AAEHH at Z */
+/* ?_Mode@?$basic_stringbuf at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@AEAAHH at Z */
+DEFINE_THISCALL_WRAPPER(basic_stringbuf_wchar__Getstate, 8)
+int __thiscall basic_stringbuf_wchar__Getstate(basic_stringbuf_wchar *this, IOSB_openmode mode)
 {
     int state = 0;
 
diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec
index 8dcf374..abcc88e 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -2303,10 +2303,10 @@
 @ stub -arch=win64 ?_Makpat@?$_Mpunct at D@std@@AEAAXAEAUpattern at money_base@2 at DDD@Z
 @ stub -arch=win32 ?_Makpat@?$_Mpunct at G@std@@AAEXAAUpattern at money_base@2 at DDD@Z
 @ stub -arch=win64 ?_Makpat@?$_Mpunct at G@std@@AEAAXAEAUpattern at money_base@2 at DDD@Z
-@ stub -arch=win32 ?_Mode@?$basic_stringbuf at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@AAEHH at Z
-@ stub -arch=win64 ?_Mode@?$basic_stringbuf at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@AEAAHH at Z
-@ stub -arch=win32 ?_Mode@?$basic_stringbuf at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@AAEHH at Z
-@ stub -arch=win64 ?_Mode@?$basic_stringbuf at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@AEAAHH at Z
+@ thiscall -arch=win32 ?_Mode@?$basic_stringbuf at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@AAEHH at Z(ptr long) basic_stringbuf_char__Getstate
+@ cdecl -arch=win64 ?_Mode@?$basic_stringbuf at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@AEAAHH at Z(ptr long) basic_stringbuf_char__Getstate
+@ thiscall -arch=win32 ?_Mode@?$basic_stringbuf at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@AAEHH at Z(ptr long) basic_stringbuf_wchar__Getstate
+@ cdecl -arch=win64 ?_Mode@?$basic_stringbuf at GU?$char_traits at G@std@@V?$allocator at G@2@@std@@AEAAHH at Z(ptr long) basic_stringbuf_wchar__Getstate
 @ stub ?_Nanv@?$_Ctr at M@std@@SAMM at Z
 @ stub ?_Nanv@?$_Ctr at N@std@@SANN at Z
 @ stub ?_Nanv@?$_Ctr at O@std@@SAOO at Z




More information about the wine-cvs mailing list