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

Piotr Caban : msvcp100: Add basic_streambuf::swap implementation.
by Alexandre Julliard July 30, 2014

July 30, 2014

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

Piotr Caban : msvcp100: Add basic_iostream::swap implementation.
by Alexandre Julliard July 30, 2014

July 30, 2014

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_istream::swap implementation.
by Alexandre Julliard July 30, 2014

July 30, 2014

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 July 30, 2014

July 30, 2014

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_ios::swap implementation.
by Alexandre Julliard July 30, 2014

July 30, 2014

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 ios_base::swap implementation.
by Alexandre Julliard July 30, 2014

July 30, 2014

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

Stefan Dösinger : user32: Make GetRegisteredRawInputDevices hotpatchable.
by Alexandre Julliard July 30, 2014

July 30, 2014

Module: wine Branch: master Commit: 3e993bf1d8a4fa4f4929e6bb3b0df68529fbcacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e993bf1d8a4fa4f4929e6bb3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 30 20:45:20 2014 +0000 user32: Make GetRegisteredRawInputDevices hotpatchable. --- dlls/user32/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 457e67c..ec81e60 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -696,7 +696,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT /****************************************************************** * GetRegisteredRawInputDevices (USER32.@) */ -UINT WINAPI GetRegisteredRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, PUINT puiNumDevices, UINT cbSize) +UINT WINAPI DECLSPEC_HOTPATCH GetRegisteredRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, PUINT puiNumDevices, UINT cbSize) { FIXME("(pRawInputDevices=%p, puiNumDevices=%p, cbSize=%d) stub!\n", pRawInputDevices, puiNumDevices, cbSize);

1 0

Andrei Slăvoiu : wined3d: Replace vendor specific callbacks with generic code that uses vendor specific renderer string tables.
by Alexandre Julliard July 30, 2014

July 30, 2014

Module: wine Branch: master Commit: 01b2b3074d60e021c5ae53ba0e94cbfde19a2085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b2b3074d60e021c5ae53ba0… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Mon Jul 28 23:06:52 2014 +0300 wined3d: Replace vendor specific callbacks with generic code that uses vendor specific renderer string tables. --- dlls/wined3d/directx.c | 971 ++++++++++++++++++++++--------------------------- 1 file changed, 445 insertions(+), 526 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01b2b3074d60e021c5ae5…

1 0

Gerald Pfeifer : scrrun: Add a check for empty string in start_enumeration.
by Alexandre Julliard July 30, 2014

July 30, 2014

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

Bruno Jesus : rsaenh/tests: Run the tests in the Base and Strong providers too.
by Alexandre Julliard July 30, 2014

July 30, 2014

Module: wine Branch: master Commit: d429e602af82c39fd2d4d4d0dc8ae77aa123e7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d429e602af82c39fd2d4d4d0d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 30 16:21:26 2014 -0300 rsaenh/tests: Run the tests in the Base and Strong providers too. --- dlls/rsaenh/tests/rsaenh.c | 124 ++++++++++++++++++++++++++++++++------------- 1 file changed, 90 insertions(+), 34 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 7106c80..1dfca3c 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -30,8 +30,14 @@ #include "winreg.h" static HCRYPTPROV hProv; +static const char *szProviders[] = {MS_ENHANCED_PROV_A, MS_DEF_PROV_A, MS_STRONG_PROV_A}; +static int iProv; static const char szContainer[] = "winetest"; -static const char szProvider[] = MS_ENHANCED_PROV_A; +static const char *szProvider; + +#define ENHANCED_PROV (iProv == 0) +#define BASE_PROV (iProv == 1) +#define STRONG_PROV (iProv == 2) typedef struct _ctdatatype { unsigned char origstr[32]; @@ -122,10 +128,12 @@ static void trace_hex(BYTE *pbData, DWORD dwLen) { } */ -static BOOL init_base_environment(DWORD dwKeyFlags) +static BOOL init_base_environment(const char *provider, DWORD dwKeyFlags) { HCRYPTKEY hKey; BOOL result; + + if (provider) szProvider = provider; pCryptDuplicateHash = (void *)GetProcAddress(GetModuleHandleA("advapi32.dll"), "CryptDuplicateHash"); @@ -901,6 +909,9 @@ static void test_des(void) static const BYTE des_old_behavior[16] = { 0xb0, 0xfd, 0x11, 0x69, 0x76, 0xb1, 0xa1, 0x03, 0xf7, 0xbc, 0x23, 0xaa, 0xd4, 0xc1, 0xc9, 0x55 }; + static const BYTE des_old_strong[16] = { + 0x9b, 0xc1, 0x2a, 0xec, 0x4a, 0xf9, 0x0f, 0x14, + 0x0a, 0xed, 0xf6, 0xd3, 0xdc, 0xad, 0xf7, 0x0c }; int i; result = derive_key(CALG_DES, &hKey, 0); @@ -1001,8 +1012,9 @@ static void test_des(void) dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); - - ok(!memcmp(pbData, des, sizeof(des)) || broken(!memcmp(pbData, des_old_behavior, sizeof(des))) /* <= 2000 */, + ok(!memcmp(pbData, des, sizeof(des)) || broken( + !memcmp(pbData, des_old_behavior, sizeof(des)) || + (STRONG_PROV && !memcmp(pbData, des_old_strong, sizeof(des)))) /* <= 2000 */, "DES encryption failed!\n"); result = CryptDestroyKey(hKey); @@ -1337,8 +1349,11 @@ static void test_rc2(void) 0xc0, 0x9a, 0xe4, 0x2f, 0x0a, 0x47, 0x67, 0x11, 0xfb, 0x18, 0x87, 0xce, 0x0c, 0x75, 0x07, 0xb1 }; static const BYTE rc2_128_encrypted[] = { - 0x82,0x81,0xf7,0xff,0xdd,0xd7,0x88,0x8c,0x2a,0x2a,0xc0,0xce,0x4c,0x89, - 0xb6,0x66 }; + 0x82,0x81,0xf7,0xff,0xdd,0xd7,0x88,0x8c, + 0x2a,0x2a,0xc0,0xce,0x4c,0x89,0xb6,0x66 }; + static const BYTE rc2_40def_encrypted[] = { + 0x23,0xc8,0x70,0x13,0x42,0x2e,0xa8,0x98, + 0x5c,0xdf,0x7a,0x9b,0xea,0xdb,0x96,0x1b }; HCRYPTHASH hHash; HCRYPTKEY hKey; BOOL result; @@ -1511,13 +1526,28 @@ static void test_rc2(void) dwKeyLen = 128; result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); - ok(result, "%d\n", GetLastError()); + if (!BASE_PROV) + ok(result, "expected success, got error 0x%08X\n", GetLastError()); + else + todo_wine + ok(!result, "expected error\n"); dwLen = sizeof(dwKeyLen); CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(dwKeyLen == 128, "%d (%08x)\n", dwKeyLen, GetLastError()); + /* Remove IF when fixed */ + if(BASE_PROV) + { + todo_wine + ok((!BASE_PROV && dwKeyLen == 128) || (BASE_PROV && dwKeyLen == 40), + "%d (%08x)\n", dwKeyLen, GetLastError()); + } + else + { + ok((!BASE_PROV && dwKeyLen == 128) || (BASE_PROV && dwKeyLen == 40), + "%d (%08x)\n", dwKeyLen, GetLastError()); + } result = CryptDestroyHash(hHash); ok(result, "%08x\n", GetLastError()); @@ -1526,8 +1556,18 @@ static void test_rc2(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); ok(result, "%08x\n", GetLastError()); - ok(!memcmp(pbData, rc2_128_encrypted, sizeof(rc2_128_encrypted)), - "RC2 encryption failed!\n"); + /* Remove IF when fixed */ + if(BASE_PROV) + { + todo_wine + ok(!memcmp(pbData, !BASE_PROV ? rc2_128_encrypted : rc2_40def_encrypted, + sizeof(rc2_128_encrypted)), "RC2 encryption failed!\n"); + } + else + { + ok(!memcmp(pbData, !BASE_PROV ? rc2_128_encrypted : rc2_40def_encrypted, + sizeof(rc2_128_encrypted)), "RC2 encryption failed!\n"); + } /* Oddly enough this succeeds, though it should have no effect */ dwKeyLen = 40; @@ -1795,8 +1835,9 @@ static void test_import_private(void) dwLen = (DWORD)sizeof(abEncryptedMessage); result = CryptDecrypt(hSessionKey, 0, TRUE, 0, abEncryptedMessage, &dwLen); - ok(result && dwLen == 12 && !memcmp(abEncryptedMessage, "Wine rocks!",12), - "%08x, len: %d\n", GetLastError(), dwLen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen == 12, "expected 12, got %d\n", dwLen); + ok(!memcmp(abEncryptedMessage, "Wine rocks!", 12), "decrypt failed\n"); CryptDestroyKey(hSessionKey); if (!derive_key(CALG_RC4, &hSessionKey, 56)) return; @@ -2132,6 +2173,11 @@ static void test_rsa_encrypt(void) dwLen = 12; result = CryptEncrypt(hRSAKey, 0, TRUE, 0, NULL, &dwLen, (DWORD)sizeof(abData)); + if(!ENHANCED_PROV && !result && GetLastError() == NTE_BAD_KEY) + { + CryptDestroyKey(hRSAKey); + return; + } ok(result, "CryptEncrypt failed: %08x\n", GetLastError()); ok(dwLen == 128, "Unexpected length %d\n", dwLen); dwLen = 12; @@ -3123,7 +3169,7 @@ static void test_key_permissions(void) BOOL result; /* Create keys that are exportable */ - if (!init_base_environment(CRYPT_EXPORTABLE)) + if (!init_base_environment(NULL, CRYPT_EXPORTABLE)) return; result = CryptGetUserKey(hProv, AT_KEYEXCHANGE, &hKey1); @@ -3576,27 +3622,37 @@ err: START_TEST(rsaenh) { - if (!init_base_environment(0)) - return; - test_prov(); - test_gen_random(); - test_hashes(); - test_rc4(); - test_rc2(); - test_des(); - test_3des112(); - test_3des(); - test_hmac(); - test_mac(); - test_block_cipher_modes(); - test_import_private(); - test_verify_signature(); - test_rsa_encrypt(); - test_import_export(); - test_import_hmac(); - test_enum_container(); - test_key_derivation("RSA"); - clean_up_base_environment(); + for (iProv = 0; iProv < sizeof(szProviders) / sizeof(szProviders[0]); iProv++) + { + if (!init_base_environment(szProviders[iProv], 0)) + return; + trace("Testing '%s'\n", szProviders[iProv]); + test_prov(); + test_gen_random(); + test_hashes(); + test_rc4(); + test_rc2(); + test_des(); + if(!BASE_PROV) + { + test_3des112(); + test_3des(); + } + if(ENHANCED_PROV) + { + test_import_private(); + } + test_hmac(); + test_mac(); + test_block_cipher_modes(); + test_verify_signature(); + test_rsa_encrypt(); + test_import_export(); + test_import_hmac(); + test_enum_container(); + if(!BASE_PROV) test_key_derivation(STRONG_PROV ? "STRONG" : "ENH"); + clean_up_base_environment(); + } test_key_permissions(); test_key_initialization(); test_schannel_provider();

1 0