November 2012 - Wine-commits

Dmitry Timoshkov : windowscodecs: Reimplement GetFrameCount of the ICO decoder.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 075d28d8570341060af65e0fb3b218efe8399da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=075d28d8570341060af65e0fb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:48:28 2012 +0800 windowscodecs: Reimplement GetFrameCount of the ICO decoder. --- dlls/windowscodecs/icoformat.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 6b454c2..6606341 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -603,12 +603,14 @@ static HRESULT WINAPI IcoDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { IcoDecoder *This = impl_from_IWICBitmapDecoder(iface); - TRACE("(%p,%p)\n", iface, pCount); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!pCount) return E_INVALIDARG; - *pCount = This->header.idCount; - TRACE("<-- %u\n", *pCount); + EnterCriticalSection(&This->lock); + *pCount = This->initialized ? This->header.idCount : 0; + LeaveCriticalSection(&This->lock); + + TRACE("(%p) <-- %d\n", iface, *pCount); return S_OK; }

1 0

Dmitry Timoshkov : windowscodecs: Implement QueryCapability of the JPEG decoder.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 67eafab883e9a9c5c22aa990806d35154d4e9dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=67eafab883e9a9c5c22aa9908… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:49:23 2012 +0800 windowscodecs: Implement QueryCapability of the JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index e9c722e..57f1b55 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -220,11 +220,22 @@ static ULONG WINAPI JpegDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI JpegDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI JpegDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, stream, capability); + + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + + *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages; + /* FIXME: WICBitmapDecoderCapabilityCanEnumerateMetadata */ + return S_OK; } static void source_mgr_init_source(j_decompress_ptr cinfo)

1 0

