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

Bruno Jesus : winhttp/tests: Add a no-content header test.
by Alexandre Julliard July 30, 2014

July 30, 2014

Module: wine Branch: master Commit: 1697eb6ee227b23d097b53ee01aac286f73b5ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1697eb6ee227b23d097b53ee0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 30 13:31:17 2014 -0300 winhttp/tests: Add a no-content header test. --- dlls/winhttp/tests/winhttp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f214879..0d8f8be 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1767,6 +1767,11 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char nocontentmsg[] = +"HTTP/1.1 204 No Content\r\n" +"Server: winetest\r\n" +"\r\n"; + static const char noauthmsg[] = "HTTP/1.1 401 Unauthorized\r\n" "Server: winetest\r\n" @@ -1850,6 +1855,10 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, page1, sizeof page1 - 1, 0); } + if (strstr(buffer, "GET /no_content")) + { + send(c, nocontentmsg, sizeof nocontentmsg - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -2087,6 +2096,83 @@ static void test_no_headers(int port) WinHttpCloseHandle(ses); } +static void test_no_content(int port) +{ + static const WCHAR no_contentW[] = {'/','n','o','_','c','o','n','t','e','n','t',0}; + HINTERNET ses, con, req; + WCHAR buf[128]; + DWORD size, len = sizeof(buf), bytes_read, status; + BOOL ret; + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, no_contentW, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + size = 12345; + SetLastError(0xdeadbeef); + ret = WinHttpQueryDataAvailable(req, &size); + todo_wine { + ok(!ret, "expected error\n"); + ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, + "expected ERROR_WINHTTP_INCORRECT_HANDLE_STATE, got 0x%08x\n", GetLastError()); + ok(size == 12345 || broken(size == 0) /* Win <= 2003 */, + "expected 12345, got %u\n", size); + } + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "expected success\n"); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "expected success\n"); + + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, NULL); + ok(ret, "expected success\n"); + ok(status == 204, "expected status 204, got %d\n", status); + + SetLastError(0xdeadbeef); + size = sizeof(status); + status = 12345; + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, 0); + ok(!ret, "expected no content-length header\n"); + ok(GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, + "wrong error %u\n", GetLastError() ); + ok(status == 12345, "expected 0, got %d\n", status); + + size = 12345; + ret = WinHttpQueryDataAvailable(req, &size); + ok(ret, "expected success\n"); + ok(size == 0, "expected 0, got %d\n", size); + + ret = WinHttpReadData(req, buf, len, &bytes_read); + ok( bytes_read == 0, "expected 0, got %u available\n", bytes_read ); + + size = 12345; + ret = WinHttpQueryDataAvailable(req, &size); + ok(ret, "expected success\n"); + ok(size == 0, "expected 0, got %d\n", size); + + WinHttpCloseHandle(req); + + size = 12345; + SetLastError(0xdeadbeef); + ret = WinHttpQueryDataAvailable(req, &size); + ok(!ret, "expected error\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "expected ERROR_INVALID_HANDLE, got 0x%08x\n", GetLastError()); + ok(size == 12345, "expected 12345, got %u\n", size); + + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_bad_header( int port ) { static const WCHAR bad_headerW[] = @@ -3078,6 +3164,7 @@ START_TEST (winhttp) test_connection_info(si.port); test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); + test_no_content(si.port); test_basic_authentication(si.port); test_bad_header(si.port); test_multiple_reads(si.port);

1 0

Ken Thomases : winemac: Use new API when available to list all display modes available on Retina Macs.
by Alexandre Julliard July 30, 2014

July 30, 2014

Module: wine Branch: master Commit: c3d7f5b7ec8ce1142ad23e477eee8d3ff2fbf991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d7f5b7ec8ce1142ad23e477… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 28 19:16:43 2014 -0500 winemac: Use new API when available to list all display modes available on Retina Macs. --- dlls/winemac.drv/cocoa_app.m | 17 +++- dlls/winemac.drv/display.c | 179 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 193 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3d7f5b7ec8ce1142ad23…

1 0

Nikolay Sivov : dwrite: Added some layout tests, simplify debug output for text ranges.
by Alexandre Julliard July 30, 2014

July 30, 2014

Module: wine Branch: master Commit: 1c23bf04c77fd3f7078c2d836e5c5c39c0ee6280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c23bf04c77fd3f7078c2d836… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 30 19:21:36 2014 +0400 dwrite: Added some layout tests, simplify debug output for text ranges. --- dlls/dwrite/analyzer.c | 2 - dlls/dwrite/dwrite_private.h | 6 +++ dlls/dwrite/font.c | 2 - dlls/dwrite/layout.c | 26 +++++------ dlls/dwrite/tests/layout.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c23bf04c77fd3f7078c2…

1 0

Thomas Faber : quartz: Destroy BaseRenderer in NullRendererInner_Release.
by Alexandre Julliard July 30, 2014

July 30, 2014

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

Thomas Faber : quartz: Fix IEnumFiltersImpl memory leak.
by Alexandre Julliard July 30, 2014

July 30, 2014

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

Ken Thomases : ntdll: In find_file_in_dir(), don't test directory entries' short names if the target name isn't a short name.
by Alexandre Julliard July 30, 2014

July 30, 2014

Module: wine Branch: master Commit: a14ed527d858e22cc754a5513eabf7c250eec7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14ed527d858e22cc754a5513… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 28 12:58:23 2014 -0500 ntdll: In find_file_in_dir(), don't test directory entries' short names if the target name isn't a short name. hash_short_file_name() will always create a short name of at least 8 characters with the 5th being a tilde (~). If the target name isn't of that form, then it can never match any short name constructed from the directory entries. --- dlls/ntdll/directory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 04a5b75..a2796b2 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2250,6 +2250,9 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i str.Length = length * sizeof(WCHAR); str.MaximumLength = str.Length; is_name_8_dot_3 = RtlIsNameLegalDOS8Dot3( &str, NULL, &spaces ) && !spaces; +#ifndef VFAT_IOCTL_READDIR_BOTH + is_name_8_dot_3 = is_name_8_dot_3 && length >= 8 && name[4] == '~'; +#endif if (!is_name_8_dot_3 && !get_dir_case_sensitivity( unix_name )) goto not_found;

1 0

Andrei Slăvoiu : wined3d: Make the card selection for AMD binary driver use arrays only.
by Alexandre Julliard July 30, 2014

July 30, 2014

Module: wine Branch: master Commit: 1e7c5d8ca4e1eb6cb7a79258a195a0ed20aee807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7c5d8ca4e1eb6cb7a79258a… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sat Jul 26 21:24:32 2014 +0300 wined3d: Make the card selection for AMD binary driver use arrays only. --- dlls/wined3d/directx.c | 53 +++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 222cc48..e67d985 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1900,6 +1900,26 @@ static enum wined3d_pci_device select_card_amd_binary(const char *gl_renderer) {"HD 3400", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ {"HD 2400", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ {"HD 2350", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + /* Radeon R5xx */ + {"X1950", CARD_AMD_RADEON_X1600}, + {"X1900", CARD_AMD_RADEON_X1600}, + {"X1800", CARD_AMD_RADEON_X1600}, + {"X1650", CARD_AMD_RADEON_X1600}, + {"X1600", CARD_AMD_RADEON_X1600}, + /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) + * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ + {"HD 2300", CARD_AMD_RADEON_X700}, + {"X2500", CARD_AMD_RADEON_X700}, + {"X2300", CARD_AMD_RADEON_X700}, + {"X1550", CARD_AMD_RADEON_X700}, + {"X1450", CARD_AMD_RADEON_X700}, + {"X1400", CARD_AMD_RADEON_X700}, + {"X1300", CARD_AMD_RADEON_X700}, + {"X850", CARD_AMD_RADEON_X700}, + {"X800", CARD_AMD_RADEON_X700}, + {"X700", CARD_AMD_RADEON_X700}, + /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */ + {"Radeon Xpress", CARD_AMD_RADEON_XPRESS_200M}, }; for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) @@ -1908,39 +1928,6 @@ static enum wined3d_pci_device select_card_amd_binary(const char *gl_renderer) return cards[i].id; } - /* Radeon R5xx */ - if (strstr(gl_renderer, "X1600") - || strstr(gl_renderer, "X1650") - || strstr(gl_renderer, "X1800") - || strstr(gl_renderer, "X1900") - || strstr(gl_renderer, "X1950")) - { - return CARD_AMD_RADEON_X1600; - } - - /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) - * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ - if (strstr(gl_renderer, "X700") - || strstr(gl_renderer, "X800") - || strstr(gl_renderer, "X850") - || strstr(gl_renderer, "X1300") - || strstr(gl_renderer, "X1400") - || strstr(gl_renderer, "X1450") - || strstr(gl_renderer, "X1550") - || strstr(gl_renderer, "X2300") - || strstr(gl_renderer, "X2500") - || strstr(gl_renderer, "HD 2300") - ) - { - return CARD_AMD_RADEON_X700; - } - - /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */ - if (strstr(gl_renderer, "Radeon Xpress")) - { - return CARD_AMD_RADEON_XPRESS_200M; - } - return PCI_DEVICE_NONE; }

