July 2014 - Wine-commits - list.winehq.org

Piotr Caban : msvcp100: Add ios_base::swap implementation.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 8c865c8cca5f9b387216146e1fe707d4176bdf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c865c8cca5f9b387216146e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 30 15:54:17 2014 -0500 msvcp100: Add ios_base::swap implementation. --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 6 +++--- dlls/msvcp90/ios.c | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index ab0b1d0..3d0db763 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2716,8 +2716,8 @@ @ stub -arch=win64 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=win32 ?swap(a)ios_base@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap(a)ios_base@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap(a)ios_base@std@@QAEXAAV12@@Z(ptr ptr) ios_base_swap +@ cdecl -arch=win64 ?swap(a)ios_base@std@@QEAAXAEAV12@@Z(ptr ptr) ios_base_swap @ thiscall -arch=win32 ?sync@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ(ptr) basic_istream_char_sync @ cdecl -arch=win64 ?sync@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ(ptr) basic_istream_char_sync @ thiscall -arch=win32 ?sync@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEHXZ(ptr) basic_istream_wchar_sync diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 5fc5348..ecf2db3 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3506,9 +3506,9 @@ @ stub -arch=arm ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z @ stub -arch=i386 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap(a)ios_base@std@@QAAXAAV12@@Z -@ stub -arch=i386 ?swap(a)ios_base@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap(a)ios_base@std@@QEAAXAEAV12@@Z +@ cdecl -arch=arm ?swap(a)ios_base@std@@QAAXAAV12@@Z(ptr ptr) ios_base_swap +@ thiscall -arch=i386 ?swap(a)ios_base@std@@QAEXAAV12@@Z(ptr ptr) ios_base_swap +@ cdecl -arch=win64 ?swap(a)ios_base@std@@QEAAXAEAV12@@Z(ptr ptr) ios_base_swap @ cdecl -arch=arm ?sync@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAHXZ(ptr) basic_istream_char_sync @ thiscall -arch=i386 ?sync@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ(ptr) basic_istream_char_sync @ cdecl -arch=win64 ?sync@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ(ptr) basic_istream_char_sync diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index f7cb232..14b3b25 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5264,6 +5264,25 @@ int CDECL ios_base_xalloc(void) return ret; } +/* ?swap(a)ios_base@std@@QAEXAAV12@@Z */ +/* ?swap(a)ios_base@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(ios_base_swap, 8) +void __thiscall ios_base_swap(ios_base *this, ios_base *r) +{ + ios_base tmp; + + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + tmp = *this; + *this = *r; + this->vtable = tmp.vtable; + tmp.vtable = r->vtable; + *r = tmp; +} + /* ??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAE(a)XZ */ /* ??0?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(basic_ios_char_ctor, 4)

1 0

Piotr Caban : msvcp100: Add basic_ios::swap implementation.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: bcee8a0ec3c682243c1c8c3cabab851420b38061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcee8a0ec3c682243c1c8c3ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 30 15:54:44 2014 -0500 msvcp100: Add basic_ios::swap implementation. --- dlls/msvcp100/msvcp100.spec | 12 ++++++------ dlls/msvcp110/msvcp110.spec | 18 +++++++++--------- dlls/msvcp90/ios.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 3d0db763..b593c06 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2686,12 +2686,12 @@ @ cdecl -arch=win64 ?sungetc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAAGXZ(ptr) basic_streambuf_wchar_sungetc @ thiscall -arch=win32 ?sungetc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEGXZ(ptr) basic_streambuf_wchar_sungetc @ cdecl -arch=win64 ?sungetc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAGXZ(ptr) basic_streambuf_wchar_sungetc -@ stub -arch=win32 ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ios_char_swap +@ cdecl -arch=win64 ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ios_char_swap +@ thiscall -arch=win32 ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ios_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ios_wchar_swap +@ thiscall -arch=win32 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ios_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ios_wchar_swap @ stub -arch=win32 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index ecf2db3..0618f48 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3461,15 +3461,15 @@ @ cdecl -arch=arm ?sungetc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QAAGXZ(ptr) basic_streambuf_wchar_sungetc @ thiscall -arch=i386 ?sungetc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEGXZ(ptr) basic_streambuf_wchar_sungetc @ cdecl -arch=win64 ?sungetc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAGXZ(ptr) basic_streambuf_wchar_sungetc -@ stub -arch=arm ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z +@ cdecl -arch=arm ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAXAAV12@@Z(ptr ptr) basic_ios_char_swap +@ thiscall -arch=i386 ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ios_char_swap +@ cdecl -arch=win64 ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ios_char_swap +@ cdecl -arch=arm ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAAXAAV12@@Z(ptr ptr) basic_ios_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ios_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ios_wchar_swap +@ cdecl -arch=arm ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAAXAAV12@@Z(ptr ptr) basic_ios_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ios_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ios_wchar_swap @ stub -arch=arm ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z @ stub -arch=i386 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 14b3b25..0ca6566 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5505,6 +5505,26 @@ char __thiscall basic_ios_char_widen(basic_ios_char *this, char ch) return ctype_char_widen_ch(ctype_char_use_facet(this->strbuf->loc), ch); } +/* ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ios_char_swap, 8) +void __thiscall basic_ios_char_swap(basic_ios_char *this, basic_ios_char *r) +{ + void *swap_ptr; + + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + ios_base_swap(&this->base, &r->base); + swap_ptr = this->stream; + this->stream = r->stream; + r->stream = swap_ptr; + this->fillch ^= r->fillch; + r->fillch ^= this->fillch; + this->fillch ^= r->fillch; +} /* ??0?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@IAE(a)XZ */ /* ??0?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@IEAA(a)XZ */ @@ -5780,6 +5800,29 @@ wchar_t __thiscall basic_ios_wchar_widen(basic_ios_wchar *this, char ch) return ctype_wchar_widen_ch(ctype_wchar_use_facet(this->strbuf->loc), ch); } +/* ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z */ +/* ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ios_wchar_swap, 8) +void __thiscall basic_ios_wchar_swap(basic_ios_wchar *this, basic_ios_wchar *r) +{ + void *swap_ptr; + + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + ios_base_swap(&this->base, &r->base); + swap_ptr = this->stream; + this->stream = r->stream; + r->stream = swap_ptr; + this->fillch ^= r->fillch; + r->fillch ^= this->fillch; + this->fillch ^= r->fillch; +} + /* Caution: basic_ostream uses virtual inheritance. * All constructors have additional parameter that says if base class should be initialized. * Base class needs to be accessed using vbtable.

1 0

Piotr Caban : msvcp100: Add basic_istream::swap implementation.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: fe93ebd83071cc27b9bb0238bcbd9dd345b1d8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe93ebd83071cc27b9bb0238b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 30 15:55:11 2014 -0500 msvcp100: Add basic_istream::swap implementation. --- dlls/msvcp100/msvcp100.spec | 12 ++++++------ dlls/msvcp110/msvcp110.spec | 18 +++++++++--------- dlls/msvcp90/ios.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index b593c06..64a3389 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2698,12 +2698,12 @@ @ stub -arch=win64 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_istream_char_swap +@ cdecl -arch=win64 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_istream_char_swap +@ thiscall -arch=win32 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_istream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_istream_wchar_swap +@ thiscall -arch=win32 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_istream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_istream_wchar_swap @ stub -arch=win32 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0618f48..67d706a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3479,15 +3479,15 @@ @ stub -arch=arm ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z @ stub -arch=i386 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z +@ cdecl -arch=arm ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_istream_char_swap +@ thiscall -arch=i386 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_istream_char_swap +@ cdecl -arch=win64 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_istream_char_swap +@ cdecl -arch=arm ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_istream_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_istream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_istream_wchar_swap +@ cdecl -arch=arm ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_istream_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_istream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_istream_wchar_swap @ stub -arch=arm ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z @ stub -arch=i386 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 0ca6566..187494b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8896,6 +8896,23 @@ basic_istream_char* __thiscall basic_istream_char_read_func_ios_base(basic_istre return this; } +/* ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_istream_char_swap, 8) +void __thiscall basic_istream_char_swap(basic_istream_char *this, basic_istream_char *r) +{ + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + basic_ios_char_swap(basic_istream_char_get_basic_ios(this), + basic_istream_char_get_basic_ios(r)); + this->count ^= r->count; + r->count ^= this->count; + this->count ^= r->count; +} + /* Caution: basic_istream uses virtual inheritance. */ static inline basic_ios_wchar* basic_istream_wchar_get_basic_ios(basic_istream_wchar *this) { @@ -10424,6 +10441,25 @@ basic_istream_wchar* __thiscall basic_istream_wchar_read_func_ios_base( return this; } +/* ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z */ +/* ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_istream_wchar_swap, 8) +void __thiscall basic_istream_wchar_swap(basic_istream_wchar *this, basic_istream_wchar *r) +{ + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + basic_ios_wchar_swap(basic_istream_wchar_get_basic_ios(this), + basic_istream_wchar_get_basic_ios(r)); + this->count ^= r->count; + r->count ^= this->count; + this->count ^= r->count; +} + static inline basic_ios_char* basic_iostream_char_to_basic_ios(basic_iostream_char *ptr) { return (basic_ios_char*)((char*)ptr+basic_iostream_char_vbtable1[1]);

1 0

Piotr Caban : msvcp100: Add basic_ostream::swap implementaiton.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 4d3b23f6cd5cc92dbd536ab4cc89f5b8c07af67c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d3b23f6cd5cc92dbd536ab4c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 30 15:55:20 2014 -0500 msvcp100: Add basic_ostream::swap implementaiton. --- dlls/msvcp100/msvcp100.spec | 12 ++++++------ dlls/msvcp110/msvcp110.spec | 18 +++++++++--------- dlls/msvcp90/ios.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 64a3389..20a8ee6 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2704,12 +2704,12 @@ @ cdecl -arch=win64 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_istream_wchar_swap @ thiscall -arch=win32 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_istream_wchar_swap @ cdecl -arch=win64 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_istream_wchar_swap -@ stub -arch=win32 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ostream_char_swap +@ cdecl -arch=win64 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ostream_char_swap +@ thiscall -arch=win32 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ostream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ostream_wchar_swap +@ thiscall -arch=win32 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ostream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ostream_wchar_swap @ stub -arch=win32 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 67d706a..15ec125 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3488,15 +3488,15 @@ @ cdecl -arch=arm ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_istream_wchar_swap @ thiscall -arch=i386 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_istream_wchar_swap @ cdecl -arch=win64 ?swap@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_istream_wchar_swap -@ stub -arch=arm ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z +@ cdecl -arch=arm ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_ostream_char_swap +@ thiscall -arch=i386 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_ostream_char_swap +@ cdecl -arch=win64 ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_ostream_char_swap +@ cdecl -arch=arm ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_ostream_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_ostream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_ostream_wchar_swap +@ cdecl -arch=arm ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_ostream_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_ostream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_ostream_wchar_swap @ stub -arch=arm ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z @ stub -arch=i386 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 187494b..7ddc9da 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -6635,6 +6635,20 @@ basic_ostream_char* __thiscall basic_ostream_char_print_func_ios_base( return this; } +/* ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z */ +/* ?swap@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ostream_char_swap, 8) +void __thiscall basic_ostream_char_swap(basic_ostream_char *this, basic_ostream_char *r) +{ + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + basic_ios_char_swap(basic_ostream_char_get_basic_ios(this), + basic_ostream_char_get_basic_ios(r)); +} + /* Caution: basic_ostream uses virtual inheritance. */ static inline basic_ios_wchar* basic_ostream_wchar_get_basic_ios(basic_ostream_wchar *this) { @@ -7658,6 +7672,22 @@ basic_ostream_wchar* __thiscall basic_ostream_wchar_print_func_ios_base( return this; } +/* ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z */ +/* ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z */ +/* ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z */ +/* ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_ostream_wchar_swap, 8) +void __thiscall basic_ostream_wchar_swap(basic_ostream_wchar *this, basic_ostream_wchar *r) +{ + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + basic_ios_wchar_swap(basic_ostream_wchar_get_basic_ios(this), + basic_ostream_wchar_get_basic_ios(r)); +} + /* Caution: basic_istream uses virtual inheritance. */ static inline basic_ios_char* basic_istream_char_get_basic_ios(basic_istream_char *this) {

1 0

Piotr Caban : msvcp100: Add basic_iostream::swap implementation.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: cbdc014f41673d85f8379d0fa8ca1fb770a4e42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbdc014f41673d85f8379d0fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 30 15:55:38 2014 -0500 msvcp100: Add basic_iostream::swap implementation. --- dlls/msvcp100/msvcp100.spec | 12 ++++++------ dlls/msvcp110/msvcp110.spec | 18 +++++++++--------- dlls/msvcp90/ios.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 20a8ee6..538f37f 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2692,12 +2692,12 @@ @ cdecl -arch=win64 ?swap@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ios_wchar_swap @ thiscall -arch=win32 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ios_wchar_swap @ cdecl -arch=win64 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ios_wchar_swap -@ stub -arch=win32 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_iostream_char_swap +@ cdecl -arch=win64 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_iostream_char_swap +@ thiscall -arch=win32 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_iostream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_iostream_wchar_swap +@ thiscall -arch=win32 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_iostream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_iostream_wchar_swap @ thiscall -arch=win32 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_istream_char_swap @ cdecl -arch=win64 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_istream_char_swap @ thiscall -arch=win32 ?swap@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_istream_wchar_swap diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 15ec125..8e01521 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3470,15 +3470,15 @@ @ cdecl -arch=arm ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAAXAAV12@@Z(ptr ptr) basic_ios_wchar_swap @ thiscall -arch=i386 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ios_wchar_swap @ cdecl -arch=win64 ?swap@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ios_wchar_swap -@ stub -arch=arm ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z +@ cdecl -arch=arm ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_iostream_char_swap +@ thiscall -arch=i386 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_iostream_char_swap +@ cdecl -arch=win64 ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_iostream_char_swap +@ cdecl -arch=arm ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_iostream_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_iostream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_iostream_wchar_swap +@ cdecl -arch=arm ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_iostream_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_iostream_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_iostream_wchar_swap @ cdecl -arch=arm ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_istream_char_swap @ thiscall -arch=i386 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_istream_char_swap @ cdecl -arch=win64 ?swap@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_istream_char_swap diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7ddc9da..f730898 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -10570,6 +10570,20 @@ basic_iostream_char* __thiscall basic_iostream_char_vector_dtor(basic_ios_char * return this; } +/* ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_iostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_iostream_char_swap, 8) +void __thiscall basic_iostream_char_swap(basic_iostream_char *this, basic_iostream_char *r) +{ + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + basic_ios_char_swap(basic_istream_char_get_basic_ios(&this->base1), + basic_istream_char_get_basic_ios(&r->base1)); +} + static inline basic_ios_wchar* basic_iostream_wchar_to_basic_ios(basic_iostream_wchar *ptr) { return (basic_ios_wchar*)((char*)ptr+basic_iostream_wchar_vbtable1[1]); @@ -10666,6 +10680,22 @@ basic_iostream_wchar* __thiscall basic_iostream_wchar_vector_dtor(basic_ios_wcha return this; } +/* ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_iostream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z */ +/* ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_iostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_iostream_wchar_swap, 8) +void __thiscall basic_iostream_wchar_swap(basic_iostream_wchar *this, basic_iostream_wchar *r) +{ + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + basic_ios_wchar_swap(basic_istream_wchar_get_basic_ios(&this->base1), + basic_istream_wchar_get_basic_ios(&r->base1)); +} + static inline basic_ios_char* basic_ofstream_char_to_basic_ios(basic_ofstream_char *ptr) { return (basic_ios_char*)((char*)ptr+basic_ofstream_char_vbtable[1]);

1 0

Piotr Caban : msvcp100: Add basic_streambuf::swap implementation.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: c654b7be68fc978e532cf6f2a8881b5d0669b5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c654b7be68fc978e532cf6f2a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 30 15:55:50 2014 -0500 msvcp100: Add basic_streambuf::swap implementation. --- dlls/msvcp100/msvcp100.spec | 12 ++++++------ dlls/msvcp110/msvcp110.spec | 18 +++++++++--------- dlls/msvcp90/ios.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 538f37f..6cb9b77 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2710,12 +2710,12 @@ @ cdecl -arch=win64 ?swap@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ostream_wchar_swap @ thiscall -arch=win32 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QAEXAAV12@@Z(ptr ptr) basic_ostream_wchar_swap @ cdecl -arch=win64 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_ostream_wchar_swap -@ stub -arch=win32 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_streambuf_char_swap +@ cdecl -arch=win64 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_streambuf_char_swap +@ thiscall -arch=win32 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_streambuf_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_streambuf_wchar_swap +@ thiscall -arch=win32 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_streambuf_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_streambuf_wchar_swap @ thiscall -arch=win32 ?swap(a)ios_base@std@@QAEXAAV12@@Z(ptr ptr) ios_base_swap @ cdecl -arch=win64 ?swap(a)ios_base@std@@QEAAXAEAV12@@Z(ptr ptr) ios_base_swap @ thiscall -arch=win32 ?sync@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ(ptr) basic_istream_char_sync diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 8e01521..54d2ae4 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3497,15 +3497,15 @@ @ cdecl -arch=arm ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_ostream_wchar_swap @ thiscall -arch=i386 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_ostream_wchar_swap @ cdecl -arch=win64 ?swap@?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_ostream_wchar_swap -@ stub -arch=arm ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z -@ stub -arch=arm ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z -@ stub -arch=i386 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z +@ cdecl -arch=arm ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_streambuf_char_swap +@ thiscall -arch=i386 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_streambuf_char_swap +@ cdecl -arch=win64 ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_streambuf_char_swap +@ cdecl -arch=arm ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_streambuf_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_streambuf_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_streambuf_wchar_swap +@ cdecl -arch=arm ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXAAV12@@Z(ptr ptr) basic_streambuf_wchar_swap +@ thiscall -arch=i386 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z(ptr ptr) basic_streambuf_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXAEAV12@@Z(ptr ptr) basic_streambuf_wchar_swap @ cdecl -arch=arm ?swap(a)ios_base@std@@QAAXAAV12@@Z(ptr ptr) ios_base_swap @ thiscall -arch=i386 ?swap(a)ios_base@std@@QAEXAAV12@@Z(ptr ptr) ios_base_swap @ cdecl -arch=win64 ?swap(a)ios_base@std@@QEAAXAEAV12@@Z(ptr ptr) ios_base_swap diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index f730898..fbba957 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1746,6 +1746,25 @@ streamsize __thiscall basic_streambuf_char_sputn(basic_streambuf_char *this, con return call_basic_streambuf_char_xsputn(this, ptr, count); } +/* ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IAEXAAV12@@Z */ +/* ?swap@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_char_swap, 8) +void __thiscall basic_streambuf_char_swap(basic_streambuf_char *this, basic_streambuf_char *r) +{ + basic_streambuf_char tmp; + + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + tmp = *this; + *this = *r; + this->vtable = tmp.vtable; + tmp.vtable = r->vtable; + *r = tmp; +} + /* ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXPA_W00(a)Z */ /* ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXPEA_W00(a)Z */ /* ?setp@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAEXPAG00(a)Z */ @@ -2666,6 +2685,27 @@ streamsize __thiscall basic_streambuf_wchar_sputn(basic_streambuf_wchar *this, c return call_basic_streambuf_wchar_xsputn(this, ptr, count); } +/* ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IAEXAAV12@@Z */ +/* ?swap@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXAEAV12@@Z */ +/* ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z */ +/* ?swap@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXAAV12@@Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_swap, 8) +void __thiscall basic_streambuf_wchar_swap(basic_streambuf_wchar *this, basic_streambuf_wchar *r) +{ + basic_streambuf_wchar tmp; + + TRACE("(%p %p)\n", this, r); + + if(this == r) + return; + + tmp = *this; + *this = *r; + this->vtable = tmp.vtable; + tmp.vtable = r->vtable; + *r = tmp; +} + /* ?_Stinit@?1??_Init@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAU_iobuf@@W4_Initfl(a)23@@Z(a)4HA */ /* ?_Stinit@?1??_Init@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl(a)23@@Z(a)4HA */ int basic_filebuf_char__Init__Stinit = 0;

1 0

Gerald Pfeifer : scrrun: Add a check for empty string in start_enumeration.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 3b8e7d4dac6f079f1732518d542ca7f7c0c4da41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b8e7d4dac6f079f1732518d5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 26 00:34:47 2014 +0200 scrrun: Add a check for empty string in start_enumeration. --- dlls/scrrun/filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 434b402..f6f7703 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1130,7 +1130,7 @@ static HANDLE start_enumeration(const WCHAR *path, WIN32_FIND_DATAW *data, BOOL strcpyW(pathW, path); len = strlenW(pathW); - if (pathW[len-1] != '\\') + if (len && pathW[len-1] != '\\') strcatW(pathW, bsW); strcatW(pathW, allW); handle = FindFirstFileW(pathW, data);

1 0

Thomas Faber : quartz: Fix IEnumFiltersImpl memory leak.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 1236f52d1922b5f1858a469d3305c536cc0ebf64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1236f52d1922b5f1858a469d3… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 00:20:10 2014 +0200 quartz: Fix IEnumFiltersImpl memory leak. --- dlls/quartz/enumfilters.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index 735fd79..ea2af2a 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -117,6 +117,7 @@ static ULONG WINAPI IEnumFiltersImpl_Release(IEnumFilters * iface) if (!refCount) { IGraphVersion_Release(This->pVersionSource); + CoTaskMemFree(This); return 0; } else

1 0

Thomas Faber : quartz: Destroy BaseRenderer in NullRendererInner_Release.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 0c9b8322297cafb218c7ff3a14b99491bf3594f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9b8322297cafb218c7ff3a1… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jul 28 12:10:01 2014 +0200 quartz: Destroy BaseRenderer in NullRendererInner_Release. --- dlls/quartz/nullrenderer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 7befc46..dbbdd4f 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -128,12 +128,11 @@ static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface) static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) { NullRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); + ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface); if (!refCount) { TRACE("Destroying Null Renderer\n"); - BaseFilter_Destroy(&This->renderer.filter); CoTaskMemFree(This); }

1 0

Andrei Slăvoiu : wined3d: Make the card selection for Nvidia binary driver use arrays only.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 47bec5eba0334f06226c36cbea00ca64b6dbd5f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bec5eba0334f06226c36cbe… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Mon Jul 28 23:06:47 2014 +0300 wined3d: Make the card selection for Nvidia binary driver use arrays only. --- dlls/wined3d/directx.c | 82 +++++++++++++++----------------------------------- 1 file changed, 25 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a84b85..222cc48 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1784,6 +1784,31 @@ static enum wined3d_pci_device select_card_nvidia_binary(const char *gl_renderer {"6700", CARD_NVIDIA_GEFORCE_6600GT}, /* Geforce 6 - midend */ {"6610", CARD_NVIDIA_GEFORCE_6600GT}, /* Geforce 6 - midend */ {"6600", CARD_NVIDIA_GEFORCE_6600GT}, /* Geforce 6 - midend */ + /* Direct3D 9 SM2 */ + {"Quadro FX", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ + {"5950", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ + {"5900", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ + {"5800", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ + {"5750", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ + {"5700", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ + {"5650", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ + {"5600", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ + {"5500", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + {"5300", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + {"5250", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + {"5200", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + {"5100", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ + /* Direct3D 8 */ + {"Quadro4", CARD_NVIDIA_GEFORCE4_TI4200}, + {"GeForce4 Ti", CARD_NVIDIA_GEFORCE4_TI4200}, /* Geforce4 Ti4200/Ti4400/Ti4600/Ti4800 */ + /* Direct3D 7 */ + {"GeForce4 MX", CARD_NVIDIA_GEFORCE4_MX}, /* MX420/MX440/MX460/MX4000 */ + {"Quadro2 MXR", CARD_NVIDIA_GEFORCE2_MX}, + {"GeForce2 MX", CARD_NVIDIA_GEFORCE2_MX}, /* Geforce2 standard/MX100/MX200/MX400 */ + {"Quadro2", CARD_NVIDIA_GEFORCE2}, + {"GeForce2", CARD_NVIDIA_GEFORCE2}, /* Geforce2 GTS/Pro/Ti/Ultra */ + /* Direct3D 6 */ + {"TNT2", CARD_NVIDIA_RIVA_TNT2}, /* Riva TNT2 standard/M64/Pro/Ultra */ }; for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) @@ -1792,63 +1817,6 @@ static enum wined3d_pci_device select_card_nvidia_binary(const char *gl_renderer return cards[i].id; } - /* Direct3D 9 SM2 */ - /* GeforceFX - highend */ - if (strstr(gl_renderer, "5800") - || strstr(gl_renderer, "5900") - || strstr(gl_renderer, "5950") - || strstr(gl_renderer, "Quadro FX")) - { - return CARD_NVIDIA_GEFORCEFX_5800; - } - - /* GeforceFX - midend */ - if (strstr(gl_renderer, "5600") - || strstr(gl_renderer, "5650") - || strstr(gl_renderer, "5700") - || strstr(gl_renderer, "5750")) - { - return CARD_NVIDIA_GEFORCEFX_5600; - } - - /* GeforceFX - lowend */ - if (strstr(gl_renderer, "5100") - || strstr(gl_renderer, "5200") - || strstr(gl_renderer, "5250") - || strstr(gl_renderer, "5300") - || strstr(gl_renderer, "5500")) - { - return CARD_NVIDIA_GEFORCEFX_5200; /* GeforceFX 5100/5200/5250/5300/5500 */ - } - - /* Direct3D 8 */ - if (strstr(gl_renderer, "GeForce4 Ti") || strstr(gl_renderer, "Quadro4")) - { - return CARD_NVIDIA_GEFORCE4_TI4200; /* Geforce4 Ti4200/Ti4400/Ti4600/Ti4800, Quadro4 */ - } - - /* Direct3D 7 */ - if (strstr(gl_renderer, "GeForce4 MX")) - { - return CARD_NVIDIA_GEFORCE4_MX; /* MX420/MX440/MX460/MX4000 */ - } - - if (strstr(gl_renderer, "GeForce2 MX") || strstr(gl_renderer, "Quadro2 MXR")) - { - return CARD_NVIDIA_GEFORCE2_MX; /* Geforce2 standard/MX100/MX200/MX400, Quadro2 MXR */ - } - - if (strstr(gl_renderer, "GeForce2") || strstr(gl_renderer, "Quadro2")) - { - return CARD_NVIDIA_GEFORCE2; /* Geforce2 GTS/Pro/Ti/Ultra, Quadro2 */ - } - - /* Direct3D 6 */ - if (strstr(gl_renderer, "TNT2")) - { - return CARD_NVIDIA_RIVA_TNT2; /* Riva TNT2 standard/M64/Pro/Ultra */ - } - return PCI_DEVICE_NONE; }

1 0