Piotr Caban : msvcp100: Added basic_ostream::ends implementation.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: c15d625b5cdbc486471546eff78c2b4e78480764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15d625b5cdbc486471546eff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:30:52 2012 +0000 msvcp100: Added basic_ostream::ends implementation. --- dlls/msvcp100/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 12 ++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 608e9f5..1c55319 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -4498,6 +4498,16 @@ basic_ostream_char* __thiscall basic_ostream_char_print_bool(basic_ostream_char return this; } +/* ?ends(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z */ +/* ?ends(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z */ +basic_ostream_char* __cdecl basic_ostream_char_ends(basic_ostream_char *ostr) +{ + TRACE("(%p)\n", ostr); + + basic_ostream_char_put(ostr, 0); + return ostr; +} + /* ?endl(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z */ /* ?endl(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z */ basic_ostream_char* __cdecl basic_ostream_char_endl(basic_ostream_char *ostr) @@ -5314,6 +5324,18 @@ basic_ostream_wchar* __thiscall basic_ostream_short_print_bool(basic_ostream_wch basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); } +/* ?ends(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z */ +/* ?ends(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z */ +/* ?ends(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z */ +/* ?ends(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z */ +basic_ostream_wchar* __cdecl basic_ostream_wchar_ends(basic_ostream_wchar *ostr) +{ + TRACE("(%p)\n", ostr); + + basic_ostream_wchar_put(ostr, 0); + return ostr; +} + /* ?endl(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z */ /* ?endl(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z */ /* ?endl(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z */ diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 85e6107..0603fd4 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1630,12 +1630,12 @@ @ cdecl -arch=win64 ?endl(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_wchar_endl @ cdecl -arch=win32 ?endl(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z(ptr) basic_ostream_wchar_endl @ cdecl -arch=win64 ?endl(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_wchar_endl -@ stub -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z -@ stub -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z -@ stub -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z -@ stub -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z +@ cdecl -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AAV21@@Z(ptr) basic_ostream_char_ends +@ cdecl -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_char_ends +@ cdecl -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AAV21@@Z(ptr) basic_ostream_wchar_ends +@ cdecl -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_wchar_ends +@ cdecl -arch=win32 ?ends(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AAV21@@Z(ptr) basic_ostream_wchar_ends +@ cdecl -arch=win64 ?ends(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)AEAV21@@Z(ptr) basic_ostream_wchar_ends @ thiscall -arch=win32 ?eof(a)ios_base@std@@QBE_NXZ(ptr) ios_base_eof @ cdecl -arch=win64 ?eof(a)ios_base@std@@QEBA_NXZ(ptr) ios_base_eof @ thiscall -arch=win32 ?epptr@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEPADXZ(ptr) basic_streambuf_char_epptr

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: a62ea07a1561be687a4de01aca472a51cb5cb3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62ea07a1561be687a4de01ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:31:09 2012 +0000 msvcp: Sync implementations. --- dlls/msvcp60/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 8 ++++---- dlls/msvcp70/msvcp70.spec | 12 ++++++------ dlls/msvcp71/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 12 ++++++------ dlls/msvcp80/msvcp80.spec | 12 ++++++------ dlls/msvcp90/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++++------ 8 files changed, 94 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a62ea07a1561be687a4de…

1 0

Piotr Caban : msvcp60: Export locale classes destructors.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: a704d2a40c3a55543f767f7abe70b546430379af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a704d2a40c3a55543f767f7ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:31:42 2012 +0000 msvcp60: Export locale classes destructors. --- dlls/msvcp60/locale.c | 96 ++++++++++++++++++++++---------------------- dlls/msvcp60/msvcp60.spec | 48 +++++++++++----------- 2 files changed, 72 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a704d2a40c3a55543f767…

1 0

Piotr Caban : msvcp100: Added _Container_base0::operator= implementation.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: acbfab38dbe10c4c9600878235fe876615bf6533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbfab38dbe10c4c960087823… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:32:28 2012 +0000 msvcp100: Added _Container_base0::operator= implementation. --- dlls/msvcp100/misc.c | 30 ++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.c | 22 ---------------------- dlls/msvcp100/msvcp100.spec | 4 ++-- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp100/misc.c b/dlls/msvcp100/misc.c index 5854c5e..13183bb 100644 --- a/dlls/msvcp100/misc.c +++ b/dlls/msvcp100/misc.c @@ -229,3 +229,33 @@ MSVCP_new_handler_func __cdecl set_new_handler_reset(int unused) { return set_new_handler(NULL); } + +/* _Container_base0 is used by apps compiled without iterator checking + * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ). + * It provides empty versions of methods used by visual c++'s stl's + * iterator checking. + * msvcr100 has to provide them in case apps are compiled with /Od + * or the optimizer fails to inline those (empty) calls. + */ + +/* ?_Orphan_all(a)_Container_base0@std@@QAEXXZ */ +/* ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4) +void __thiscall Container_base0_Orphan_all(void *this) +{ +} + +/* ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z */ +/* ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z */ +DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8) +void __thiscall Container_base0_Swap_all(void *this, void *that) +{ +} + +/* ??4_Container_base0(a)std@@QAEAAU01(a)ABU01@@Z */ +/* ??4_Container_base0(a)std@@QEAAAEAU01(a)AEBU01@@Z */ +DEFINE_THISCALL_WRAPPER(Container_base0_op_assign, 8) +void* __thiscall Container_base0_op_assign(void *this, const void *that) +{ + return this; +} diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index 4238a24..c0f1ecd 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -80,28 +80,6 @@ static void init_cxx_funcs(void) } } -/* _Container_base0 is used by apps compiled without iterator checking - * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ). - * It provides empty versions of methods used by visual c++'s stl's - * iterator checking. - * msvcr100 has to provide them in case apps are compiled with /Od - * or the optimizer fails to inline those (empty) calls. - */ - -/* ?_Orphan_all(a)_Container_base0@std@@QAEXXZ */ -/* ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4) -void __thiscall Container_base0_Orphan_all(void *this) -{ -} - -/* ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z */ -/* ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z */ -DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8) -void __thiscall Container_base0_Swap_all(void *this, void *that) -{ -} - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 0603fd4..4ed384e 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -400,8 +400,8 @@ @ cdecl -arch=win64 ??4?$numeric_limits(a)_W@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) std_Num_base_op_assign @ thiscall -arch=win32 ??4Init(a)ios_base@std@@QAEAAV012(a)ABV012@@Z(ptr ptr) ios_base_Init_op_assign @ cdecl -arch=win64 ??4Init(a)ios_base@std@@QEAAAEAV012(a)AEBV012@@Z(ptr ptr) ios_base_Init_op_assign -@ stub -arch=win32 ??4_Container_base0(a)std@@QAEAAU01(a)ABU01@@Z -@ stub -arch=win64 ??4_Container_base0(a)std@@QEAAAEAU01(a)AEBU01@@Z +@ thiscall -arch=win32 ??4_Container_base0(a)std@@QAEAAU01(a)ABU01@@Z(ptr ptr) Container_base0_op_assign +@ cdecl -arch=win64 ??4_Container_base0(a)std@@QEAAAEAU01(a)AEBU01@@Z(ptr ptr) Container_base0_op_assign @ stub -arch=win32 ??4_Container_base12(a)std@@QAEAAU01(a)ABU01@@Z @ stub -arch=win64 ??4_Container_base12(a)std@@QEAAAEAU01(a)AEBU01@@Z @ stub -arch=win32 ??4_Init_locks(a)std@@QAEAAV01(a)ABV01@@Z

