From 4f6f2eb91b4502f68222eb6557584c7bc7cc2fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Matellanes?= Date: Fri, 5 Aug 2016 17:56:28 +0100 Subject: [PATCH] msvcirt: Add a partial implementation of class ostream_withassign. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Iván Matellanes Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcirt/msvcirt.c | 47 +++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 40 +++++++++++++++---------------- dlls/msvcrt20/msvcrt20.spec | 40 +++++++++++++++---------------- dlls/msvcrt40/msvcrt40.spec | 40 +++++++++++++++---------------- 4 files changed, 107 insertions(+), 60 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 9a0a05b6924..d30112b28b7 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -176,6 +176,8 @@ extern const vtable_ptr MSVCP_stdiobuf_vtable; extern const vtable_ptr MSVCP_ios_vtable; /* ??_7ostream@@6B@ */ extern const vtable_ptr MSVCP_ostream_vtable; +/* ??_7ostream_withassign@@6B@ */ +extern const vtable_ptr MSVCP_ostream_withassign_vtable; /* ??_7istream@@6B@ */ extern const vtable_ptr MSVCP_istream_vtable; @@ -234,6 +236,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ios_vector_dtor)); __ASM_VTABLE(ostream, VTABLE_ADD_FUNC(ostream_vector_dtor)); + __ASM_VTABLE(ostream_withassign, + VTABLE_ADD_FUNC(ostream_vector_dtor)); __ASM_VTABLE(istream, VTABLE_ADD_FUNC(istream_vector_dtor)); #ifndef __GNUC__ @@ -244,6 +248,7 @@ void __asm_dummy_vtables(void) { #define VBTABLE_ENTRY(class, offset, vbase) ALIGNED_SIZE(sizeof(class), TYPE_ALIGNMENT(vbase))-offset /* ??_8ostream@@7B@ */ +/* ??_8ostream_withassign@@7B@ */ const int ostream_vbtable[] = {0, VBTABLE_ENTRY(ostream, FIELD_OFFSET(ostream, vbtable), ios)}; /* ??_8istream@@7B@ */ const int istream_vbtable[] = {0, VBTABLE_ENTRY(istream, FIELD_OFFSET(istream, vbtable), ios)}; @@ -254,6 +259,8 @@ DEFINE_RTTI_DATA1(strstreambuf, 0, &streambuf_rtti_base_descriptor, ".?AVstrstre 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@@") +DEFINE_RTTI_DATA2(ostream_withassign, sizeof(ostream), + &ostream_rtti_base_descriptor, &ios_rtti_base_descriptor, ".?AVostream_withassign@@") DEFINE_RTTI_DATA1(istream, sizeof(istream), &ios_rtti_base_descriptor, ".?AVistream@@") /* ??0streambuf@@IAE@PADH@Z */ @@ -2316,6 +2323,8 @@ ostream* __thiscall ostream_ctor(ostream *this, BOOL virt_init) /* ??1ostream@@UAE@XZ */ /* ??1ostream@@UEAA@XZ */ +/* ??1ostream_withassign@@UAE@XZ */ +/* ??1ostream_withassign@@UEAA@XZ */ DEFINE_THISCALL_WRAPPER(ostream_dtor, 4) void __thiscall ostream_dtor(ios *base) { @@ -2326,6 +2335,8 @@ void __thiscall ostream_dtor(ios *base) /* ??4ostream@@IAEAAV0@PAVstreambuf@@@Z */ /* ??4ostream@@IEAAAEAV0@PEAVstreambuf@@@Z */ +/* ??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z */ +/* ??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z */ DEFINE_THISCALL_WRAPPER(ostream_assign_sb, 8) ostream* __thiscall ostream_assign_sb(ostream *this, streambuf *sb) { @@ -2346,6 +2357,10 @@ ostream* __thiscall ostream_assign_sb(ostream *this, streambuf *sb) /* ??4ostream@@IAEAAV0@ABV0@@Z */ /* ??4ostream@@IEAAAEAV0@AEBV0@@Z */ +/* ??4ostream_withassign@@QAEAAV0@ABV0@@Z */ +/* ??4ostream_withassign@@QEAAAEAV0@AEBV0@@Z */ +/* ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z */ +/* ??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z */ DEFINE_THISCALL_WRAPPER(ostream_assign, 8) ostream* __thiscall ostream_assign(ostream *this, const ostream *rhs) { @@ -2358,6 +2373,8 @@ ostream* __thiscall ostream_assign(ostream *this, const ostream *rhs) /* ??_Dostream@@QAEXXZ */ /* ??_Dostream@@QEAAXXZ */ +/* ??_Dostream_withassign@@QAEXXZ */ +/* ??_Dostream_withassign@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(ostream_vbase_dtor, 4) void __thiscall ostream_vbase_dtor(ostream *this) { @@ -2370,6 +2387,7 @@ void __thiscall ostream_vbase_dtor(ostream *this) } /* ??_Eostream@@UAEPAXI@Z */ +/* ??_Eostream_withassign@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(ostream_vector_dtor, 8) ostream* __thiscall ostream_vector_dtor(ios *base, unsigned int flags) { @@ -2393,6 +2411,7 @@ ostream* __thiscall ostream_vector_dtor(ios *base, unsigned int flags) } /* ??_Gostream@@UAEPAXI@Z */ +/* ??_Gostream_withassign@@UAEPAXI@Z */ DEFINE_THISCALL_WRAPPER(ostream_scalar_dtor, 8) ostream* __thiscall ostream_scalar_dtor(ios *base, unsigned int flags) { @@ -2845,6 +2864,33 @@ ostream* __cdecl ostream_flush_manip(ostream *this) return ostream_flush(this); } +/* ??0ostream_withassign@@QAE@ABV0@@Z */ +/* ??0ostream_withassign@@QEAA@AEBV0@@Z */ +DEFINE_THISCALL_WRAPPER(ostream_withassign_copy_ctor, 12) +ostream* __thiscall ostream_withassign_copy_ctor(ostream *this, const ostream *copy, BOOL virt_init) +{ + FIXME("(%p %p %d) stub\n", this, copy, virt_init); + return this; +} + +/* ??0ostream_withassign@@QAE@PAVstreambuf@@@Z */ +/* ??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z */ +DEFINE_THISCALL_WRAPPER(ostream_withassign_sb_ctor, 12) +ostream* __thiscall ostream_withassign_sb_ctor(ostream *this, streambuf *sb, BOOL virt_init) +{ + FIXME("(%p %p %d) stub\n", this, sb, virt_init); + return this; +} + +/* ??0ostream_withassign@@QAE@XZ */ +/* ??0ostream_withassign@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(ostream_withassign_ctor, 8) +ostream* __thiscall ostream_withassign_ctor(ostream *this, BOOL virt_init) +{ + FIXME("(%p %d) stub\n", this, virt_init); + return this; +} + static inline ios* istream_get_ios(const istream *this) { return (ios*)((char*)this + this->vbtable[1]); @@ -3841,6 +3887,7 @@ static void init_io(void *base) init_stdiobuf_rtti(base); init_ios_rtti(base); init_ostream_rtti(base); + init_ostream_withassign_rtti(base); init_istream_rtti(base); #endif } diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 6b3b1812134..67c30285960 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -86,12 +86,12 @@ @ cdecl -arch=win64 ??0ostream@@IEAA@XZ(ptr long) ostream_ctor @ thiscall -arch=win32 ??0ostream@@QAE@PAVstreambuf@@@Z(ptr ptr long) ostream_sb_ctor @ cdecl -arch=win64 ??0ostream@@QEAA@PEAVstreambuf@@@Z(ptr ptr long) ostream_sb_ctor -@ stub -arch=win32 ??0ostream_withassign@@QAE@ABV0@@Z # __thiscall ostream_withassign::ostream_withassign(class ostream_withassign const &) -@ stub -arch=win64 ??0ostream_withassign@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ostream_withassign@@QAE@PAVstreambuf@@@Z # __thiscall ostream_withassign::ostream_withassign(class streambuf *) -@ stub -arch=win64 ??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z -@ stub -arch=win32 ??0ostream_withassign@@QAE@XZ # __thiscall ostream_withassign::ostream_withassign(void) -@ stub -arch=win64 ??0ostream_withassign@@QEAA@XZ +@ thiscall -arch=win32 ??0ostream_withassign@@QAE@ABV0@@Z(ptr ptr long) ostream_withassign_copy_ctor +@ cdecl -arch=win64 ??0ostream_withassign@@QEAA@AEBV0@@Z(ptr ptr long) ostream_withassign_copy_ctor +@ thiscall -arch=win32 ??0ostream_withassign@@QAE@PAVstreambuf@@@Z(ptr ptr long) ostream_withassign_sb_ctor +@ cdecl -arch=win64 ??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z(ptr ptr long) ostream_withassign_sb_ctor +@ thiscall -arch=win32 ??0ostream_withassign@@QAE@XZ(ptr long) ostream_withassign_ctor +@ cdecl -arch=win64 ??0ostream_withassign@@QEAA@XZ(ptr long) ostream_withassign_ctor @ stub -arch=win32 ??0ostrstream@@QAE@ABV0@@Z # __thiscall ostrstream::ostrstream(class ostrstream const &) @ stub -arch=win64 ??0ostrstream@@QEAA@AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE@PADHH@Z # __thiscall ostrstream::ostrstream(char *,int,int) @@ -156,8 +156,8 @@ @ stub -arch=win64 ??1ofstream@@UEAA@XZ @ thiscall -arch=win32 ??1ostream@@UAE@XZ(ptr) ostream_dtor @ cdecl -arch=win64 ??1ostream@@UEAA@XZ(ptr) ostream_dtor -@ stub -arch=win32 ??1ostream_withassign@@UAE@XZ # virtual __thiscall ostream_withassign::~ostream_withassign(void) -@ stub -arch=win64 ??1ostream_withassign@@UEAA@XZ +@ thiscall -arch=win32 ??1ostream_withassign@@UAE@XZ(ptr) ostream_dtor +@ cdecl -arch=win64 ??1ostream_withassign@@UEAA@XZ(ptr) ostream_dtor @ thiscall -arch=win32 ??1ostrstream@@UAE@XZ(ptr) MSVCIRT_ostrstream_dtor @ cdecl -arch=win64 ??1ostrstream@@UEAA@XZ(ptr) MSVCIRT_ostrstream_dtor @ thiscall -arch=win32 ??1stdiobuf@@UAE@XZ(ptr) stdiobuf_dtor @@ -206,12 +206,12 @@ @ cdecl -arch=win64 ??4ostream@@IEAAAEAV0@AEBV0@@Z(ptr ptr) ostream_assign @ thiscall -arch=win32 ??4ostream@@IAEAAV0@PAVstreambuf@@@Z(ptr ptr) ostream_assign_sb @ cdecl -arch=win64 ??4ostream@@IEAAAEAV0@PEAVstreambuf@@@Z(ptr ptr) ostream_assign_sb -@ stub -arch=win32 ??4ostream_withassign@@QAEAAV0@ABV0@@Z # class ostream_withassign & __thiscall ostream_withassign::operator=(class ostream_withassign const &) -@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAV0@AEBV0@@Z -@ stub -arch=win32 ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z # class ostream & __thiscall ostream_withassign::operator=(class ostream const &) -@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z -@ stub -arch=win32 ??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z # class ostream & __thiscall ostream_withassign::operator=(class streambuf *) -@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z +@ thiscall -arch=win32 ??4ostream_withassign@@QAEAAV0@ABV0@@Z(ptr ptr) ostream_assign +@ cdecl -arch=win64 ??4ostream_withassign@@QEAAAEAV0@AEBV0@@Z(ptr ptr) ostream_assign +@ thiscall -arch=win32 ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z(ptr ptr) ostream_assign +@ cdecl -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z(ptr ptr) ostream_assign +@ thiscall -arch=win32 ??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z(ptr ptr) ostream_assign_sb +@ cdecl -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z(ptr ptr) ostream_assign_sb @ stub -arch=win32 ??4ostrstream@@QAEAAV0@ABV0@@Z # class ostrstream & __thiscall ostrstream::operator=(class ostrstream const &) @ stub -arch=win64 ??4ostrstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4stdiobuf@@QAEAAV0@ABV0@@Z(ptr ptr) stdiobuf_assign @@ -314,7 +314,7 @@ @ extern ??_7logic_error@@6B@ MSVCP_logic_error_vtable # @ extern ??_7ofstream@@6B@ # const ofstream::`vftable' @ extern ??_7ostream@@6B@ MSVCP_ostream_vtable -# @ extern ??_7ostream_withassign@@6B@ # const ostream_withassign::`vftable' +@ extern ??_7ostream_withassign@@6B@ MSVCP_ostream_withassign_vtable # @ extern ??_7ostrstream@@6B@ # const ostrstream::`vftable' @ extern ??_7stdiobuf@@6B@ MSVCP_stdiobuf_vtable # @ extern ??_7stdiostream@@6B@ # const stdiostream::`vftable' @@ -331,7 +331,7 @@ # @ extern ??_8istrstream@@7B@ # const istrstream::`vbtable' # @ extern ??_8ofstream@@7B@ # const ofstream::`vbtable' @ extern ??_8ostream@@7B@ ostream_vbtable -# @ extern ??_8ostream_withassign@@7B@ # const ostream_withassign::`vbtable' +@ extern ??_8ostream_withassign@@7B@ ostream_vbtable # @ extern ??_8ostrstream@@7B@ # const ostrstream::`vbtable' # @ extern ??_8stdiostream@@7Bistream@@@ # const stdiostream::`vbtable'{for `istream'} # @ extern ??_8stdiostream@@7Bostream@@@ # const stdiostream::`vbtable'{for `ostream'} @@ -353,8 +353,8 @@ @ stub -arch=win64 ??_Dofstream@@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 +@ thiscall -arch=win32 ??_Dostream_withassign@@QAEXXZ(ptr) ostream_vbase_dtor +@ cdecl -arch=win64 ??_Dostream_withassign@@QEAAXXZ(ptr) ostream_vbase_dtor @ stub -arch=win32 ??_Dostrstream@@QAEXXZ # void __thiscall ostrstream::`vbase destructor'(void) @ stub -arch=win64 ??_Dostrstream@@QEAAXXZ @ stub -arch=win32 ??_Dstdiostream@@QAEXXZ # void __thiscall stdiostream::`vbase destructor'(void) @@ -373,7 +373,7 @@ @ thiscall -arch=win32 ??_Elogic_error@@UAEPAXI@Z(ptr long) MSVCP_logic_error_vector_dtor @ stub -arch=win32 ??_Eofstream@@UAEPAXI@Z # virtual void * __thiscall ofstream::`vector deleting destructor'(unsigned int) @ thiscall -arch=win32 ??_Eostream@@UAEPAXI@Z(ptr long) ostream_vector_dtor -@ stub -arch=win32 ??_Eostream_withassign@@UAEPAXI@Z # virtual void * __thiscall ostream_withassign::`vector deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Eostream_withassign@@UAEPAXI@Z(ptr long) ostream_vector_dtor @ stub -arch=win32 ??_Eostrstream@@UAEPAXI@Z # virtual void * __thiscall ostrstream::`vector deleting destructor'(unsigned int) @ thiscall -arch=win32 ??_Estdiobuf@@UAEPAXI@Z(ptr long) stdiobuf_vector_dtor @ stub -arch=win32 ??_Estdiostream@@UAEPAXI@Z # virtual void * __thiscall stdiostream::`vector deleting destructor'(unsigned int) @@ -392,7 +392,7 @@ @ thiscall -arch=win32 ??_Glogic_error@@UAEPAXI@Z(ptr long) MSVCP_logic_error_scalar_dtor @ stub -arch=win32 ??_Gofstream@@UAEPAXI@Z # virtual void * __thiscall ofstream::`scalar deleting destructor'(unsigned int) @ thiscall -arch=win32 ??_Gostream@@UAEPAXI@Z(ptr long) ostream_scalar_dtor -@ stub -arch=win32 ??_Gostream_withassign@@UAEPAXI@Z # virtual void * __thiscall ostream_withassign::`scalar deleting destructor'(unsigned int) +@ thiscall -arch=win32 ??_Gostream_withassign@@UAEPAXI@Z(ptr long) ostream_scalar_dtor @ stub -arch=win32 ??_Gostrstream@@UAEPAXI@Z # virtual void * __thiscall ostrstream::`scalar deleting destructor'(unsigned int) @ thiscall -arch=win32 ??_Gstdiobuf@@UAEPAXI@Z(ptr long) stdiobuf_scalar_dtor @ stub -arch=win32 ??_Gstdiostream@@UAEPAXI@Z # virtual void * __thiscall stdiostream::`scalar deleting destructor'(unsigned int) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 10fae8fa042..ff4ed730edb 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -76,12 +76,12 @@ @ cdecl -arch=win64 ??0ostream@@IEAA@XZ(ptr long) msvcirt.??0ostream@@IEAA@XZ @ thiscall -arch=win32 ??0ostream@@QAE@PAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream@@QAE@PAVstreambuf@@@Z @ cdecl -arch=win64 ??0ostream@@QEAA@PEAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream@@QEAA@PEAVstreambuf@@@Z -@ stub -arch=win32 ??0ostream_withassign@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ostream_withassign@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ostream_withassign@@QAE@PAVstreambuf@@@Z -@ stub -arch=win64 ??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z -@ stub -arch=win32 ??0ostream_withassign@@QAE@XZ -@ stub -arch=win64 ??0ostream_withassign@@QEAA@XZ +@ thiscall -arch=win32 ??0ostream_withassign@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ostream_withassign@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ostream_withassign@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ostream_withassign@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ostream_withassign@@QAE@PAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream_withassign@@QAE@PAVstreambuf@@@Z +@ cdecl -arch=win64 ??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z +@ thiscall -arch=win32 ??0ostream_withassign@@QAE@XZ(ptr long) msvcirt.??0ostream_withassign@@QAE@XZ +@ cdecl -arch=win64 ??0ostream_withassign@@QEAA@XZ(ptr long) msvcirt.??0ostream_withassign@@QEAA@XZ @ stub -arch=win32 ??0ostrstream@@QAE@ABV0@@Z @ stub -arch=win64 ??0ostrstream@@QEAA@AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE@PADHH@Z @@ -140,8 +140,8 @@ @ stub -arch=win64 ??1ofstream@@UEAA@XZ @ thiscall -arch=win32 ??1ostream@@UAE@XZ(ptr) msvcirt.??1ostream@@UAE@XZ @ cdecl -arch=win64 ??1ostream@@UEAA@XZ(ptr) msvcirt.??1ostream@@UEAA@XZ -@ stub -arch=win32 ??1ostream_withassign@@UAE@XZ -@ stub -arch=win64 ??1ostream_withassign@@UEAA@XZ +@ thiscall -arch=win32 ??1ostream_withassign@@UAE@XZ(ptr) msvcirt.??1ostream_withassign@@UAE@XZ +@ cdecl -arch=win64 ??1ostream_withassign@@UEAA@XZ(ptr) msvcirt.??1ostream_withassign@@UEAA@XZ @ thiscall -arch=win32 ??1ostrstream@@UAE@XZ(ptr) msvcirt.??1ostrstream@@UAE@XZ @ cdecl -arch=win64 ??1ostrstream@@UEAA@XZ(ptr) msvcirt.??1ostrstream@@UEAA@XZ @ thiscall -arch=win32 ??1stdiobuf@@UAE@XZ(ptr) msvcirt.??1stdiobuf@@UAE@XZ @@ -190,12 +190,12 @@ @ cdecl -arch=win64 ??4ostream@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ostream@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ostream@@IAEAAV0@PAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream@@IAEAAV0@PAVstreambuf@@@Z @ cdecl -arch=win64 ??4ostream@@IEAAAEAV0@PEAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream@@IEAAAEAV0@PEAVstreambuf@@@Z -@ stub -arch=win32 ??4ostream_withassign@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAV0@AEBV0@@Z -@ stub -arch=win32 ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z -@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z -@ stub -arch=win32 ??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z -@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z +@ thiscall -arch=win32 ??4ostream_withassign@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ostream_withassign@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QAEAAVostream@@ABV1@@Z +@ cdecl -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z +@ thiscall -arch=win32 ??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z +@ cdecl -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z @ stub -arch=win32 ??4ostrstream@@QAEAAV0@ABV0@@Z @ stub -arch=win64 ??4ostrstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4stdiobuf@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4stdiobuf@@QAEAAV0@ABV0@@Z @@ -296,7 +296,7 @@ # @ extern ??_7istrstream@@6B@ # @ extern ??_7ofstream@@6B@ @ extern ??_7ostream@@6B@ msvcirt.??_7ostream@@6B@ -# @ extern ??_7ostream_withassign@@6B@ +@ extern ??_7ostream_withassign@@6B@ msvcirt.??_7ostream_withassign@@6B@ # @ extern ??_7ostrstream@@6B@ @ extern ??_7stdiobuf@@6B@ msvcirt.??_7stdiobuf@@6B@ # @ extern ??_7stdiostream@@6B@ @@ -313,7 +313,7 @@ # @ extern ??_8istrstream@@7B@ # @ extern ??_8ofstream@@7B@ @ extern ??_8ostream@@7B@ msvcirt.??_8ostream@@7B@ -# @ extern ??_8ostream_withassign@@7B@ +@ extern ??_8ostream_withassign@@7B@ msvcirt.??_8ostream_withassign@@7B@ # @ extern ??_8ostrstream@@7B@ # @ extern ??_8stdiostream@@7Bistream@@@ # @ extern ??_8stdiostream@@7Bostream@@@ @@ -335,8 +335,8 @@ @ stub -arch=win64 ??_Dofstream@@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 +@ thiscall -arch=win32 ??_Dostream_withassign@@QAEXXZ(ptr) msvcirt.??_Dostream_withassign@@QAEXXZ +@ cdecl -arch=win64 ??_Dostream_withassign@@QEAAXXZ(ptr) msvcirt.??_Dostream_withassign@@QEAAXXZ @ stub -arch=win32 ??_Dostrstream@@QAEXXZ @ stub -arch=win64 ??_Dostrstream@@QEAAXXZ @ stub -arch=win32 ??_Dstdiostream@@QAEXXZ @@ -354,7 +354,7 @@ @ stub -arch=win32 ??_Eistrstream@@UAEPAXI@Z @ stub -arch=win32 ??_Eofstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eostream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eostream_withassign@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eostream_withassign@@UAEPAXI@Z(ptr long) msvcirt.??_Eostream_withassign@@UAEPAXI@Z @ stub -arch=win32 ??_Eostrstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Estdiobuf@@UAEPAXI@Z(ptr long) msvcirt.??_Estdiobuf@@UAEPAXI@Z @ stub -arch=win32 ??_Estdiostream@@UAEPAXI@Z @@ -372,7 +372,7 @@ @ stub -arch=win32 ??_Gistrstream@@UAEPAXI@Z @ stub -arch=win32 ??_Gofstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gostream@@UAEPAXI@Z(ptr long) msvcirt.??_Gostream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gostream_withassign@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gostream_withassign@@UAEPAXI@Z(ptr long) msvcirt.??_Gostream_withassign@@UAEPAXI@Z @ stub -arch=win32 ??_Gostrstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gstdiobuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gstdiobuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gstdiostream@@UAEPAXI@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 4883423acd4..fc9a5dcbc85 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -98,12 +98,12 @@ @ cdecl -arch=win64 ??0ostream@@IEAA@XZ(ptr long) msvcirt.??0ostream@@IEAA@XZ @ thiscall -arch=win32 ??0ostream@@QAE@PAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream@@QAE@PAVstreambuf@@@Z @ cdecl -arch=win64 ??0ostream@@QEAA@PEAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream@@QEAA@PEAVstreambuf@@@Z -@ stub -arch=win32 ??0ostream_withassign@@QAE@ABV0@@Z -@ stub -arch=win64 ??0ostream_withassign@@QEAA@AEBV0@@Z -@ stub -arch=win32 ??0ostream_withassign@@QAE@PAVstreambuf@@@Z -@ stub -arch=win64 ??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z -@ stub -arch=win32 ??0ostream_withassign@@QAE@XZ -@ stub -arch=win64 ??0ostream_withassign@@QEAA@XZ +@ thiscall -arch=win32 ??0ostream_withassign@@QAE@ABV0@@Z(ptr ptr long) msvcirt.??0ostream_withassign@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0ostream_withassign@@QEAA@AEBV0@@Z(ptr ptr long) msvcirt.??0ostream_withassign@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0ostream_withassign@@QAE@PAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream_withassign@@QAE@PAVstreambuf@@@Z +@ cdecl -arch=win64 ??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z(ptr ptr long) msvcirt.??0ostream_withassign@@QEAA@PEAVstreambuf@@@Z +@ thiscall -arch=win32 ??0ostream_withassign@@QAE@XZ(ptr long) msvcirt.??0ostream_withassign@@QAE@XZ +@ cdecl -arch=win64 ??0ostream_withassign@@QEAA@XZ(ptr long) msvcirt.??0ostream_withassign@@QEAA@XZ @ stub -arch=win32 ??0ostrstream@@QAE@ABV0@@Z @ stub -arch=win64 ??0ostrstream@@QEAA@AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE@PADHH@Z @@ -172,8 +172,8 @@ @ stub -arch=win64 ??1ofstream@@UEAA@XZ @ thiscall -arch=win32 ??1ostream@@UAE@XZ(ptr) msvcirt.??1ostream@@UAE@XZ @ cdecl -arch=win64 ??1ostream@@UEAA@XZ(ptr) msvcirt.??1ostream@@UEAA@XZ -@ stub -arch=win32 ??1ostream_withassign@@UAE@XZ -@ stub -arch=win64 ??1ostream_withassign@@UEAA@XZ +@ thiscall -arch=win32 ??1ostream_withassign@@UAE@XZ(ptr) msvcirt.??1ostream_withassign@@UAE@XZ +@ cdecl -arch=win64 ??1ostream_withassign@@UEAA@XZ(ptr) msvcirt.??1ostream_withassign@@UEAA@XZ @ thiscall -arch=win32 ??1ostrstream@@UAE@XZ(ptr) msvcirt.??1ostrstream@@UAE@XZ @ cdecl -arch=win64 ??1ostrstream@@UEAA@XZ(ptr) msvcirt.??1ostrstream@@UEAA@XZ @ thiscall -arch=win32 ??1stdiobuf@@UAE@XZ(ptr) msvcirt.??1stdiobuf@@UAE@XZ @@ -234,12 +234,12 @@ @ cdecl -arch=win64 ??4ostream@@IEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ostream@@IEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4ostream@@IAEAAV0@PAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream@@IAEAAV0@PAVstreambuf@@@Z @ cdecl -arch=win64 ??4ostream@@IEAAAEAV0@PEAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream@@IEAAAEAV0@PEAVstreambuf@@@Z -@ stub -arch=win32 ??4ostream_withassign@@QAEAAV0@ABV0@@Z -@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAV0@AEBV0@@Z -@ stub -arch=win32 ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z -@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z -@ stub -arch=win32 ??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z -@ stub -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z +@ thiscall -arch=win32 ??4ostream_withassign@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4ostream_withassign@@QEAAAEAV0@AEBV0@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QEAAAEAV0@AEBV0@@Z +@ thiscall -arch=win32 ??4ostream_withassign@@QAEAAVostream@@ABV1@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QAEAAVostream@@ABV1@@Z +@ cdecl -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z +@ thiscall -arch=win32 ??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z +@ cdecl -arch=win64 ??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z(ptr ptr) msvcirt.??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z @ stub -arch=win32 ??4ostrstream@@QAEAAV0@ABV0@@Z @ stub -arch=win64 ??4ostrstream@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=win32 ??4stdiobuf@@QAEAAV0@ABV0@@Z(ptr ptr) msvcirt.??4stdiobuf@@QAEAAV0@ABV0@@Z @@ -349,7 +349,7 @@ @ extern ??_7logic_error@@6B@ msvcirt.??_7logic_error@@6B@ # @ extern ??_7ofstream@@6B@ @ extern ??_7ostream@@6B@ msvcirt.??_7ostream@@6B@ -# @ extern ??_7ostream_withassign@@6B@ +@ extern ??_7ostream_withassign@@6B@ msvcirt.??_7ostream_withassign@@6B@ # @ extern ??_7ostrstream@@6B@ @ extern ??_7stdiobuf@@6B@ msvcirt.??_7stdiobuf@@6B@ # @ extern ??_7stdiostream@@6B@ @@ -366,7 +366,7 @@ # @ extern ??_8istrstream@@7B@ # @ extern ??_8ofstream@@7B@ @ extern ??_8ostream@@7B@ msvcirt.??_8ostream@@7B@ -# @ extern ??_8ostream_withassign@@7B@ +@ extern ??_8ostream_withassign@@7B@ msvcirt.??_8ostream_withassign@@7B@ # @ extern ??_8ostrstream@@7B@ # @ extern ??_8stdiostream@@7Bistream@@@ # @ extern ??_8stdiostream@@7Bostream@@@ @@ -388,8 +388,8 @@ @ stub -arch=win64 ??_Dofstream@@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 +@ thiscall -arch=win32 ??_Dostream_withassign@@QAEXXZ(ptr) msvcirt.??_Dostream_withassign@@QAEXXZ +@ cdecl -arch=win64 ??_Dostream_withassign@@QEAAXXZ(ptr) msvcirt.??_Dostream_withassign@@QEAAXXZ @ stub -arch=win32 ??_Dostrstream@@QAEXXZ @ stub -arch=win64 ??_Dostrstream@@QEAAXXZ @ stub -arch=win32 ??_Dstdiostream@@QAEXXZ @@ -412,7 +412,7 @@ @ thiscall -arch=win32 ??_Elogic_error@@UAEPAXI@Z(ptr long) msvcirt.??_Elogic_error@@UAEPAXI@Z @ stub -arch=win32 ??_Eofstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Eostream@@UAEPAXI@Z(ptr long) msvcirt.??_Eostream@@UAEPAXI@Z -@ stub -arch=win32 ??_Eostream_withassign@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Eostream_withassign@@UAEPAXI@Z(ptr long) msvcirt.??_Eostream_withassign@@UAEPAXI@Z @ stub -arch=win32 ??_Eostrstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Estdiobuf@@UAEPAXI@Z(ptr long) msvcirt.??_Estdiobuf@@UAEPAXI@Z @ stub -arch=win32 ??_Estdiostream@@UAEPAXI@Z @@ -435,7 +435,7 @@ @ thiscall -arch=win32 ??_Glogic_error@@UAEPAXI@Z(ptr long) msvcirt.??_Glogic_error@@UAEPAXI@Z @ stub -arch=win32 ??_Gofstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gostream@@UAEPAXI@Z(ptr long) msvcirt.??_Gostream@@UAEPAXI@Z -@ stub -arch=win32 ??_Gostream_withassign@@UAEPAXI@Z +@ thiscall -arch=win32 ??_Gostream_withassign@@UAEPAXI@Z(ptr long) msvcirt.??_Gostream_withassign@@UAEPAXI@Z @ stub -arch=win32 ??_Gostrstream@@UAEPAXI@Z @ thiscall -arch=win32 ??_Gstdiobuf@@UAEPAXI@Z(ptr long) msvcirt.??_Gstdiobuf@@UAEPAXI@Z @ stub -arch=win32 ??_Gstdiostream@@UAEPAXI@Z