[01/10] msvcirt: Add stub for class ostream
Iván Matellanes
matellanesivan at gmail.com
Mon Jun 6 06:52:49 CDT 2016
Signed-off-by: Iván Matellanes <matellanes.ivan at gmail.com>
---
dlls/msvcirt/msvcirt.c | 268 ++++++++++++++++++++++++++++++++++++++++----
dlls/msvcirt/msvcirt.spec | 100 ++++++++---------
dlls/msvcrt20/msvcrt20.spec | 92 +++++++--------
dlls/msvcrt40/msvcrt40.spec | 92 +++++++--------
4 files changed, 388 insertions(+), 164 deletions(-)
diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c
index 19c26fd..98fae93 100644
--- a/dlls/msvcirt/msvcirt.c
+++ b/dlls/msvcirt/msvcirt.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2007 Alexandre Julliard
- * Copyright (C) 2015 Iván Matellanes
+ * Copyright (C) 2015-2016 Iván Matellanes
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -150,7 +150,8 @@ void __cdecl ios_unlockc(void);
/* class ostream */
typedef struct _ostream {
- const vtable_ptr *vtable;
+ const int *vbtable;
+ int unknown;
} ostream;
/* ??_7streambuf@@6B@ */
@@ -163,6 +164,8 @@ extern const vtable_ptr MSVCP_strstreambuf_vtable;
extern const vtable_ptr MSVCP_stdiobuf_vtable;
/* ??_7ios@@6B@ */
extern const vtable_ptr MSVCP_ios_vtable;
+/* ??_7ostream@@6B@ */
+extern const vtable_ptr MSVCP_ostream_vtable;
#ifndef __GNUC__
void __asm_dummy_vtables(void) {
@@ -217,15 +220,24 @@ void __asm_dummy_vtables(void) {
VTABLE_ADD_FUNC(streambuf_doallocate));
__ASM_VTABLE(ios,
VTABLE_ADD_FUNC(ios_vector_dtor));
+ __ASM_VTABLE(ostream,
+ VTABLE_ADD_FUNC(ostream_vector_dtor));
#ifndef __GNUC__
}
#endif
+#define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment))
+#define VBTABLE_ENTRY(class, offset, vbase) ALIGNED_SIZE(sizeof(class), TYPE_ALIGNMENT(vbase))-offset
+
+/* ??_8ostream@@7B@ */
+const int ostream_vbtable[] = {0, VBTABLE_ENTRY(ostream, FIELD_OFFSET(ostream, vbtable), ios)};
+
DEFINE_RTTI_DATA0(streambuf, 0, ".?AVstreambuf@@")
DEFINE_RTTI_DATA1(filebuf, 0, &streambuf_rtti_base_descriptor, ".?AVfilebuf@@")
DEFINE_RTTI_DATA1(strstreambuf, 0, &streambuf_rtti_base_descriptor, ".?AVstrstreambuf@@")
DEFINE_RTTI_DATA1(stdiobuf, 0, &streambuf_rtti_base_descriptor, ".?AVstdiobuf@@")
DEFINE_RTTI_DATA0(ios, 0, ".?AVios@@")
+DEFINE_RTTI_DATA1(ostream, sizeof(ostream), &ios_rtti_base_descriptor, ".?AVostream@@")
/* ??0streambuf@@IAE at PADH@Z */
/* ??0streambuf@@IEAA at PEADH@Z */
@@ -2217,6 +2229,237 @@ int __cdecl ios_xalloc(void)
return ret;
}
+/* ??0ostream@@IAE at ABV0@@Z */
+/* ??0ostream@@IEAA at AEBV0@@Z */
+DEFINE_THISCALL_WRAPPER(ostream_copy_ctor, 12)
+ostream* __thiscall ostream_copy_ctor(ostream *this, const ostream *copy, BOOL virt_init)
+{
+ FIXME("(%p %p %d) stub\n", this, copy, virt_init);
+ return this;
+}
+
+/* ??0ostream@@QAE at PAVstreambuf@@@Z */
+/* ??0ostream@@QEAA at PEAVstreambuf@@@Z */
+DEFINE_THISCALL_WRAPPER(ostream_sb_ctor, 12)
+ostream* __thiscall ostream_sb_ctor(ostream *this, streambuf *sb, BOOL virt_init)
+{
+ FIXME("(%p %p %d) stub\n", this, sb, virt_init);
+ return this;
+}
+
+/* ??0ostream@@IAE at XZ */
+/* ??0ostream@@IEAA at XZ */
+DEFINE_THISCALL_WRAPPER(ostream_ctor, 8)
+ostream* __thiscall ostream_ctor(ostream *this, BOOL virt_init)
+{
+ FIXME("(%p %d) stub\n", this, virt_init);
+ return this;
+}
+
+/* ??1ostream@@UAE at XZ */
+/* ??1ostream@@UEAA at XZ */
+DEFINE_THISCALL_WRAPPER(ostream_dtor, 4)
+void __thiscall ostream_dtor(ios *base)
+{
+ FIXME("(%p) stub\n", base);
+}
+
+/* ??4ostream@@IAEAAV0 at PAVstreambuf@@@Z */
+/* ??4ostream@@IEAAAEAV0 at PEAVstreambuf@@@Z */
+DEFINE_THISCALL_WRAPPER(ostream_assign_sb, 8)
+ostream* __thiscall ostream_assign_sb(ostream *this, streambuf *sb)
+{
+ FIXME("(%p %p) stub\n", this, sb);
+ return this;
+}
+
+/* ??4ostream@@IAEAAV0 at ABV0@@Z */
+/* ??4ostream@@IEAAAEAV0 at AEBV0@@Z */
+DEFINE_THISCALL_WRAPPER(ostream_assign, 8)
+ostream* __thiscall ostream_assign(ostream *this, const ostream *rhs)
+{
+ FIXME("(%p %p) stub\n", this, rhs);
+ return this;
+}
+
+/* ??_Dostream@@QAEXXZ */
+/* ??_Dostream@@QEAAXXZ */
+DEFINE_THISCALL_WRAPPER(ostream_vbase_dtor, 4)
+void __thiscall ostream_vbase_dtor(ostream *this)
+{
+ FIXME("(%p) stub\n", this);
+}
+
+/* ??_Eostream@@UAEPAXI at Z */
+DEFINE_THISCALL_WRAPPER(ostream_vector_dtor, 8)
+ostream* __thiscall ostream_vector_dtor(ostream *this, unsigned int flags)
+{
+ TRACE("(%p %x)\n", this, flags);
+ if (flags & 2) {
+ /* we have an array, with the number of elements stored before the first object */
+ INT_PTR i, *ptr = (INT_PTR *)this-1;
+
+ for (i = *ptr-1; i >= 0; i--)
+ ostream_vbase_dtor(this+i);
+ MSVCRT_operator_delete(ptr);
+ } else {
+ ostream_vbase_dtor(this);
+ if (flags & 1)
+ MSVCRT_operator_delete(this);
+ }
+ return this;
+}
+
+/* ??_Gostream@@UAEPAXI at Z */
+DEFINE_THISCALL_WRAPPER(ostream_scalar_dtor, 8)
+ostream* __thiscall ostream_scalar_dtor(ostream *this, unsigned int flags)
+{
+ TRACE("(%p %x)\n", this, flags);
+ ostream_vbase_dtor(this);
+ if (flags & 1) MSVCRT_operator_delete(this);
+ return this;
+}
+
+/* ?flush at ostream@@QAEAAV1 at XZ */
+/* ?flush at ostream@@QEAAAEAV1 at XZ */
+DEFINE_THISCALL_WRAPPER(ostream_flush, 4)
+ostream* __thiscall ostream_flush(ostream *this)
+{
+ FIXME("(%p) stub\n", this);
+ return this;
+}
+
+/* ?opfx at ostream@@QAEHXZ */
+/* ?opfx at ostream@@QEAAHXZ */
+DEFINE_THISCALL_WRAPPER(ostream_opfx, 4)
+int __thiscall ostream_opfx(ostream *this)
+{
+ FIXME("(%p) stub\n", this);
+ return 0;
+}
+
+/* ?osfx at ostream@@QAEXXZ */
+/* ?osfx at ostream@@QEAAXXZ */
+DEFINE_THISCALL_WRAPPER(ostream_osfx, 4)
+void __thiscall ostream_osfx(ostream *this)
+{
+ FIXME("(%p) stub\n", this);
+}
+
+/* ?put at ostream@@QAEAAV1 at D@Z */
+/* ?put at ostream@@QEAAAEAV1 at D@Z */
+DEFINE_THISCALL_WRAPPER(ostream_put_char, 8)
+ostream* __thiscall ostream_put_char(ostream *this, char c)
+{
+ FIXME("(%p %c) stub\n", this, c);
+ return this;
+}
+
+/* ?put at ostream@@QAEAAV1 at C@Z */
+/* ?put at ostream@@QEAAAEAV1 at C@Z */
+DEFINE_THISCALL_WRAPPER(ostream_put_signed_char, 8)
+ostream* __thiscall ostream_put_signed_char(ostream *this, signed char c)
+{
+ FIXME("(%p %c) stub\n", this, c);
+ return this;
+}
+
+/* ?put at ostream@@QAEAAV1 at E@Z */
+/* ?put at ostream@@QEAAAEAV1 at E@Z */
+DEFINE_THISCALL_WRAPPER(ostream_put_unsigned_char, 8)
+ostream* __thiscall ostream_put_unsigned_char(ostream *this, unsigned char c)
+{
+ FIXME("(%p %c) stub\n", this, c);
+ return this;
+}
+
+/* ?seekp at ostream@@QAEAAV1 at J@Z */
+/* ?seekp at ostream@@QEAAAEAV1 at J@Z */
+DEFINE_THISCALL_WRAPPER(ostream_seekp, 8)
+ostream* __thiscall ostream_seekp(ostream *this, streampos pos)
+{
+ FIXME("(%p %d) stub\n", this, pos);
+ return this;
+}
+
+/* ?seekp at ostream@@QAEAAV1 at JW4seek_dir@ios@@@Z */
+/* ?seekp at ostream@@QEAAAEAV1 at JW4seek_dir@ios@@@Z */
+DEFINE_THISCALL_WRAPPER(ostream_seekp_offset, 12)
+ostream* __thiscall ostream_seekp_offset(ostream *this, streamoff off, ios_seek_dir dir)
+{
+ FIXME("(%p %d %d) stub\n", this, off, dir);
+ return this;
+}
+
+/* ?tellp at ostream@@QAEJXZ */
+/* ?tellp at ostream@@QEAAJXZ */
+DEFINE_THISCALL_WRAPPER(ostream_tellp, 4)
+streampos __thiscall ostream_tellp(ostream *this)
+{
+ FIXME("(%p) stub\n", this);
+ return 0;
+}
+
+/* ?write at ostream@@QAEAAV1 at PBDH@Z */
+/* ?write at ostream@@QEAAAEAV1 at PEBDH@Z */
+DEFINE_THISCALL_WRAPPER(ostream_write_char, 12)
+ostream* __thiscall ostream_write_char(ostream *this, const char *str, int count)
+{
+ FIXME("(%p %s %d) stub\n", this, str, count);
+ return this;
+}
+
+/* ?write at ostream@@QAEAAV1 at PBCH@Z */
+/* ?write at ostream@@QEAAAEAV1 at PEBCH@Z */
+DEFINE_THISCALL_WRAPPER(ostream_write_signed_char, 12)
+ostream* __thiscall ostream_write_signed_char(ostream *this, const signed char *str, int count)
+{
+ FIXME("(%p %s %d) stub\n", this, str, count);
+ return this;
+}
+
+/* ?write at ostream@@QAEAAV1 at PBEH@Z */
+/* ?write at ostream@@QEAAAEAV1 at PEBEH@Z */
+DEFINE_THISCALL_WRAPPER(ostream_write_unsigned_char, 12)
+ostream* __thiscall ostream_write_unsigned_char(ostream *this, const unsigned char *str, int count)
+{
+ FIXME("(%p %s %d) stub\n", this, str, count);
+ return this;
+}
+
+/* ?writepad at ostream@@AAEAAV1 at PBD0@Z */
+/* ?writepad at ostream@@AEAAAEAV1 at PEBD0@Z */
+DEFINE_THISCALL_WRAPPER(ostream_writepad, 12)
+ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char *str2)
+{
+ FIXME("(%p %s %s) stub\n", this, str1, str2);
+ return this;
+}
+
+/* ?endl@@YAAAVostream@@AAV1@@Z */
+/* ?endl@@YAAEAVostream@@AEAV1@@Z */
+ostream* __cdecl ostream_endl(ostream *this)
+{
+ FIXME("(%p) stub\n", this);
+ return this;
+}
+
+/* ?ends@@YAAAVostream@@AAV1@@Z */
+/* ?ends@@YAAEAVostream@@AEAV1@@Z */
+ostream* __cdecl ostream_ends(ostream *this)
+{
+ FIXME("(%p) stub\n", this);
+ return this;
+}
+
+/* ?flush@@YAAAVostream@@AAV1@@Z */
+/* ?flush@@YAAEAVostream@@AEAV1@@Z */
+ostream* __cdecl ostream_flush_manip(ostream *this)
+{
+ FIXME("(%p) stub\n", this);
+ return this;
+}
+
/******************************************************************
* ??0ostrstream@@QAE at XZ (MSVCRTI.@)
*/
@@ -2280,26 +2523,6 @@ void * __thiscall MSVCIRT_operator_sl_callback(ostream * _this, ostream * (__cde
return func(_this);
}
-/******************************************************************
- * ?endl@@YAAAVostream@@AAV1@@Z (MSVCRTI.@)
- * class ostream & __cdecl endl(class ostream &)
- */
-void * CDECL MSVCIRT_endl(ostream * _this)
-{
- FIXME("(%p)->() stub\n", _this);
- return _this;
-}
-
-/******************************************************************
- * ?ends@@YAAAVostream@@AAV1@@Z (MSVCRTI.@)
- * class ostream & __cdecl ends(class ostream &)
- */
-void * CDECL MSVCIRT_ends(ostream * _this)
-{
- FIXME("(%p)->() stub\n", _this);
- return _this;
-}
-
#ifdef __i386__
#define DEFINE_VTBL_WRAPPER(off) \
@@ -2355,6 +2578,7 @@ static void init_io(void *base)
init_strstreambuf_rtti(base);
init_stdiobuf_rtti(base);
init_ios_rtti(base);
+ init_ostream_rtti(base);
#endif
}
diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec
index 0326672..ef8b4aa 100644
--- a/dlls/msvcirt/msvcirt.spec
+++ b/dlls/msvcirt/msvcirt.spec
@@ -80,12 +80,12 @@
@ stub -arch=win64 ??0ofstream@@QEAA at PEBDHH@Z
@ stub -arch=win32 ??0ofstream@@QAE at XZ # __thiscall ofstream::ofstream(void)
@ stub -arch=win64 ??0ofstream@@QEAA at XZ
-@ stub -arch=win32 ??0ostream@@IAE at ABV0@@Z # __thiscall ostream::ostream(class ostream const &)
-@ stub -arch=win64 ??0ostream@@IEAA at AEBV0@@Z
-@ stub -arch=win32 ??0ostream@@IAE at XZ # __thiscall ostream::ostream(void)
-@ stub -arch=win64 ??0ostream@@IEAA at XZ
-@ stub -arch=win32 ??0ostream@@QAE at PAVstreambuf@@@Z # __thiscall ostream::ostream(class streambuf *)
-@ stub -arch=win64 ??0ostream@@QEAA at PEAVstreambuf@@@Z
+@ thiscall -arch=win32 ??0ostream@@IAE at ABV0@@Z(ptr ptr long) ostream_copy_ctor
+@ cdecl -arch=win64 ??0ostream@@IEAA at AEBV0@@Z(ptr ptr long) ostream_copy_ctor
+@ thiscall -arch=win32 ??0ostream@@IAE at XZ(ptr long) ostream_ctor
+@ cdecl -arch=win64 ??0ostream@@IEAA at XZ(ptr long) ostream_ctor
+@ thiscall -arch=win32 ??0ostream@@QAE at PAVstreambuf@@@Z(ptr ptr long) ostream_sb_ctor
+@ cdecl -arch=win64 ??0ostream@@QEAA at PEAVstreambuf@@@Z(ptr ptr long) ostream_sb_ctor
@ stub -arch=win32 ??0ostream_withassign@@QAE at ABV0@@Z # __thiscall ostream_withassign::ostream_withassign(class ostream_withassign const &)
@ stub -arch=win64 ??0ostream_withassign@@QEAA at AEBV0@@Z
@ stub -arch=win32 ??0ostream_withassign@@QAE at PAVstreambuf@@@Z # __thiscall ostream_withassign::ostream_withassign(class streambuf *)
@@ -154,8 +154,8 @@
@ cdecl -arch=win64 ??1logic_error@@UEAA at XZ(ptr) MSVCP_logic_error_dtor
@ stub -arch=win32 ??1ofstream@@UAE at XZ # virtual __thiscall ofstream::~ofstream(void)
@ stub -arch=win64 ??1ofstream@@UEAA at XZ
-@ stub -arch=win32 ??1ostream@@UAE at XZ # virtual __thiscall ostream::~ostream(void)
-@ stub -arch=win64 ??1ostream@@UEAA at XZ
+@ thiscall -arch=win32 ??1ostream@@UAE at XZ(ptr) ostream_dtor
+@ cdecl -arch=win64 ??1ostream@@UEAA at XZ(ptr) ostream_dtor
@ stub -arch=win32 ??1ostream_withassign@@UAE at XZ # virtual __thiscall ostream_withassign::~ostream_withassign(void)
@ stub -arch=win64 ??1ostream_withassign@@UEAA at XZ
@ thiscall -arch=win32 ??1ostrstream@@UAE at XZ(ptr) MSVCIRT_ostrstream_dtor
@@ -202,10 +202,10 @@
@ cdecl -arch=win64 ??4logic_error@@QEAAAEAV0 at AEBV0@@Z(ptr ptr) MSVCP_logic_error_assign
@ stub -arch=win32 ??4ofstream@@QAEAAV0 at ABV0@@Z # class ofstream & __thiscall ofstream::operator=(class ofstream const &)
@ stub -arch=win64 ??4ofstream@@QEAAAEAV0 at AEBV0@@Z
-@ stub -arch=win32 ??4ostream@@IAEAAV0 at ABV0@@Z # class ostream & __thiscall ostream::operator=(class ostream const &)
-@ stub -arch=win64 ??4ostream@@IEAAAEAV0 at AEBV0@@Z
-@ stub -arch=win32 ??4ostream@@IAEAAV0 at PAVstreambuf@@@Z # class ostream & __thiscall ostream::operator=(class streambuf *)
-@ stub -arch=win64 ??4ostream@@IEAAAEAV0 at PEAVstreambuf@@@Z
+@ thiscall -arch=win32 ??4ostream@@IAEAAV0 at ABV0@@Z(ptr ptr) ostream_assign
+@ cdecl -arch=win64 ??4ostream@@IEAAAEAV0 at AEBV0@@Z(ptr ptr) ostream_assign
+@ thiscall -arch=win32 ??4ostream@@IAEAAV0 at PAVstreambuf@@@Z(ptr ptr) ostream_assign_sb
+@ cdecl -arch=win64 ??4ostream@@IEAAAEAV0 at PEAVstreambuf@@@Z(ptr ptr) ostream_assign_sb
@ stub -arch=win32 ??4ostream_withassign@@QAEAAV0 at ABV0@@Z # class ostream_withassign & __thiscall ostream_withassign::operator=(class ostream_withassign const &)
@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAV0 at AEBV0@@Z
@ stub -arch=win32 ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z # class ostream & __thiscall ostream_withassign::operator=(class ostream const &)
@@ -313,7 +313,7 @@
# @ extern ??_7istrstream@@6B@ # const istrstream::`vftable'
@ extern ??_7logic_error@@6B@ MSVCP_logic_error_vtable
# @ extern ??_7ofstream@@6B@ # const ofstream::`vftable'
-# @ extern ??_7ostream@@6B@ # const ostream::`vftable'
+@ extern ??_7ostream@@6B@ MSVCP_ostream_vtable
# @ extern ??_7ostream_withassign@@6B@ # const ostream_withassign::`vftable'
# @ extern ??_7ostrstream@@6B@ # const ostrstream::`vftable'
@ extern ??_7stdiobuf@@6B@ MSVCP_stdiobuf_vtable
@@ -330,7 +330,7 @@
# @ extern ??_8istream_withassign@@7B@ # const istream_withassign::`vbtable'
# @ extern ??_8istrstream@@7B@ # const istrstream::`vbtable'
# @ extern ??_8ofstream@@7B@ # const ofstream::`vbtable'
-# @ extern ??_8ostream@@7B@ # const ostream::`vbtable'
+@ extern ??_8ostream@@7B@ ostream_vbtable
# @ extern ??_8ostream_withassign@@7B@ # const ostream_withassign::`vbtable'
# @ extern ??_8ostrstream@@7B@ # const ostrstream::`vbtable'
# @ extern ??_8stdiostream@@7Bistream@@@ # const stdiostream::`vbtable'{for `istream'}
@@ -351,8 +351,8 @@
@ stub -arch=win64 ??_Distrstream@@QEAAXXZ
@ stub -arch=win32 ??_Dofstream@@QAEXXZ # void __thiscall ofstream::`vbase destructor'(void)
@ stub -arch=win64 ??_Dofstream@@QEAAXXZ
-@ stub -arch=win32 ??_Dostream@@QAEXXZ # void __thiscall ostream::`vbase destructor'(void)
-@ stub -arch=win64 ??_Dostream@@QEAAXXZ
+@ thiscall -arch=win32 ??_Dostream@@QAEXXZ(ptr) ostream_vbase_dtor
+@ cdecl -arch=win64 ??_Dostream@@QEAAXXZ(ptr) ostream_vbase_dtor
@ stub -arch=win32 ??_Dostream_withassign@@QAEXXZ # void __thiscall ostream_withassign::`vbase destructor'(void)
@ stub -arch=win64 ??_Dostream_withassign@@QEAAXXZ
@ stub -arch=win32 ??_Dostrstream@@QAEXXZ # void __thiscall ostrstream::`vbase destructor'(void)
@@ -372,7 +372,7 @@
@ stub -arch=win32 ??_Eistrstream@@UAEPAXI at Z # virtual void * __thiscall istrstream::`vector deleting destructor'(unsigned int)
@ thiscall -arch=win32 ??_Elogic_error@@UAEPAXI at Z(ptr long) MSVCP_logic_error_vector_dtor
@ stub -arch=win32 ??_Eofstream@@UAEPAXI at Z # virtual void * __thiscall ofstream::`vector deleting destructor'(unsigned int)
-@ stub -arch=win32 ??_Eostream@@UAEPAXI at Z # virtual void * __thiscall ostream::`vector deleting destructor'(unsigned int)
+@ thiscall -arch=win32 ??_Eostream@@UAEPAXI at Z(ptr long) ostream_vector_dtor
@ stub -arch=win32 ??_Eostream_withassign@@UAEPAXI at Z # virtual void * __thiscall ostream_withassign::`vector deleting destructor'(unsigned int)
@ stub -arch=win32 ??_Eostrstream@@UAEPAXI at Z # virtual void * __thiscall ostrstream::`vector deleting destructor'(unsigned int)
@ thiscall -arch=win32 ??_Estdiobuf@@UAEPAXI at Z(ptr long) stdiobuf_vector_dtor
@@ -391,7 +391,7 @@
@ stub -arch=win32 ??_Gistrstream@@UAEPAXI at Z # virtual void * __thiscall istrstream::`scalar deleting destructor'(unsigned int)
@ thiscall -arch=win32 ??_Glogic_error@@UAEPAXI at Z(ptr long) MSVCP_logic_error_scalar_dtor
@ stub -arch=win32 ??_Gofstream@@UAEPAXI at Z # virtual void * __thiscall ofstream::`scalar deleting destructor'(unsigned int)
-@ stub -arch=win32 ??_Gostream@@UAEPAXI at Z # virtual void * __thiscall ostream::`scalar deleting destructor'(unsigned int)
+@ thiscall -arch=win32 ??_Gostream@@UAEPAXI at Z(ptr long) ostream_scalar_dtor
@ stub -arch=win32 ??_Gostream_withassign@@UAEPAXI at Z # virtual void * __thiscall ostream_withassign::`scalar deleting destructor'(unsigned int)
@ stub -arch=win32 ??_Gostrstream@@UAEPAXI at Z # virtual void * __thiscall ostrstream::`scalar deleting destructor'(unsigned int)
@ thiscall -arch=win32 ??_Gstdiobuf@@UAEPAXI at Z(ptr long) stdiobuf_scalar_dtor
@@ -457,10 +457,10 @@
@ cdecl -arch=win64 ?ebuf at streambuf@@IEBAPEADXZ(ptr) streambuf_ebuf
@ thiscall -arch=win32 ?egptr at streambuf@@IBEPADXZ(ptr) streambuf_egptr
@ cdecl -arch=win64 ?egptr at streambuf@@IEBAPEADXZ(ptr) streambuf_egptr
-@ cdecl -arch=win32 ?endl@@YAAAVostream@@AAV1@@Z(ptr) MSVCIRT_endl # class ostream & __cdecl endl(class ostream &)
-@ cdecl -arch=win64 ?endl@@YAAEAVostream@@AEAV1@@Z(ptr) MSVCIRT_endl
-@ cdecl -arch=win32 ?ends@@YAAAVostream@@AAV1@@Z(ptr) MSVCIRT_ends # class ostream & __cdecl ends(class ostream &)
-@ cdecl -arch=win64 ?ends@@YAAEAVostream@@AEAV1@@Z(ptr) MSVCIRT_ends
+@ cdecl -arch=win32 ?endl@@YAAAVostream@@AAV1@@Z(ptr) ostream_endl
+@ cdecl -arch=win64 ?endl@@YAAEAVostream@@AEAV1@@Z(ptr) ostream_endl
+@ cdecl -arch=win32 ?ends@@YAAAVostream@@AAV1@@Z(ptr) ostream_ends
+@ cdecl -arch=win64 ?ends@@YAAEAVostream@@AEAV1@@Z(ptr) ostream_ends
@ thiscall -arch=win32 ?eof at ios@@QBEHXZ(ptr) ios_eof
@ cdecl -arch=win64 ?eof at ios@@QEBAHXZ(ptr) ios_eof
@ thiscall -arch=win32 ?epptr at streambuf@@IBEPADXZ(ptr) streambuf_epptr
@@ -485,10 +485,10 @@
@ thiscall -arch=win32 ?flags at ios@@QBEJXZ(ptr) ios_flags_get
@ cdecl -arch=win64 ?flags at ios@@QEBAJXZ(ptr) ios_flags_get
@ extern ?floatfield at ios@@2JB ios_floatfield
-@ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z # class ostream & __cdecl flush(class ostream &)
-@ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z
-@ stub -arch=win32 ?flush at ostream@@QAEAAV1 at XZ # class ostream & __thiscall ostream::flush(void)
-@ stub -arch=win64 ?flush at ostream@@QEAAAEAV1 at XZ
+@ cdecl -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z(ptr) ostream_flush_manip
+@ cdecl -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z(ptr) ostream_flush_manip
+@ thiscall -arch=win32 ?flush at ostream@@QAEAAV1 at XZ(ptr) ostream_flush
+@ cdecl -arch=win64 ?flush at ostream@@QEAAAEAV1 at XZ(ptr) ostream_flush
@ thiscall -arch=win32 ?freeze at strstreambuf@@QAEXH at Z(ptr long) strstreambuf_freeze
@ cdecl -arch=win64 ?freeze at strstreambuf@@QEAAXH at Z(ptr long) strstreambuf_freeze
@ thiscall -arch=win32 ?gbump at streambuf@@IAEXH at Z(ptr long) streambuf_gbump
@@ -571,10 +571,10 @@
@ stub -arch=win32 ?open at ofstream@@QAEXPBDHH at Z # void __thiscall ofstream::open(char const *,int,int)
@ stub -arch=win64 ?open at ofstream@@QEAAXPEBDHH at Z
@ extern ?openprot at filebuf@@2HB filebuf_openprot
-@ stub -arch=win32 ?opfx at ostream@@QAEHXZ # int __thiscall ostream::opfx(void)
-@ stub -arch=win64 ?opfx at ostream@@QEAAHXZ
-@ stub -arch=win32 ?osfx at ostream@@QAEXXZ # void __thiscall ostream::osfx(void)
-@ stub -arch=win64 ?osfx at ostream@@QEAAXXZ
+@ thiscall -arch=win32 ?opfx at ostream@@QAEHXZ(ptr) ostream_opfx
+@ cdecl -arch=win64 ?opfx at ostream@@QEAAHXZ(ptr) ostream_opfx
+@ thiscall -arch=win32 ?osfx at ostream@@QAEXXZ(ptr) ostream_osfx
+@ cdecl -arch=win64 ?osfx at ostream@@QEAAXXZ(ptr) ostream_osfx
@ thiscall -arch=win32 ?out_waiting at streambuf@@QBEHXZ(ptr) streambuf_out_waiting
@ cdecl -arch=win64 ?out_waiting at streambuf@@QEBAHXZ(ptr) streambuf_out_waiting
@ thiscall -arch=win32 ?overflow at filebuf@@UAEHH at Z(ptr long) filebuf_overflow
@@ -603,12 +603,12 @@
@ cdecl -arch=win64 ?precision at ios@@QEAAHH at Z(ptr long) ios_precision_set
@ thiscall -arch=win32 ?precision at ios@@QBEHXZ(ptr) ios_precision_get
@ cdecl -arch=win64 ?precision at ios@@QEBAHXZ(ptr) ios_precision_get
-@ stub -arch=win32 ?put at ostream@@QAEAAV1 at C@Z # class ostream & __thiscall ostream::put(signed char)
-@ stub -arch=win64 ?put at ostream@@QEAAAEAV1 at C@Z
-@ stub -arch=win32 ?put at ostream@@QAEAAV1 at D@Z # class ostream & __thiscall ostream::put(char)
-@ stub -arch=win64 ?put at ostream@@QEAAAEAV1 at D@Z
-@ stub -arch=win32 ?put at ostream@@QAEAAV1 at E@Z # class ostream & __thiscall ostream::put(unsigned char)
-@ stub -arch=win64 ?put at ostream@@QEAAAEAV1 at E@Z
+@ thiscall -arch=win32 ?put at ostream@@QAEAAV1 at C@Z(ptr long) ostream_put_signed_char
+@ cdecl -arch=win64 ?put at ostream@@QEAAAEAV1 at C@Z(ptr long) ostream_put_signed_char
+@ thiscall -arch=win32 ?put at ostream@@QAEAAV1 at D@Z(ptr long) ostream_put_char
+@ cdecl -arch=win64 ?put at ostream@@QEAAAEAV1 at D@Z(ptr long) ostream_put_char
+@ thiscall -arch=win32 ?put at ostream@@QAEAAV1 at E@Z(ptr long) ostream_put_unsigned_char
+@ cdecl -arch=win64 ?put at ostream@@QEAAAEAV1 at E@Z(ptr long) ostream_put_unsigned_char
@ stub -arch=win32 ?putback at istream@@QAEAAV1 at D@Z # class istream & __thiscall istream::putback(char)
@ stub -arch=win64 ?putback at istream@@QEAAAEAV1 at D@Z
@ thiscall -arch=win32 ?pword at ios@@QBEAAPAXH at Z(ptr long) ios_pword
@@ -651,10 +651,10 @@
@ cdecl -arch=win64 ?seekoff at streambuf@@UEAAJJW4seek_dir at ios@@H at Z(ptr long long long) streambuf_seekoff
@ thiscall -arch=win32 ?seekoff at strstreambuf@@UAEJJW4seek_dir at ios@@H at Z(ptr long long long) strstreambuf_seekoff
@ cdecl -arch=win64 ?seekoff at strstreambuf@@UEAAJJW4seek_dir at ios@@H at Z(ptr long long long) strstreambuf_seekoff
-@ stub -arch=win32 ?seekp at ostream@@QAEAAV1 at J@Z # class ostream & __thiscall ostream::seekp(long)
-@ stub -arch=win64 ?seekp at ostream@@QEAAAEAV1 at J@Z
-@ stub -arch=win32 ?seekp at ostream@@QAEAAV1 at JW4seek_dir@ios@@@Z # class ostream & __thiscall ostream::seekp(long,enum ios::seek_dir)
-@ stub -arch=win64 ?seekp at ostream@@QEAAAEAV1 at JW4seek_dir@ios@@@Z
+@ thiscall -arch=win32 ?seekp at ostream@@QAEAAV1 at J@Z(ptr long) ostream_seekp
+@ cdecl -arch=win64 ?seekp at ostream@@QEAAAEAV1 at J@Z(ptr long) ostream_seekp
+@ thiscall -arch=win32 ?seekp at ostream@@QAEAAV1 at JW4seek_dir@ios@@@Z(ptr long long) ostream_seekp_offset
+@ cdecl -arch=win64 ?seekp at ostream@@QEAAAEAV1 at JW4seek_dir@ios@@@Z(ptr long long) ostream_seekp_offset
@ thiscall -arch=win32 ?seekpos at streambuf@@UAEJJH at Z(ptr long long) streambuf_seekpos
@ cdecl -arch=win64 ?seekpos at streambuf@@UEAAJJH at Z(ptr long long) streambuf_seekpos
@ thiscall -arch=win32 ?setb at streambuf@@IAEXPAD0H at Z(ptr ptr ptr long) streambuf_setb
@@ -734,8 +734,8 @@
@ cdecl ?sync_with_stdio at ios@@SAXXZ() ios_sync_with_stdio
@ stub -arch=win32 ?tellg at istream@@QAEJXZ # long __thiscall istream::tellg(void)
@ stub -arch=win64 ?tellg at istream@@QEAAJXZ
-@ stub -arch=win32 ?tellp at ostream@@QAEJXZ # long __thiscall ostream::tellp(void)
-@ stub -arch=win64 ?tellp at ostream@@QEAAJXZ
+@ thiscall -arch=win32 ?tellp at ostream@@QAEJXZ(ptr) ostream_tellp
+@ cdecl -arch=win64 ?tellp at ostream@@QEAAJXZ(ptr) ostream_tellp
@ extern ?text at filebuf@@2HB filebuf_text
@ thiscall -arch=win32 ?tie at ios@@QAEPAVostream@@PAV2@@Z(ptr ptr) ios_tie_set
@ cdecl -arch=win64 ?tie at ios@@QEAAPEAVostream@@PEAV2@@Z(ptr ptr) ios_tie_set
@@ -766,14 +766,14 @@
@ cdecl -arch=win64 ?width at ios@@QEAAHH at Z(ptr long) ios_width_set
@ thiscall -arch=win32 ?width at ios@@QBEHXZ(ptr) ios_width_get
@ cdecl -arch=win64 ?width at ios@@QEBAHXZ(ptr) ios_width_get
-@ stub -arch=win32 ?write at ostream@@QAEAAV1 at PBCH@Z # class ostream & __thiscall ostream::write(signed char const *,int)
-@ stub -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBCH@Z
-@ stub -arch=win32 ?write at ostream@@QAEAAV1 at PBDH@Z # class ostream & __thiscall ostream::write(char const *,int)
-@ stub -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBDH@Z
-@ stub -arch=win32 ?write at ostream@@QAEAAV1 at PBEH@Z # class ostream & __thiscall ostream::write(unsigned char const *,int)
-@ stub -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBEH@Z
-@ stub -arch=win32 ?writepad at ostream@@AAEAAV1 at PBD0@Z # class ostream & __thiscall ostream::writepad(char const *,char const *)
-@ stub -arch=win64 ?writepad at ostream@@AEAAAEAV1 at PEBD0@Z
+@ thiscall -arch=win32 ?write at ostream@@QAEAAV1 at PBCH@Z(ptr str long) ostream_write_signed_char
+@ cdecl -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBCH@Z(ptr str long) ostream_write_signed_char
+@ thiscall -arch=win32 ?write at ostream@@QAEAAV1 at PBDH@Z(ptr str long) ostream_write_char
+@ cdecl -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBDH@Z(ptr str long) ostream_write_char
+@ thiscall -arch=win32 ?write at ostream@@QAEAAV1 at PBEH@Z(ptr str long) ostream_write_unsigned_char
+@ cdecl -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBEH@Z(ptr str long) ostream_write_unsigned_char
+@ thiscall -arch=win32 ?writepad at ostream@@AAEAAV1 at PBD0@Z(ptr str str) ostream_writepad
+@ cdecl -arch=win64 ?writepad at ostream@@AEAAAEAV1 at PEBD0@Z(ptr str str) ostream_writepad
@ stub -arch=win32 ?ws@@YAAAVistream@@AAV1@@Z # class istream & __cdecl ws(class istream &)
@ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z
@ extern ?x_curindex at ios@@0HA ios_curindex
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index cc66e2d..fe02463 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -70,12 +70,12 @@
@ stub -arch=win64 ??0ofstream@@QEAA at PEBDHH@Z
@ stub -arch=win32 ??0ofstream@@QAE at XZ
@ stub -arch=win64 ??0ofstream@@QEAA at XZ
-@ stub -arch=win32 ??0ostream@@IAE at ABV0@@Z
-@ stub -arch=win64 ??0ostream@@IEAA at AEBV0@@Z
-@ stub -arch=win32 ??0ostream@@IAE at XZ
-@ stub -arch=win64 ??0ostream@@IEAA at XZ
-@ stub -arch=win32 ??0ostream@@QAE at PAVstreambuf@@@Z
-@ stub -arch=win64 ??0ostream@@QEAA at PEAVstreambuf@@@Z
+@ thiscall -arch=win32 ??0ostream@@IAE at ABV0@@Z(ptr ptr long) msvcirt.??0ostream@@IAE at ABV0@@Z
+@ cdecl -arch=win64 ??0ostream@@IEAA at AEBV0@@Z(ptr ptr long) msvcirt.??0ostream@@IEAA at AEBV0@@Z
+@ thiscall -arch=win32 ??0ostream@@IAE at XZ(ptr long) msvcirt.??0ostream@@IAE at XZ
+@ cdecl -arch=win64 ??0ostream@@IEAA at XZ(ptr long) msvcirt.??0ostream@@IEAA at XZ
+@ thiscall -arch=win32 ??0ostream@@QAE at PAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream@@QAE at PAVstreambuf@@@Z
+@ cdecl -arch=win64 ??0ostream@@QEAA at PEAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream@@QEAA at PEAVstreambuf@@@Z
@ stub -arch=win32 ??0ostream_withassign@@QAE at ABV0@@Z
@ stub -arch=win64 ??0ostream_withassign@@QEAA at AEBV0@@Z
@ stub -arch=win32 ??0ostream_withassign@@QAE at PAVstreambuf@@@Z
@@ -138,8 +138,8 @@
@ stub -arch=win64 ??1istrstream@@UEAA at XZ
@ stub -arch=win32 ??1ofstream@@UAE at XZ
@ stub -arch=win64 ??1ofstream@@UEAA at XZ
-@ stub -arch=win32 ??1ostream@@UAE at XZ
-@ stub -arch=win64 ??1ostream@@UEAA at XZ
+@ thiscall -arch=win32 ??1ostream@@UAE at XZ(ptr) msvcirt.??1ostream@@UAE at XZ
+@ cdecl -arch=win64 ??1ostream@@UEAA at XZ(ptr) msvcirt.??1ostream@@UEAA at XZ
@ stub -arch=win32 ??1ostream_withassign@@UAE at XZ
@ stub -arch=win64 ??1ostream_withassign@@UEAA at XZ
@ thiscall -arch=win32 ??1ostrstream@@UAE at XZ(ptr) msvcirt.??1ostrstream@@UAE at XZ
@@ -186,10 +186,10 @@
@ stub -arch=win64 ??4istrstream@@QEAAAEAV0 at AEBV0@@Z
@ stub -arch=win32 ??4ofstream@@QAEAAV0 at ABV0@@Z
@ stub -arch=win64 ??4ofstream@@QEAAAEAV0 at AEBV0@@Z
-@ stub -arch=win32 ??4ostream@@IAEAAV0 at ABV0@@Z
-@ stub -arch=win64 ??4ostream@@IEAAAEAV0 at AEBV0@@Z
-@ stub -arch=win32 ??4ostream@@IAEAAV0 at PAVstreambuf@@@Z
-@ stub -arch=win64 ??4ostream@@IEAAAEAV0 at PEAVstreambuf@@@Z
+@ thiscall -arch=win32 ??4ostream@@IAEAAV0 at ABV0@@Z(ptr ptr) msvcirt.??4ostream@@IAEAAV0 at ABV0@@Z
+@ cdecl -arch=win64 ??4ostream@@IEAAAEAV0 at AEBV0@@Z(ptr ptr) msvcirt.??4ostream@@IEAAAEAV0 at AEBV0@@Z
+@ thiscall -arch=win32 ??4ostream@@IAEAAV0 at PAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream@@IAEAAV0 at PAVstreambuf@@@Z
+@ cdecl -arch=win64 ??4ostream@@IEAAAEAV0 at PEAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream@@IEAAAEAV0 at PEAVstreambuf@@@Z
@ stub -arch=win32 ??4ostream_withassign@@QAEAAV0 at ABV0@@Z
@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAV0 at AEBV0@@Z
@ stub -arch=win32 ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z
@@ -295,7 +295,7 @@
# @ extern ??_7istream_withassign@@6B@
# @ extern ??_7istrstream@@6B@
# @ extern ??_7ofstream@@6B@
-# @ extern ??_7ostream@@6B@
+@ extern ??_7ostream@@6B@ msvcirt.??_7ostream@@6B@
# @ extern ??_7ostream_withassign@@6B@
# @ extern ??_7ostrstream@@6B@
@ extern ??_7stdiobuf@@6B@ msvcirt.??_7stdiobuf@@6B@
@@ -312,7 +312,7 @@
# @ extern ??_8istream_withassign@@7B@
# @ extern ??_8istrstream@@7B@
# @ extern ??_8ofstream@@7B@
-# @ extern ??_8ostream@@7B@
+@ extern ??_8ostream@@7B@ msvcirt.??_8ostream@@7B@
# @ extern ??_8ostream_withassign@@7B@
# @ extern ??_8ostrstream@@7B@
# @ extern ??_8stdiostream@@7Bistream@@@
@@ -333,8 +333,8 @@
@ stub -arch=win64 ??_Distrstream@@QEAAXXZ
@ stub -arch=win32 ??_Dofstream@@QAEXXZ
@ stub -arch=win64 ??_Dofstream@@QEAAXXZ
-@ stub -arch=win32 ??_Dostream@@QAEXXZ
-@ stub -arch=win64 ??_Dostream@@QEAAXXZ
+@ thiscall -arch=win32 ??_Dostream@@QAEXXZ(ptr) msvcirt.??_Dostream@@QAEXXZ
+@ cdecl -arch=win64 ??_Dostream@@QEAAXXZ(ptr) msvcirt.??_Dostream@@QEAAXXZ
@ stub -arch=win32 ??_Dostream_withassign@@QAEXXZ
@ stub -arch=win64 ??_Dostream_withassign@@QEAAXXZ
@ stub -arch=win32 ??_Dostrstream@@QAEXXZ
@@ -353,7 +353,7 @@
@ stub -arch=win32 ??_Eistream_withassign@@UAEPAXI at Z
@ stub -arch=win32 ??_Eistrstream@@UAEPAXI at Z
@ stub -arch=win32 ??_Eofstream@@UAEPAXI at Z
-@ stub -arch=win32 ??_Eostream@@UAEPAXI at Z
+@ thiscall -arch=win32 ??_Eostream@@UAEPAXI at Z(ptr long) msvcirt.??_Eostream@@UAEPAXI at Z
@ stub -arch=win32 ??_Eostream_withassign@@UAEPAXI at Z
@ stub -arch=win32 ??_Eostrstream@@UAEPAXI at Z
@ thiscall -arch=win32 ??_Estdiobuf@@UAEPAXI at Z(ptr long) msvcirt.??_Estdiobuf@@UAEPAXI at Z
@@ -371,7 +371,7 @@
@ stub -arch=win32 ??_Gistream_withassign@@UAEPAXI at Z
@ stub -arch=win32 ??_Gistrstream@@UAEPAXI at Z
@ stub -arch=win32 ??_Gofstream@@UAEPAXI at Z
-@ stub -arch=win32 ??_Gostream@@UAEPAXI at Z
+@ thiscall -arch=win32 ??_Gostream@@UAEPAXI at Z(ptr long) msvcirt.??_Gostream@@UAEPAXI at Z
@ stub -arch=win32 ??_Gostream_withassign@@UAEPAXI at Z
@ stub -arch=win32 ??_Gostrstream@@UAEPAXI at Z
@ thiscall -arch=win32 ??_Gstdiobuf@@UAEPAXI at Z(ptr long) msvcirt.??_Gstdiobuf@@UAEPAXI at Z
@@ -473,10 +473,10 @@
@ thiscall -arch=win32 ?flags at ios@@QBEJXZ(ptr) msvcirt.?flags at ios@@QBEJXZ
@ cdecl -arch=win64 ?flags at ios@@QEBAJXZ(ptr) msvcirt.?flags at ios@@QEBAJXZ
@ extern ?floatfield at ios@@2JB msvcirt.?floatfield at ios@@2JB
-@ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z
-@ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z
-@ stub -arch=win32 ?flush at ostream@@QAEAAV1 at XZ
-@ stub -arch=win64 ?flush at ostream@@QEAAAEAV1 at XZ
+@ cdecl -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z(ptr) msvcirt.?flush@@YAAAVostream@@AAV1@@Z
+@ cdecl -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z(ptr) msvcirt.?flush@@YAAEAVostream@@AEAV1@@Z
+@ thiscall -arch=win32 ?flush at ostream@@QAEAAV1 at XZ(ptr) msvcirt.?flush at ostream@@QAEAAV1 at XZ
+@ cdecl -arch=win64 ?flush at ostream@@QEAAAEAV1 at XZ(ptr) msvcirt.?flush at ostream@@QEAAAEAV1 at XZ
@ thiscall -arch=win32 ?freeze at strstreambuf@@QAEXH at Z(ptr long) msvcirt.?freeze at strstreambuf@@QAEXH at Z
@ cdecl -arch=win64 ?freeze at strstreambuf@@QEAAXH at Z(ptr long) msvcirt.?freeze at strstreambuf@@QEAAXH at Z
@ thiscall -arch=win32 ?gbump at streambuf@@IAEXH at Z(ptr long) msvcirt.?gbump at streambuf@@IAEXH at Z
@@ -557,10 +557,10 @@
@ stub -arch=win32 ?open at ofstream@@QAEXPBDHH at Z
@ stub -arch=win64 ?open at ofstream@@QEAAXPEBDHH at Z
@ extern ?openprot at filebuf@@2HB msvcirt.?openprot at filebuf@@2HB
-@ stub -arch=win32 ?opfx at ostream@@QAEHXZ
-@ stub -arch=win64 ?opfx at ostream@@QEAAHXZ
-@ stub -arch=win32 ?osfx at ostream@@QAEXXZ
-@ stub -arch=win64 ?osfx at ostream@@QEAAXXZ
+@ thiscall -arch=win32 ?opfx at ostream@@QAEHXZ(ptr) msvcirt.?opfx at ostream@@QAEHXZ
+@ cdecl -arch=win64 ?opfx at ostream@@QEAAHXZ(ptr) msvcirt.?opfx at ostream@@QEAAHXZ
+@ thiscall -arch=win32 ?osfx at ostream@@QAEXXZ(ptr) msvcirt.?osfx at ostream@@QAEXXZ
+@ cdecl -arch=win64 ?osfx at ostream@@QEAAXXZ(ptr) msvcirt.?osfx at ostream@@QEAAXXZ
@ thiscall -arch=win32 ?out_waiting at streambuf@@QBEHXZ(ptr) msvcirt.?out_waiting at streambuf@@QBEHXZ
@ cdecl -arch=win64 ?out_waiting at streambuf@@QEBAHXZ(ptr) msvcirt.?out_waiting at streambuf@@QEBAHXZ
@ thiscall -arch=win32 ?overflow at filebuf@@UAEHH at Z(ptr long) msvcirt.?overflow at filebuf@@UAEHH at Z
@@ -589,12 +589,12 @@
@ cdecl -arch=win64 ?precision at ios@@QEAAHH at Z(ptr long) msvcirt.?precision at ios@@QEAAHH at Z
@ thiscall -arch=win32 ?precision at ios@@QBEHXZ(ptr) msvcirt.?precision at ios@@QBEHXZ
@ cdecl -arch=win64 ?precision at ios@@QEBAHXZ(ptr) msvcirt.?precision at ios@@QEBAHXZ
-@ stub -arch=win32 ?put at ostream@@QAEAAV1 at C@Z
-@ stub -arch=win64 ?put at ostream@@QEAAAEAV1 at C@Z
-@ stub -arch=win32 ?put at ostream@@QAEAAV1 at D@Z
-@ stub -arch=win64 ?put at ostream@@QEAAAEAV1 at D@Z
-@ stub -arch=win32 ?put at ostream@@QAEAAV1 at E@Z
-@ stub -arch=win64 ?put at ostream@@QEAAAEAV1 at E@Z
+@ thiscall -arch=win32 ?put at ostream@@QAEAAV1 at C@Z(ptr long) msvcirt.?put at ostream@@QAEAAV1 at C@Z
+@ cdecl -arch=win64 ?put at ostream@@QEAAAEAV1 at C@Z(ptr long) msvcirt.?put at ostream@@QEAAAEAV1 at C@Z
+@ thiscall -arch=win32 ?put at ostream@@QAEAAV1 at D@Z(ptr long) msvcirt.?put at ostream@@QAEAAV1 at D@Z
+@ cdecl -arch=win64 ?put at ostream@@QEAAAEAV1 at D@Z(ptr long) msvcirt.?put at ostream@@QEAAAEAV1 at D@Z
+@ thiscall -arch=win32 ?put at ostream@@QAEAAV1 at E@Z(ptr long) msvcirt.?put at ostream@@QAEAAV1 at E@Z
+@ cdecl -arch=win64 ?put at ostream@@QEAAAEAV1 at E@Z(ptr long) msvcirt.?put at ostream@@QEAAAEAV1 at E@Z
@ stub -arch=win32 ?putback at istream@@QAEAAV1 at D@Z
@ stub -arch=win64 ?putback at istream@@QEAAAEAV1 at D@Z
@ thiscall -arch=win32 ?pword at ios@@QBEAAPAXH at Z(ptr long) msvcirt.?pword at ios@@QBEAAPAXH at Z
@@ -637,10 +637,10 @@
@ cdecl -arch=win64 ?seekoff at streambuf@@UEAAJJW4seek_dir at ios@@H at Z(ptr long long long) msvcirt.?seekoff at streambuf@@UEAAJJW4seek_dir at ios@@H at Z
@ thiscall -arch=win32 ?seekoff at strstreambuf@@UAEJJW4seek_dir at ios@@H at Z(ptr long long long) msvcirt.?seekoff at strstreambuf@@UAEJJW4seek_dir at ios@@H at Z
@ cdecl -arch=win64 ?seekoff at strstreambuf@@UEAAJJW4seek_dir at ios@@H at Z(ptr long long long) msvcirt.?seekoff at strstreambuf@@UEAAJJW4seek_dir at ios@@H at Z
-@ stub -arch=win32 ?seekp at ostream@@QAEAAV1 at J@Z
-@ stub -arch=win64 ?seekp at ostream@@QEAAAEAV1 at J@Z
-@ stub -arch=win32 ?seekp at ostream@@QAEAAV1 at JW4seek_dir@ios@@@Z
-@ stub -arch=win64 ?seekp at ostream@@QEAAAEAV1 at JW4seek_dir@ios@@@Z
+@ thiscall -arch=win32 ?seekp at ostream@@QAEAAV1 at J@Z(ptr long) msvcirt.?seekp at ostream@@QAEAAV1 at J@Z
+@ cdecl -arch=win64 ?seekp at ostream@@QEAAAEAV1 at J@Z(ptr long) msvcirt.?seekp at ostream@@QEAAAEAV1 at J@Z
+@ thiscall -arch=win32 ?seekp at ostream@@QAEAAV1 at JW4seek_dir@ios@@@Z(ptr long long) msvcirt.?seekp at ostream@@QAEAAV1 at JW4seek_dir@ios@@@Z
+@ cdecl -arch=win64 ?seekp at ostream@@QEAAAEAV1 at JW4seek_dir@ios@@@Z(ptr long long) msvcirt.?seekp at ostream@@QEAAAEAV1 at JW4seek_dir@ios@@@Z
@ thiscall -arch=win32 ?seekpos at streambuf@@UAEJJH at Z(ptr long long) msvcirt.?seekpos at streambuf@@UAEJJH at Z
@ cdecl -arch=win64 ?seekpos at streambuf@@UEAAJJH at Z(ptr long long) msvcirt.?seekpos at streambuf@@UEAAJJH at Z
@ cdecl ?set_terminate@@YAP6AXXZP6AXXZ at Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ at Z
@@ -722,8 +722,8 @@
@ cdecl ?sync_with_stdio at ios@@SAXXZ() msvcirt.?sync_with_stdio at ios@@SAXXZ
@ stub -arch=win32 ?tellg at istream@@QAEJXZ
@ stub -arch=win64 ?tellg at istream@@QEAAJXZ
-@ stub -arch=win32 ?tellp at ostream@@QAEJXZ
-@ stub -arch=win64 ?tellp at ostream@@QEAAJXZ
+@ thiscall -arch=win32 ?tellp at ostream@@QAEJXZ(ptr) msvcirt.?tellp at ostream@@QAEJXZ
+@ cdecl -arch=win64 ?tellp at ostream@@QEAAJXZ(ptr) msvcirt.?tellp at ostream@@QEAAJXZ
@ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ
@ extern ?text at filebuf@@2HB msvcirt.?text at filebuf@@2HB
@ thiscall -arch=win32 ?tie at ios@@QAEPAVostream@@PAV2@@Z(ptr ptr) msvcirt.?tie at ios@@QAEPAVostream@@PAV2@@Z
@@ -754,14 +754,14 @@
@ cdecl -arch=win64 ?width at ios@@QEAAHH at Z(ptr long) msvcirt.?width at ios@@QEAAHH at Z
@ thiscall -arch=win32 ?width at ios@@QBEHXZ(ptr) msvcirt.?width at ios@@QBEHXZ
@ cdecl -arch=win64 ?width at ios@@QEBAHXZ(ptr) msvcirt.?width at ios@@QEBAHXZ
-@ stub -arch=win32 ?write at ostream@@QAEAAV1 at PBCH@Z
-@ stub -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBCH@Z
-@ stub -arch=win32 ?write at ostream@@QAEAAV1 at PBDH@Z
-@ stub -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBDH@Z
-@ stub -arch=win32 ?write at ostream@@QAEAAV1 at PBEH@Z
-@ stub -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBEH@Z
-@ stub -arch=win32 ?writepad at ostream@@AAEAAV1 at PBD0@Z
-@ stub -arch=win64 ?writepad at ostream@@AEAAAEAV1 at PEBD0@Z
+@ thiscall -arch=win32 ?write at ostream@@QAEAAV1 at PBCH@Z(ptr str long) msvcirt.?write at ostream@@QAEAAV1 at PBCH@Z
+@ cdecl -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBCH@Z(ptr str long) msvcirt.?write at ostream@@QEAAAEAV1 at PEBCH@Z
+@ thiscall -arch=win32 ?write at ostream@@QAEAAV1 at PBDH@Z(ptr str long) msvcirt.?write at ostream@@QAEAAV1 at PBDH@Z
+@ cdecl -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBDH@Z(ptr str long) msvcirt.?write at ostream@@QEAAAEAV1 at PEBDH@Z
+@ thiscall -arch=win32 ?write at ostream@@QAEAAV1 at PBEH@Z(ptr str long) msvcirt.?write at ostream@@QAEAAV1 at PBEH@Z
+@ cdecl -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBEH@Z(ptr str long) msvcirt.?write at ostream@@QEAAAEAV1 at PEBEH@Z
+@ thiscall -arch=win32 ?writepad at ostream@@AAEAAV1 at PBD0@Z(ptr str str) msvcirt.?writepad at ostream@@AAEAAV1 at PBD0@Z
+@ cdecl -arch=win64 ?writepad at ostream@@AEAAAEAV1 at PEBD0@Z(ptr str str) msvcirt.?writepad at ostream@@AEAAAEAV1 at PEBD0@Z
@ stub -arch=win32 ?ws@@YAAAVistream@@AAV1@@Z
@ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z
@ extern ?x_curindex at ios@@0HA msvcirt.?x_curindex at ios@@0HA
diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec
index 35cc388..ee6cf79 100644
--- a/dlls/msvcrt40/msvcrt40.spec
+++ b/dlls/msvcrt40/msvcrt40.spec
@@ -92,12 +92,12 @@
@ stub -arch=win64 ??0ofstream@@QEAA at PEBDHH@Z
@ stub -arch=win32 ??0ofstream@@QAE at XZ
@ stub -arch=win64 ??0ofstream@@QEAA at XZ
-@ stub -arch=win32 ??0ostream@@IAE at ABV0@@Z
-@ stub -arch=win64 ??0ostream@@IEAA at AEBV0@@Z
-@ stub -arch=win32 ??0ostream@@IAE at XZ
-@ stub -arch=win64 ??0ostream@@IEAA at XZ
-@ stub -arch=win32 ??0ostream@@QAE at PAVstreambuf@@@Z
-@ stub -arch=win64 ??0ostream@@QEAA at PEAVstreambuf@@@Z
+@ thiscall -arch=win32 ??0ostream@@IAE at ABV0@@Z(ptr ptr long) msvcirt.??0ostream@@IAE at ABV0@@Z
+@ cdecl -arch=win64 ??0ostream@@IEAA at AEBV0@@Z(ptr ptr long) msvcirt.??0ostream@@IEAA at AEBV0@@Z
+@ thiscall -arch=win32 ??0ostream@@IAE at XZ(ptr long) msvcirt.??0ostream@@IAE at XZ
+@ cdecl -arch=win64 ??0ostream@@IEAA at XZ(ptr long) msvcirt.??0ostream@@IEAA at XZ
+@ thiscall -arch=win32 ??0ostream@@QAE at PAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream@@QAE at PAVstreambuf@@@Z
+@ cdecl -arch=win64 ??0ostream@@QEAA at PEAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream@@QEAA at PEAVstreambuf@@@Z
@ stub -arch=win32 ??0ostream_withassign@@QAE at ABV0@@Z
@ stub -arch=win64 ??0ostream_withassign@@QEAA at AEBV0@@Z
@ stub -arch=win32 ??0ostream_withassign@@QAE at PAVstreambuf@@@Z
@@ -170,8 +170,8 @@
@ cdecl -arch=win64 ??1logic_error@@UEAA at XZ(ptr) msvcirt.??1logic_error@@UEAA at XZ
@ stub -arch=win32 ??1ofstream@@UAE at XZ
@ stub -arch=win64 ??1ofstream@@UEAA at XZ
-@ stub -arch=win32 ??1ostream@@UAE at XZ
-@ stub -arch=win64 ??1ostream@@UEAA at XZ
+@ thiscall -arch=win32 ??1ostream@@UAE at XZ(ptr) msvcirt.??1ostream@@UAE at XZ
+@ cdecl -arch=win64 ??1ostream@@UEAA at XZ(ptr) msvcirt.??1ostream@@UEAA at XZ
@ stub -arch=win32 ??1ostream_withassign@@UAE at XZ
@ stub -arch=win64 ??1ostream_withassign@@UEAA at XZ
@ thiscall -arch=win32 ??1ostrstream@@UAE at XZ(ptr) msvcirt.??1ostrstream@@UAE at XZ
@@ -230,10 +230,10 @@
@ cdecl -arch=win64 ??4logic_error@@QEAAAEAV0 at AEBV0@@Z(ptr ptr) msvcirt.??4logic_error@@QEAAAEAV0 at AEBV0@@Z
@ stub -arch=win32 ??4ofstream@@QAEAAV0 at ABV0@@Z
@ stub -arch=win64 ??4ofstream@@QEAAAEAV0 at AEBV0@@Z
-@ stub -arch=win32 ??4ostream@@IAEAAV0 at ABV0@@Z
-@ stub -arch=win64 ??4ostream@@IEAAAEAV0 at AEBV0@@Z
-@ stub -arch=win32 ??4ostream@@IAEAAV0 at PAVstreambuf@@@Z
-@ stub -arch=win64 ??4ostream@@IEAAAEAV0 at PEAVstreambuf@@@Z
+@ thiscall -arch=win32 ??4ostream@@IAEAAV0 at ABV0@@Z(ptr ptr) msvcirt.??4ostream@@IAEAAV0 at ABV0@@Z
+@ cdecl -arch=win64 ??4ostream@@IEAAAEAV0 at AEBV0@@Z(ptr ptr) msvcirt.??4ostream@@IEAAAEAV0 at AEBV0@@Z
+@ thiscall -arch=win32 ??4ostream@@IAEAAV0 at PAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream@@IAEAAV0 at PAVstreambuf@@@Z
+@ cdecl -arch=win64 ??4ostream@@IEAAAEAV0 at PEAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream@@IEAAAEAV0 at PEAVstreambuf@@@Z
@ stub -arch=win32 ??4ostream_withassign@@QAEAAV0 at ABV0@@Z
@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAV0 at AEBV0@@Z
@ stub -arch=win32 ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z
@@ -348,7 +348,7 @@
# @ extern ??_7istrstream@@6B@
@ extern ??_7logic_error@@6B@ msvcirt.??_7logic_error@@6B@
# @ extern ??_7ofstream@@6B@
-# @ extern ??_7ostream@@6B@
+@ extern ??_7ostream@@6B@ msvcirt.??_7ostream@@6B@
# @ extern ??_7ostream_withassign@@6B@
# @ extern ??_7ostrstream@@6B@
@ extern ??_7stdiobuf@@6B@ msvcirt.??_7stdiobuf@@6B@
@@ -365,7 +365,7 @@
# @ extern ??_8istream_withassign@@7B@
# @ extern ??_8istrstream@@7B@
# @ extern ??_8ofstream@@7B@
-# @ extern ??_8ostream@@7B@
+@ extern ??_8ostream@@7B@ msvcirt.??_8ostream@@7B@
# @ extern ??_8ostream_withassign@@7B@
# @ extern ??_8ostrstream@@7B@
# @ extern ??_8stdiostream@@7Bistream@@@
@@ -386,8 +386,8 @@
@ stub -arch=win64 ??_Distrstream@@QEAAXXZ
@ stub -arch=win32 ??_Dofstream@@QAEXXZ
@ stub -arch=win64 ??_Dofstream@@QEAAXXZ
-@ stub -arch=win32 ??_Dostream@@QAEXXZ
-@ stub -arch=win64 ??_Dostream@@QEAAXXZ
+@ thiscall -arch=win32 ??_Dostream@@QAEXXZ(ptr) msvcirt.??_Dostream@@QAEXXZ
+@ cdecl -arch=win64 ??_Dostream@@QEAAXXZ(ptr) msvcirt.??_Dostream@@QEAAXXZ
@ stub -arch=win32 ??_Dostream_withassign@@QAEXXZ
@ stub -arch=win64 ??_Dostream_withassign@@QEAAXXZ
@ stub -arch=win32 ??_Dostrstream@@QAEXXZ
@@ -411,7 +411,7 @@
@ stub -arch=win32 ??_Eistrstream@@UAEPAXI at Z
@ thiscall -arch=win32 ??_Elogic_error@@UAEPAXI at Z(ptr long) msvcirt.??_Elogic_error@@UAEPAXI at Z
@ stub -arch=win32 ??_Eofstream@@UAEPAXI at Z
-@ stub -arch=win32 ??_Eostream@@UAEPAXI at Z
+@ thiscall -arch=win32 ??_Eostream@@UAEPAXI at Z(ptr long) msvcirt.??_Eostream@@UAEPAXI at Z
@ stub -arch=win32 ??_Eostream_withassign@@UAEPAXI at Z
@ stub -arch=win32 ??_Eostrstream@@UAEPAXI at Z
@ thiscall -arch=win32 ??_Estdiobuf@@UAEPAXI at Z(ptr long) msvcirt.??_Estdiobuf@@UAEPAXI at Z
@@ -434,7 +434,7 @@
@ stub -arch=win32 ??_Gistrstream@@UAEPAXI at Z
@ thiscall -arch=win32 ??_Glogic_error@@UAEPAXI at Z(ptr long) msvcirt.??_Glogic_error@@UAEPAXI at Z
@ stub -arch=win32 ??_Gofstream@@UAEPAXI at Z
-@ stub -arch=win32 ??_Gostream@@UAEPAXI at Z
+@ thiscall -arch=win32 ??_Gostream@@UAEPAXI at Z(ptr long) msvcirt.??_Gostream@@UAEPAXI at Z
@ stub -arch=win32 ??_Gostream_withassign@@UAEPAXI at Z
@ stub -arch=win32 ??_Gostrstream@@UAEPAXI at Z
@ thiscall -arch=win32 ??_Gstdiobuf@@UAEPAXI at Z(ptr long) msvcirt.??_Gstdiobuf@@UAEPAXI at Z
@@ -538,10 +538,10 @@
@ thiscall -arch=win32 ?flags at ios@@QBEJXZ(ptr) msvcirt.?flags at ios@@QBEJXZ
@ cdecl -arch=win64 ?flags at ios@@QEBAJXZ(ptr) msvcirt.?flags at ios@@QEBAJXZ
@ extern ?floatfield at ios@@2JB msvcirt.?floatfield at ios@@2JB
-@ stub -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z
-@ stub -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z
-@ stub -arch=win32 ?flush at ostream@@QAEAAV1 at XZ
-@ stub -arch=win64 ?flush at ostream@@QEAAAEAV1 at XZ
+@ cdecl -arch=win32 ?flush@@YAAAVostream@@AAV1@@Z(ptr) msvcirt.?flush@@YAAAVostream@@AAV1@@Z
+@ cdecl -arch=win64 ?flush@@YAAEAVostream@@AEAV1@@Z(ptr) msvcirt.?flush@@YAAEAVostream@@AEAV1@@Z
+@ thiscall -arch=win32 ?flush at ostream@@QAEAAV1 at XZ(ptr) msvcirt.?flush at ostream@@QAEAAV1 at XZ
+@ cdecl -arch=win64 ?flush at ostream@@QEAAAEAV1 at XZ(ptr) msvcirt.?flush at ostream@@QEAAAEAV1 at XZ
@ thiscall -arch=win32 ?freeze at strstreambuf@@QAEXH at Z(ptr long) msvcirt.?freeze at strstreambuf@@QAEXH at Z
@ cdecl -arch=win64 ?freeze at strstreambuf@@QEAAXH at Z(ptr long) msvcirt.?freeze at strstreambuf@@QEAAXH at Z
@ thiscall -arch=win32 ?gbump at streambuf@@IAEXH at Z(ptr long) msvcirt.?gbump at streambuf@@IAEXH at Z
@@ -626,10 +626,10 @@
@ stub -arch=win32 ?open at ofstream@@QAEXPBDHH at Z
@ stub -arch=win64 ?open at ofstream@@QEAAXPEBDHH at Z
@ extern ?openprot at filebuf@@2HB msvcirt.?openprot at filebuf@@2HB
-@ stub -arch=win32 ?opfx at ostream@@QAEHXZ
-@ stub -arch=win64 ?opfx at ostream@@QEAAHXZ
-@ stub -arch=win32 ?osfx at ostream@@QAEXXZ
-@ stub -arch=win64 ?osfx at ostream@@QEAAXXZ
+@ thiscall -arch=win32 ?opfx at ostream@@QAEHXZ(ptr) msvcirt.?opfx at ostream@@QAEHXZ
+@ cdecl -arch=win64 ?opfx at ostream@@QEAAHXZ(ptr) msvcirt.?opfx at ostream@@QEAAHXZ
+@ thiscall -arch=win32 ?osfx at ostream@@QAEXXZ(ptr) msvcirt.?osfx at ostream@@QAEXXZ
+@ cdecl -arch=win64 ?osfx at ostream@@QEAAXXZ(ptr) msvcirt.?osfx at ostream@@QEAAXXZ
@ thiscall -arch=win32 ?out_waiting at streambuf@@QBEHXZ(ptr) msvcirt.?out_waiting at streambuf@@QBEHXZ
@ cdecl -arch=win64 ?out_waiting at streambuf@@QEBAHXZ(ptr) msvcirt.?out_waiting at streambuf@@QEBAHXZ
@ thiscall -arch=win32 ?overflow at filebuf@@UAEHH at Z(ptr long) msvcirt.?overflow at filebuf@@UAEHH at Z
@@ -658,12 +658,12 @@
@ cdecl -arch=win64 ?precision at ios@@QEAAHH at Z(ptr long) msvcirt.?precision at ios@@QEAAHH at Z
@ thiscall -arch=win32 ?precision at ios@@QBEHXZ(ptr) msvcirt.?precision at ios@@QBEHXZ
@ cdecl -arch=win64 ?precision at ios@@QEBAHXZ(ptr) msvcirt.?precision at ios@@QEBAHXZ
-@ stub -arch=win32 ?put at ostream@@QAEAAV1 at C@Z
-@ stub -arch=win64 ?put at ostream@@QEAAAEAV1 at C@Z
-@ stub -arch=win32 ?put at ostream@@QAEAAV1 at D@Z
-@ stub -arch=win64 ?put at ostream@@QEAAAEAV1 at D@Z
-@ stub -arch=win32 ?put at ostream@@QAEAAV1 at E@Z
-@ stub -arch=win64 ?put at ostream@@QEAAAEAV1 at E@Z
+@ thiscall -arch=win32 ?put at ostream@@QAEAAV1 at C@Z(ptr long) msvcirt.?put at ostream@@QAEAAV1 at C@Z
+@ cdecl -arch=win64 ?put at ostream@@QEAAAEAV1 at C@Z(ptr long) msvcirt.?put at ostream@@QEAAAEAV1 at C@Z
+@ thiscall -arch=win32 ?put at ostream@@QAEAAV1 at D@Z(ptr long) msvcirt.?put at ostream@@QAEAAV1 at D@Z
+@ cdecl -arch=win64 ?put at ostream@@QEAAAEAV1 at D@Z(ptr long) msvcirt.?put at ostream@@QEAAAEAV1 at D@Z
+@ thiscall -arch=win32 ?put at ostream@@QAEAAV1 at E@Z(ptr long) msvcirt.?put at ostream@@QAEAAV1 at E@Z
+@ cdecl -arch=win64 ?put at ostream@@QEAAAEAV1 at E@Z(ptr long) msvcirt.?put at ostream@@QEAAAEAV1 at E@Z
@ stub -arch=win32 ?putback at istream@@QAEAAV1 at D@Z
@ stub -arch=win64 ?putback at istream@@QEAAAEAV1 at D@Z
@ thiscall -arch=win32 ?pword at ios@@QBEAAPAXH at Z(ptr long) msvcirt.?pword at ios@@QBEAAPAXH at Z
@@ -708,10 +708,10 @@
@ cdecl -arch=win64 ?seekoff at streambuf@@UEAAJJW4seek_dir at ios@@H at Z(ptr long long long) msvcirt.?seekoff at streambuf@@UEAAJJW4seek_dir at ios@@H at Z
@ thiscall -arch=win32 ?seekoff at strstreambuf@@UAEJJW4seek_dir at ios@@H at Z(ptr long long long) msvcirt.?seekoff at strstreambuf@@UAEJJW4seek_dir at ios@@H at Z
@ cdecl -arch=win64 ?seekoff at strstreambuf@@UEAAJJW4seek_dir at ios@@H at Z(ptr long long long) msvcirt.?seekoff at strstreambuf@@UEAAJJW4seek_dir at ios@@H at Z
-@ stub -arch=win32 ?seekp at ostream@@QAEAAV1 at J@Z
-@ stub -arch=win64 ?seekp at ostream@@QEAAAEAV1 at J@Z
-@ stub -arch=win32 ?seekp at ostream@@QAEAAV1 at JW4seek_dir@ios@@@Z
-@ stub -arch=win64 ?seekp at ostream@@QEAAAEAV1 at JW4seek_dir@ios@@@Z
+@ thiscall -arch=win32 ?seekp at ostream@@QAEAAV1 at J@Z(ptr long) msvcirt.?seekp at ostream@@QAEAAV1 at J@Z
+@ cdecl -arch=win64 ?seekp at ostream@@QEAAAEAV1 at J@Z(ptr long) msvcirt.?seekp at ostream@@QEAAAEAV1 at J@Z
+@ thiscall -arch=win32 ?seekp at ostream@@QAEAAV1 at JW4seek_dir@ios@@@Z(ptr long long) msvcirt.?seekp at ostream@@QAEAAV1 at JW4seek_dir@ios@@@Z
+@ cdecl -arch=win64 ?seekp at ostream@@QEAAAEAV1 at JW4seek_dir@ios@@@Z(ptr long long) msvcirt.?seekp at ostream@@QEAAAEAV1 at JW4seek_dir@ios@@@Z
@ thiscall -arch=win32 ?seekpos at streambuf@@UAEJJH at Z(ptr long long) msvcirt.?seekpos at streambuf@@UAEJJH at Z
@ cdecl -arch=win64 ?seekpos at streambuf@@UEAAJJH at Z(ptr long long) msvcirt.?seekpos at streambuf@@UEAAJJH at Z
@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ at Z(ptr) msvcrt.?set_new_handler@@YAP6AXXZP6AXXZ at Z
@@ -794,8 +794,8 @@
@ cdecl ?sync_with_stdio at ios@@SAXXZ() msvcirt.?sync_with_stdio at ios@@SAXXZ
@ stub -arch=win32 ?tellg at istream@@QAEJXZ
@ stub -arch=win64 ?tellg at istream@@QEAAJXZ
-@ stub -arch=win32 ?tellp at ostream@@QAEJXZ
-@ stub -arch=win64 ?tellp at ostream@@QEAAJXZ
+@ thiscall -arch=win32 ?tellp at ostream@@QAEJXZ(ptr) msvcirt.?tellp at ostream@@QAEJXZ
+@ cdecl -arch=win64 ?tellp at ostream@@QEAAJXZ(ptr) msvcirt.?tellp at ostream@@QEAAJXZ
@ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ
@ extern ?text at filebuf@@2HB msvcirt.?text at filebuf@@2HB
@ thiscall -arch=win32 ?tie at ios@@QAEPAVostream@@PAV2@@Z(ptr ptr) msvcirt.?tie at ios@@QAEPAVostream@@PAV2@@Z
@@ -828,14 +828,14 @@
@ cdecl -arch=win64 ?width at ios@@QEAAHH at Z(ptr long) msvcirt.?width at ios@@QEAAHH at Z
@ thiscall -arch=win32 ?width at ios@@QBEHXZ(ptr) msvcirt.?width at ios@@QBEHXZ
@ cdecl -arch=win64 ?width at ios@@QEBAHXZ(ptr) msvcirt.?width at ios@@QEBAHXZ
-@ stub -arch=win32 ?write at ostream@@QAEAAV1 at PBCH@Z
-@ stub -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBCH@Z
-@ stub -arch=win32 ?write at ostream@@QAEAAV1 at PBDH@Z
-@ stub -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBDH@Z
-@ stub -arch=win32 ?write at ostream@@QAEAAV1 at PBEH@Z
-@ stub -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBEH@Z
-@ stub -arch=win32 ?writepad at ostream@@AAEAAV1 at PBD0@Z
-@ stub -arch=win64 ?writepad at ostream@@AEAAAEAV1 at PEBD0@Z
+@ thiscall -arch=win32 ?write at ostream@@QAEAAV1 at PBCH@Z(ptr str long) msvcirt.?write at ostream@@QAEAAV1 at PBCH@Z
+@ cdecl -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBCH@Z(ptr str long) msvcirt.?write at ostream@@QEAAAEAV1 at PEBCH@Z
+@ thiscall -arch=win32 ?write at ostream@@QAEAAV1 at PBDH@Z(ptr str long) msvcirt.?write at ostream@@QAEAAV1 at PBDH@Z
+@ cdecl -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBDH@Z(ptr str long) msvcirt.?write at ostream@@QEAAAEAV1 at PEBDH@Z
+@ thiscall -arch=win32 ?write at ostream@@QAEAAV1 at PBEH@Z(ptr str long) msvcirt.?write at ostream@@QAEAAV1 at PBEH@Z
+@ cdecl -arch=win64 ?write at ostream@@QEAAAEAV1 at PEBEH@Z(ptr str long) msvcirt.?write at ostream@@QEAAAEAV1 at PEBEH@Z
+@ thiscall -arch=win32 ?writepad at ostream@@AAEAAV1 at PBD0@Z(ptr str str) msvcirt.?writepad at ostream@@AAEAAV1 at PBD0@Z
+@ cdecl -arch=win64 ?writepad at ostream@@AEAAAEAV1 at PEBD0@Z(ptr str str) msvcirt.?writepad at ostream@@AEAAAEAV1 at PEBD0@Z
@ stub -arch=win32 ?ws@@YAAAVistream@@AAV1@@Z
@ stub -arch=win64 ?ws@@YAAEAVistream@@AEAV1@@Z
@ extern ?x_curindex at ios@@0HA msvcirt.?x_curindex at ios@@0HA
--
2.7.4
More information about the wine-patches
mailing list