1 0

Piotr Caban : msvcp100: Added _Container_base12 class implementation.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: de8fe962c1e9c4a985741316486a38f4c8336271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8fe962c1e9c4a9857413164… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:33:03 2012 +0000 msvcp100: Added _Container_base12 class implementation. --- dlls/msvcp100/misc.c | 84 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 28 +++++++------- 2 files changed, 98 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp100/misc.c b/dlls/msvcp100/misc.c index 13183bb..55a19ee 100644 --- a/dlls/msvcp100/misc.c +++ b/dlls/msvcp100/misc.c @@ -28,6 +28,22 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +struct __Container_proxy; + +typedef struct { + struct __Container_proxy *proxy; +} _Container_base12; + +typedef struct __Iterator_base12 { + struct __Container_proxy *proxy; + struct __Iterator_base12 *next; +} _Iterator_base12; + +typedef struct __Container_proxy { + const _Container_base12 *cont; + _Iterator_base12 *head; +} _Container_proxy; + /* ??0_Mutex(a)std@@QAE(a)XZ */ /* ??0_Mutex(a)std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) @@ -259,3 +275,71 @@ void* __thiscall Container_base0_op_assign(void *this, const void *that) { return this; } + +/* ??0_Container_base12(a)std@@QAE(a)ABU01@@Z */ +/* ??0_Container_base12(a)std@@QEAA(a)AEBU01@@Z */ +DEFINE_THISCALL_WRAPPER(_Container_base12_copy_ctor, 8) +_Container_base12* __thiscall _Container_base12_copy_ctor( + _Container_base12 *this, _Container_base12 *that) +{ + this->proxy = NULL; + return this; +} + +/* ??0_Container_base12(a)std@@QAE(a)XZ */ +/* ??0_Container_base12(a)std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12_ctor, 4) +_Container_base12* __thiscall _Container_base12_ctor(_Container_base12 *this) +{ + this->proxy = NULL; + return this; +} + +/* ??1_Container_base12(a)std@@QAE(a)XZ */ +/* ??1_Container_base12(a)std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12_dtor, 4) +void __thiscall _Container_base12_dtor(_Container_base12 *this) +{ +} + +/* ??4_Container_base12(a)std@@QAEAAU01(a)ABU01@@Z */ +/* ??4_Container_base12(a)std@@QEAAAEAU01(a)AEBU01@@ */ +DEFINE_THISCALL_WRAPPER(_Container_base12_op_assign, 8) +_Container_base12* __thiscall _Container_base12_op_assign( + _Container_base12 *this, const _Container_base12 *that) +{ + return this; +} + +/* ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ */ +/* ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12__Getpfirst, 4) +_Iterator_base12** __thiscall _Container_base12__Getpfirst(_Container_base12 *this) +{ + return this->proxy ? &this->proxy->head : NULL; +} + +/* ?_Orphan_all(a)_Container_base12@std@@QAEXXZ */ +/* ?_Orphan_all(a)_Container_base12@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12__Orphan_all, 4) +void __thiscall _Container_base12__Orphan_all(_Container_base12 *this) +{ +} + +/* ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z */ +/* ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z */ +DEFINE_THISCALL_WRAPPER(_Container_base12__Swap_all, 8) +void __thiscall _Container_base12__Swap_all( + _Container_base12 *this, _Container_base12 *that) +{ + _Container_proxy *tmp; + + tmp = this->proxy; + this->proxy = that->proxy; + that->proxy = tmp; + + if(this->proxy) + this->proxy->cont = this; + if(that->proxy) + that->proxy->cont = that; +} diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 4ed384e..e4ac191 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -176,10 +176,10 @@ @ stub -arch=win64 ??0_Concurrent_queue_base_v4(a)details@Concurrency@@IEAA(a)_K@Z @ stub -arch=win32 ??0_Concurrent_queue_iterator_base_v4(a)details@Concurrency@@IAE(a)ABV_Concurrent_queue_base_v4@12@@Z @ stub -arch=win64 ??0_Concurrent_queue_iterator_base_v4(a)details@Concurrency@@IEAA(a)AEBV_Concurrent_queue_base_v4@12@@Z -@ stub -arch=win32 ??0_Container_base12(a)std@@QAE(a)ABU01@@Z -@ stub -arch=win64 ??0_Container_base12(a)std@@QEAA(a)AEBU01@@Z -@ stub -arch=win32 ??0_Container_base12(a)std@@QAE(a)XZ -@ stub -arch=win64 ??0_Container_base12(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??0_Container_base12(a)std@@QAE(a)ABU01@@Z(ptr ptr) _Container_base12_copy_ctor +@ cdecl -arch=win64 ??0_Container_base12(a)std@@QEAA(a)AEBU01@@Z(ptr ptr) _Container_base12_copy_ctor +@ thiscall -arch=win32 ??0_Container_base12(a)std@@QAE(a)XZ(ptr) _Container_base12_ctor +@ cdecl -arch=win64 ??0_Container_base12(a)std@@QEAA(a)XZ(ptr) _Container_base12_ctor @ stub -arch=win32 ??0_Init_locks(a)std@@QAE(a)XZ @ stub -arch=win64 ??0_Init_locks(a)std@@QEAA(a)XZ @ thiscall -arch=win32 ??0_Locimp(a)locale@std@@AAE(a)ABV012@@Z(ptr ptr) locale__Locimp_copy_ctor @@ -306,8 +306,8 @@ @ stub -arch=win64 ??1_Concurrent_queue_iterator_base_v4(a)details@Concurrency@@IEAA(a)XZ @ stub -arch=win32 ??1_Concurrent_vector_base_v4(a)details@Concurrency@@IAE(a)XZ @ stub -arch=win64 ??1_Concurrent_vector_base_v4(a)details@Concurrency@@IEAA(a)XZ -@ stub -arch=win32 ??1_Container_base12(a)std@@QAE(a)XZ -@ stub -arch=win64 ??1_Container_base12(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??1_Container_base12(a)std@@QAE(a)XZ(ptr) _Container_base12_dtor +@ cdecl -arch=win64 ??1_Container_base12(a)std@@QEAA(a)XZ(ptr) _Container_base12_dtor @ stub -arch=win32 ??1_Init_locks(a)std@@QAE(a)XZ @ stub -arch=win64 ??1_Init_locks(a)std@@QEAA(a)XZ @ thiscall -arch=win32 ??1_Locimp(a)locale@std@@MAE(a)XZ(ptr) locale__Locimp_dtor @@ -402,8 +402,8 @@ @ cdecl -arch=win64 ??4Init(a)ios_base@std@@QEAAAEAV012(a)AEBV012@@Z(ptr ptr) ios_base_Init_op_assign @ thiscall -arch=win32 ??4_Container_base0(a)std@@QAEAAU01(a)ABU01@@Z(ptr ptr) Container_base0_op_assign @ cdecl -arch=win64 ??4_Container_base0(a)std@@QEAAAEAU01(a)AEBU01@@Z(ptr ptr) Container_base0_op_assign -@ stub -arch=win32 ??4_Container_base12(a)std@@QAEAAU01(a)ABU01@@Z -@ stub -arch=win64 ??4_Container_base12(a)std@@QEAAAEAU01(a)AEBU01@@Z +@ thiscall -arch=win32 ??4_Container_base12(a)std@@QAEAAU01(a)ABU01@@Z(ptr ptr) _Container_base12_op_assign +@ cdecl -arch=win64 ??4_Container_base12(a)std@@QEAAAEAU01(a)AEBU01@@Z(ptr ptr) _Container_base12_op_assign @ stub -arch=win32 ??4_Init_locks(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4_Init_locks(a)std@@QEAAAEAV01(a)AEBV01@@Z @ thiscall -arch=win32 ??4_Num_base(a)std@@QAEAAU01(a)ABU01@@Z(ptr ptr) std_Num_base_op_assign @@ -897,8 +897,8 @@ @ cdecl -arch=win64 ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getmonths @ stub -arch=win32 ?_Getname(a)_Locinfo@std@@QBEPBDXZ @ stub -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ -@ stub -arch=win32 ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ -@ stub -arch=win64 ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ +@ thiscall -arch=win32 ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst +@ cdecl -arch=win64 ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst @ thiscall -arch=win32 ?_Getptr(a)_Timevec@std@@QBEPAXXZ(ptr) _Timevec__Getptr @ cdecl -arch=win64 ?_Getptr(a)_Timevec@std@@QEBAPEAXXZ(ptr) _Timevec__Getptr @ thiscall -arch=win32 ?_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ(ptr ptr) _Locinfo__Gettnames @@ -1125,8 +1125,8 @@ @ cdecl ?_Nomemory(a)std@@YAXXZ() _Nomemory @ thiscall -arch=win32 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all @ cdecl -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all -@ stub -arch=win32 ?_Orphan_all(a)_Container_base12@std@@QAEXXZ -@ stub -arch=win64 ?_Orphan_all(a)_Container_base12@std@@QEAAXXZ +@ thiscall -arch=win32 ?_Orphan_all(a)_Container_base12@std@@QAEXXZ(ptr) _Container_base12__Orphan_all +@ cdecl -arch=win64 ?_Orphan_all(a)_Container_base12@std@@QEAAXXZ(ptr) _Container_base12__Orphan_all @ thiscall -arch=win32 ?_Osfx@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_ostream_char__Osfx @ cdecl -arch=win64 ?_Osfx@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) basic_ostream_char__Osfx @ thiscall -arch=win32 ?_Osfx@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEXXZ(ptr) basic_ostream_wchar__Osfx @@ -1204,8 +1204,8 @@ @ cdecl -arch=win64 ?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z(ptr) locale__Setgloballocale @ thiscall -arch=win32 ?_Swap_all(a)_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ cdecl -arch=win64 ?_Swap_all(a)_Container_base0@std@@QEAAXAEAU12@@Z(ptr ptr) Container_base0_Swap_all -@ stub -arch=win32 ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z -@ stub -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z +@ thiscall -arch=win32 ?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z(ptr ptr) _Container_base12__Swap_all +@ cdecl -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync @ thiscall -arch=win32 ?_Tidy@?$_Yarn(a)D@std@@AAEXXZ(ptr) _Yarn_char__Tidy @ cdecl -arch=win64 ?_Tidy@?$_Yarn(a)D@std@@AEAAXXZ(ptr) _Yarn_char__Tidy

1 0

Piotr Caban : msvcp100: Added _Container_base12 class tests.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 642e9a1eda90f8011eb1f5d841874ab79c1cd718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=642e9a1eda90f8011eb1f5d84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:33:35 2012 +0000 msvcp100: Added _Container_base12 class tests. --- dlls/msvcp100/tests/Makefile.in | 1 + dlls/msvcp100/tests/misc.c | 194 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 195 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/tests/Makefile.in b/dlls/msvcp100/tests/Makefile.in index fe92d54..2bf01e0 100644 --- a/dlls/msvcp100/tests/Makefile.in +++ b/dlls/msvcp100/tests/Makefile.in @@ -4,6 +4,7 @@ MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt C_SRCS = \ + misc.c \ string.c @MAKE_TEST_RULES@ diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c new file mode 100644 index 0000000..89933d0 --- /dev/null +++ b/dlls/msvcp100/tests/misc.c @@ -0,0 +1,194 @@ +/* + * Copyright 2012 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +struct __Container_proxy; + +typedef struct { + struct __Container_proxy *proxy; +} _Container_base12; + +typedef struct __Iterator_base12 { + struct __Container_proxy *proxy; + struct __Iterator_base12 *next; +} _Iterator_base12; + +typedef struct __Container_proxy { + const _Container_base12 *cont; + _Iterator_base12 *head; +} _Container_proxy; + +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +static _Container_base12* (__thiscall *p__Container_base12_copy_ctor)(_Container_base12*, _Container_base12*); +static _Container_base12* (__thiscall *p__Container_base12_ctor)(_Container_base12*); +static void (__thiscall *p__Container_base12__Orphan_all)(_Container_base12*); +static void (__thiscall *p__Container_base12_dtor)(_Container_base12*); +static _Iterator_base12** (__thiscall *p__Container_base12__Getpfirst)(_Container_base12*); +static void (__thiscall *p__Container_base12__Swap_all)(_Container_base12*, _Container_base12*); + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static BOOL init(void) +{ + HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + if(!msvcp) { + win_skip("msvcp100.dll not installed\n"); + return FALSE; + } + + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p__Container_base12_copy_ctor, "??0_Container_base12(a)std@@QEAA(a)AEBU01@@Z"); + SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QEAA(a)XZ"); + SET(p__Container_base12__Orphan_all, "?_Orphan_all(a)_Container_base12@std@@QEAAXXZ"); + SET(p__Container_base12_dtor, "??1_Container_base12(a)std@@QEAA(a)XZ"); + SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ"); + SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z"); + }else { + SET(p__Container_base12_copy_ctor, "??0_Container_base12(a)std@@QAE(a)ABU01@@Z"); + SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QAE(a)XZ"); + SET(p__Container_base12__Orphan_all, "?_Orphan_all(a)_Container_base12@std@@QAEXXZ"); + SET(p__Container_base12_dtor, "??1_Container_base12(a)std@@QAE(a)XZ"); + SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ"); + SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z"); + } + + init_thiscall_thunk(); + return TRUE; +} + +static void test__Container_base12(void) +{ + _Container_base12 c1, c2; + _Iterator_base12 i1, i2, **pi; + _Container_proxy p1, p2; + + call_func1(p__Container_base12_ctor, &c1); + ok(c1.proxy == NULL, "c1.proxy != NULL\n"); + + p1.cont = NULL; + p1.head = NULL; + c1.proxy = &p1; + call_func2(p__Container_base12_copy_ctor, &c2, &c1); + ok(c1.proxy == &p1, "c1.proxy = %p, expected %p\n", c1.proxy, &p1); + ok(c2.proxy == NULL, "c2.proxy != NULL\n"); + + p1.head = &i1; + i1.proxy = &p1; + i1.next = &i2; + i2.proxy = &p1; + i2.next = NULL; + pi = call_func1(p__Container_base12__Getpfirst, &c1); + ok(pi == &p1.head, "pi = %p, expected %p\n", pi, &p1.head); + pi = call_func1(p__Container_base12__Getpfirst, &c2); + ok(pi == NULL, "pi != NULL\n"); + + p1.cont = &c1; + call_func1(p__Container_base12_dtor, &c1); + ok(p1.cont == &c1, "p1.cont = %p, expected %p\n", p1.cont, &c1); + ok(p1.head == &i1, "p1.head = %p, expected %p\n", p1.head, &i1); + ok(i1.proxy == &p1, "i1.proxy = %p, expected %p\n", i1.proxy, &p1); + ok(i1.next == &i2, "i1.next = %p, expected %p\n", i1.next, &i2); + ok(i2.proxy == &p1, "i2.proxy = %p, expected %p\n", i2.proxy, &p1); + ok(i2.next == NULL, "i2.next != NULL\n"); + + call_func1(p__Container_base12__Orphan_all, &c1); + ok(p1.cont == &c1, "p1.cont = %p, expected %p\n", p1.cont, &c1); + ok(p1.head == &i1, "p1.head = %p, expected %p\n", p1.head, &i1); + ok(i1.proxy == &p1, "i1.proxy = %p, expected %p\n", i1.proxy, &p1); + ok(i1.next == &i2, "i1.next = %p, expected %p\n", i1.next, &i2); + ok(i2.proxy == &p1, "i2.proxy = %p, expected %p\n", i2.proxy, &p1); + ok(i2.next == NULL, "i2.next != NULL\n"); + + c2.proxy = NULL; + call_func2(p__Container_base12__Swap_all, &c1, &c2); + ok(c1.proxy == NULL, "c1.proxy != NULL\n"); + ok(c2.proxy == &p1, "c2.proxy = %p, expected %p\n", c2.proxy, &p2); + ok(p1.cont == &c2, "p1.cont = %p, expected %p\n", p1.cont, &c2); + + c1.proxy = &p2; + p2.cont = (void*)0xdeadbeef; + p2.head = (void*)0xdeadbeef; + p1.head = &i1; + call_func2(p__Container_base12__Swap_all, &c1, &c2); + ok(c1.proxy == &p1, "c1.proxt = %p, expected %p\n", c1.proxy, &p1); + ok(p1.cont == &c1, "p1.cont = %p, expected %p\n", p1.cont, &c1); + ok(p1.head == &i1, "p1.head = %p, expected %p\n", p1.head, &i1); + ok(c2.proxy == &p2, "c2.proxy = %p, expected %p\n", c2.proxy, &p2); + ok(p2.cont == &c2, "p2.cont = %p, expected %p\n", p2.cont, &c2); + ok(p2.head == (void*)0xdeadbeef, "p2.head = %p, expected 0xdeadbeef\n", p2.head); +} + +START_TEST(misc) +{ + if(!init()) + return; + + test__Container_base12(); +}

1 0

Maarten Lankhorst : dsound: Set dwChannelMask when limiting channels.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 79084be3c176e169d4f45391a7a566867c9c8f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=79084be3c176e169d4f45391a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 26 17:02:06 2012 +0100 dsound: Set dwChannelMask when limiting channels. --- dlls/dsound/primary.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index bf76dec..bc72d78 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -80,6 +80,7 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client mixwfe->Format.nChannels = 2; mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8; mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign; + mixwfe->dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; } if (!IsEqualGUID(&mixwfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) {

1 0

Nikolay Sivov : msxml3: Move document loading from stream to a separate function.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: b296b08a5c383a1f80484e49e1821f1f96d9119a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b296b08a5c383a1f80484e49e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 23:07:24 2012 -0500 msxml3: Move document loading from stream to a separate function. --- dlls/msxml3/domdoc.c | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d1e0ebb..16fc64c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -718,46 +718,45 @@ static HRESULT WINAPI PersistStreamInit_IsDirty( return S_FALSE; } -static HRESULT WINAPI PersistStreamInit_Load( - IPersistStreamInit *iface, LPSTREAM pStm) +static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream) { - domdoc *This = impl_from_IPersistStreamInit(iface); - HRESULT hr; - HGLOBAL hglobal; DWORD read, written, len; + xmlDocPtr xmldoc = NULL; + HGLOBAL hglobal; BYTE buf[4096]; + HRESULT hr; char *ptr; - xmlDocPtr xmldoc = NULL; - - TRACE("(%p)->(%p)\n", This, pStm); - if (!pStm) - return E_INVALIDARG; + if (doc->stream) + { + IStream_Release(doc->stream); + doc->stream = NULL; + } - hr = CreateStreamOnHGlobal(NULL, TRUE, &This->stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &doc->stream); if (FAILED(hr)) return hr; do { - IStream_Read(pStm, buf, sizeof(buf), &read); - hr = IStream_Write(This->stream, buf, read, &written); + ISequentialStream_Read(stream, buf, sizeof(buf), &read); + hr = IStream_Write(doc->stream, buf, read, &written); } while(SUCCEEDED(hr) && written != 0 && read != 0); if (FAILED(hr)) { - ERR("Failed to copy stream\n"); + ERR("failed to copy stream 0x%08x\n", hr); return hr; } - hr = GetHGlobalFromStream(This->stream, &hglobal); + hr = GetHGlobalFromStream(doc->stream, &hglobal); if (FAILED(hr)) return hr; len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); - if (len != 0) - xmldoc = doparse(This, ptr, len, XML_CHAR_ENCODING_NONE); + if (len) + xmldoc = doparse(doc, ptr, len, XML_CHAR_ENCODING_NONE); GlobalUnlock(hglobal); if (!xmldoc) @@ -768,7 +767,19 @@ static HRESULT WINAPI PersistStreamInit_Load( xmldoc->_private = create_priv(); - return attach_xmldoc(This, xmldoc); + return attach_xmldoc(doc, xmldoc); +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *stream) +{ + domdoc *This = impl_from_IPersistStreamInit(iface); + + TRACE("(%p)->(%p)\n", This, stream); + + if (!stream) + return E_INVALIDARG; + + return domdoc_load_from_stream(This, (ISequentialStream*)stream); } static HRESULT WINAPI PersistStreamInit_Save( @@ -2140,7 +2151,7 @@ static HRESULT WINAPI domdoc_load( else { /* ISequentialStream */ - FIXME("Unknown type not supported (%d) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); + FIXME("Unknown type not supported (0x%08x) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); } break; default:

1 0