1 0

Andrei Slăvoiu : wined3d: Make the card selection for Nvidia binary driver use arrays only.
by Alexandre Julliard July 30, 2014

July 30, 2014

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

Thomas Faber : strmbase: Separate BasePin destructors from Release.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 4ea1f35777c17c2a8896c1bfdb0619c6e7a72eea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea1f35777c17c2a8896c1bfd… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 11:34:50 2014 +0200 strmbase: Separate BasePin destructors from Release. --- dlls/strmbase/pin.c | 34 +++++++++++++++++++++++----------- include/wine/strmbase.h | 2 ++ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4920784..02af5b3 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -401,11 +401,7 @@ ULONG WINAPI BaseOutputPinImpl_Release(IPin * iface) if (!refCount) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; - CoTaskMemFree(This); + BaseOutputPin_Destroy(This); return 0; } return refCount; @@ -849,6 +845,16 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp return E_FAIL; } +HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This) +{ + FreeMediaType(&This->pin.mtCurrent); + if (This->pAllocator) + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + CoTaskMemFree(This); + return S_OK; +} + /*** Input Pin implementation ***/ static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface ) @@ -900,12 +906,7 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) if (!refCount) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; - This->pin.IPin_iface.lpVtbl = NULL; - CoTaskMemFree(This); + BaseInputPin_Destroy(This); return 0; } else @@ -1273,3 +1274,14 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size CoTaskMemFree(pPinImpl); return E_FAIL; } + +HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This) +{ + FreeMediaType(&This->pin.mtCurrent); + if (This->pAllocator) + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + This->pin.IPin_iface.lpVtbl = NULL; + CoTaskMemFree(This); + return S_OK; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1370198..841359d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -136,6 +136,7 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(BaseOutputPin *This, IMemInputP HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin *This, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* pBaseOutputFuncsTable, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This); /* Base Input Pin */ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); @@ -151,6 +152,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, const BaseInputPinFuncTable* pBaseInputFuncsTable, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); +HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This); typedef struct BaseFilter {

1 0

Thomas Faber : qcap: Reference module only on successful object creation.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 33e0e6867f6e07853739b037de18483c60cc7248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e0e6867f6e07853739b037d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 11:03:40 2014 +0200 qcap: Reference module only on successful object creation. --- dlls/qcap/vfwcapture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6d416b7..2cbf493 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -732,7 +732,6 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = pBaseFilter; lstrcpyW(piOutput.achName, wszOutputPinName); - ObjectRefCount(TRUE); hr = BaseOutputPin_Construct(&VfwPin_Vtbl, sizeof(VfwPinImpl), &piOutput, &output_BaseOutputFuncTable, pCritSec, ppPin); @@ -740,6 +739,7 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, { VfwPinImpl *pPinImpl = (VfwPinImpl*)*ppPin; pPinImpl->KSP_VT = &KSP_VTable; + ObjectRefCount(TRUE); } return hr;

1 0

Gerald Pfeifer : winhttp: Remove unused constant proxymsg.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 25bf35243e866644e77ae363f5b13597513ab69f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bf35243e866644e77ae363f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jul 25 23:32:00 2014 +0200 winhttp: Remove unused constant proxymsg. --- dlls/winhttp/tests/winhttp.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6a2d8c6..f214879 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1774,13 +1774,6 @@ static const char noauthmsg[] = "WWW-Authenticate: Basic realm=\"placebo\"\r\n" "\r\n"; -static const char proxymsg[] = -"HTTP/1.1 407 Proxy Authentication Required\r\n" -"Server: winetest\r\n" -"Proxy-Connection: close\r\n" -"Proxy-Authenticate: Basic realm=\"placebo\"\r\n" -"\r\n"; - struct server_info { HANDLE event;

1 0

Thomas Faber : dsound: Do not call CoUninitialize if CoInitialize failed.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 78b96c8776e05b6becd574cf9a44178bd2cb2388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b96c8776e05b6becd574cf9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 12:41:23 2014 +0200 dsound: Do not call CoUninitialize if CoInitialize failed. --- dlls/dsound/dsound_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 7a16366..0e3a313 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -178,7 +178,8 @@ static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)devenum); if(FAILED(hr)){ - CoUninitialize(); + if(SUCCEEDED(init_hr)) + CoUninitialize(); *devenum = NULL; ERR("CoCreateInstance failed: %08x\n", hr); return hr;

1 0

Thomas Faber : amstream: Destroy BaseFilter after MediaStreamFilterImpl child class.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: cc45c1373c493eca4cea535119ccfd50a1442e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc45c1373c493eca4cea53511… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jul 22 15:19:44 2014 +0200 amstream: Destroy BaseFilter after MediaStreamFilterImpl child class. --- dlls/amstream/mediastreamfilter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 8811455..8c26c8e 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -238,7 +238,7 @@ static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->(): new ref = %u\n", iface, ref); @@ -250,6 +250,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) IMediaStream_Release(This->streams[i]); IPin_Release(This->pins[i]); } + BaseFilter_Destroy(&This->filter); HeapFree(GetProcessHeap(), 0, This); }

1 0

Bruno Jesus : rsaenh: Detect AES prototype provider correctly.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: d2793fe242ac65b4e41cc11e8012e6e6379831f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2793fe242ac65b4e41cc11e8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 26 17:41:58 2014 -0300 rsaenh: Detect AES prototype provider correctly. --- dlls/rsaenh/rsaenh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b4829f0..3ad28f9 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1286,7 +1286,8 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const pKeyContainer->dwPersonality = RSAENH_PERSONALITY_ENHANCED; } else if (!strcmp(pVTable->pszProvName, MS_DEF_RSA_SCHANNEL_PROV_A)) { pKeyContainer->dwPersonality = RSAENH_PERSONALITY_SCHANNEL; - } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A)) { + } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A) || + !strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_XP_A)) { pKeyContainer->dwPersonality = RSAENH_PERSONALITY_AES; } else { pKeyContainer->dwPersonality = RSAENH_PERSONALITY_STRONG;

1 0

Thomas Faber : qcap: Destroy BaseOutputPin in VfwPin_Release.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: f0200b6d25c98b338b5814dec6eb4c9df5412982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0200b6d25c98b338b5814dec… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 01:34:55 2014 +0200 qcap: Destroy BaseOutputPin in VfwPin_Release. --- dlls/qcap/vfwcapture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 2cbf493..2551534 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -779,7 +779,7 @@ VfwPin_Release(IPin * iface) if (!refCount) { - CoTaskMemFree(This); + BaseOutputPin_Destroy(&This->pin); ObjectRefCount(FALSE); } return refCount;

1 0