May 2016 - Wine-commits - list.winehq.org

Hans Leidekker : webservices: Implement WsReadElement.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: ec0cae49d2746eacf6a5ef4d5d23fa81905d32c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0cae49d2746eacf6a5ef4d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 18 13:51:21 2016 +0200 webservices: Implement WsReadElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 18 ++++++++++++++++++ dlls/webservices/tests/reader.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 3 +++ 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9337f19..c79f8cc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3598,6 +3598,24 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY } /************************************************************************** + * WsReadElement [webservices.@] + */ +HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTION *desc, + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !desc || !value) return E_INVALIDARG; + + return read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->elementLocalName, + desc->elementNs, desc->typeDescription, option, heap, value, size ); +} + +/************************************************************************** * WsSetErrorProperty [webservices.@] */ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index bc200e2..4430a76 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3271,6 +3271,43 @@ static void test_double(void) WsFreeHeap( heap ); } +static void test_WsReadElement(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + HRESULT hr; + WS_XML_READER *reader; + WS_ELEMENT_DESCRIPTION desc; + UINT32 val; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + desc.elementLocalName = &localname; + desc.elementNs = &ns; + desc.type = WS_UINT32_TYPE; + desc.typeDescription = NULL; + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadElement( NULL, &desc, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadElement( reader, NULL, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadElement( reader, &desc, WS_READ_REQUIRED_VALUE, NULL, NULL, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + val = 0xdeadbeef; + hr = WsReadElement( reader, &desc, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == 1, "got %u\n", val ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -3300,4 +3337,5 @@ START_TEST(reader) test_WsDateTimeToFileTime(); test_WsFileTimeToDateTime(); test_double(); + test_WsReadElement(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6ff4718..9b58d99 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -107,7 +107,7 @@ @ stub WsReadBytes @ stub WsReadChars @ stub WsReadCharsUtf8 -@ stub WsReadElement +@ stdcall WsReadElement(ptr ptr long ptr ptr long ptr) @ stdcall WsReadEndAttribute(ptr ptr) @ stdcall WsReadEndElement(ptr ptr) @ stub WsReadEndpointAddressExtension diff --git a/include/webservices.h b/include/webservices.h index a55072f..62e1182 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1069,6 +1069,8 @@ HRESULT WINAPI WsOpenServiceProxy(WS_SERVICE_PROXY*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReadElement(WS_XML_READER*, const WS_ELEMENT_DESCRIPTION*, WS_READ_OPTION, + WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadEndAttribute(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadEndElement(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadNode(WS_XML_READER*, WS_ERROR*); @@ -1078,6 +1080,7 @@ HRESULT WINAPI WsReadToStartElement(WS_XML_READER*, const WS_XML_STRING*, const BOOL*, WS_ERROR*); HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); HRESULT WINAPI WsSendMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsReadValue.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 177d8d781f61cd3f6895a05fec51b3dcb71f2b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177d8d781f61cd3f6895a05fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 18 13:51:22 2016 +0200 webservices: Implement WsReadValue. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 18 ++++++++++++ dlls/webservices/tests/reader.c | 52 ++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 2 +- 5 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c79f8cc..56fa28c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3616,6 +3616,24 @@ HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTIO } /************************************************************************** + * WsReadValue [webservices.@] + */ +HRESULT WINAPI WsReadValue( WS_XML_READER *handle, WS_VALUE_TYPE value_type, void *value, ULONG size, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + WS_TYPE type = map_value_type( value_type ); + + TRACE( "%p %u %p %u %p\n", handle, type, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !value || type == ~0u) return E_INVALIDARG; + + return read_type( reader, WS_ELEMENT_TYPE_MAPPING, type, NULL, NULL, NULL, WS_READ_REQUIRED_VALUE, + NULL, value, size ); +} + +/************************************************************************** * WsSetErrorProperty [webservices.@] */ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4430a76..1e167c3 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3308,6 +3308,57 @@ static void test_WsReadElement(void) WsFreeReader( reader ); } +static void test_WsReadValue(void) +{ + HRESULT hr; + WS_XML_READER *reader; + UINT32 val; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadValue( NULL, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadValue( reader, WS_UINT32_TYPE, NULL, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* reader must be positioned correctly */ + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + val = 0xdeadbeef; + hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == 1, "got %u\n", val ); + + prepare_struct_type_test( reader, "<u t='1'></u>" ); + hr = WsReadToStartElement( reader, NULL, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadValue( reader, WS_UINT32_TYPE, &val, sizeof(val), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -3338,4 +3389,5 @@ START_TEST(reader) test_WsFileTimeToDateTime(); test_double(); test_WsReadElement(); + test_WsReadValue(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 9b58d99..22cfe95 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -122,7 +122,7 @@ @ stdcall WsReadStartElement(ptr ptr) @ stdcall WsReadToStartElement(ptr ptr ptr ptr ptr) @ stdcall WsReadType(ptr long long ptr long ptr ptr long ptr) -@ stub WsReadValue +@ stdcall WsReadValue(ptr long ptr long ptr) @ stub WsReadXmlBuffer @ stub WsReadXmlBufferFromBytes @ stub WsReceiveMessage diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index c33038d..363f164 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -32,6 +32,7 @@ WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; +WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index a6ecf24..20e17d0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1559,7 +1559,7 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T return hr; } -static WS_TYPE map_value_type( WS_VALUE_TYPE type ) +WS_TYPE map_value_type( WS_VALUE_TYPE type ) { switch (type) {

1 0

Frédéric Delanoy : msvcp90: Fix a typo in an FIXME message.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 58e95f72218fa018739c484f172bc236e685d5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e95f72218fa018739c484f1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 12:10:31 2016 +0200 msvcp90: Fix a typo in an FIXME message. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a41d357..81a5fbb 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -471,7 +471,7 @@ typedef struct int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) { if(flags & ~MTX_MULTI_LOCK) - FIXME("unknown flags ignorred: %x\n", flags); + FIXME("unknown flags ignored: %x\n", flags); *mtx = MSVCRT_operator_new(sizeof(**mtx)); (*mtx)->flags = flags;

1 0

Nikolay Sivov : dwrite/tests: Simplify refcount check a bit.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: a3e3dfcef2cd21362169a58e72e49ef4061a66f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e3dfcef2cd21362169a58e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:46 2016 +0300 dwrite/tests: Simplify refcount check a bit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 13d27da..54056c7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -225,9 +225,10 @@ static void get_script_analysis(const WCHAR *str, UINT32 len, DWRITE_SCRIPT_ANAL #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } enum drawcall_modifiers_kind {

1 0

Nikolay Sivov : msxml3/tests: Simplify refcount checks.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 11a01849e81cd0118ee792c6db935b365006dfaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a01849e81cd0118ee792c6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:59 2016 +0300 msxml3/tests: Simplify refcount checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 7 ++++--- dlls/msxml3/tests/saxreader.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index f228b41..b50b153 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -43,9 +43,10 @@ #define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } DEFINE_GUID(SID_SContainerDispatch, 0xb722be00, 0x4e68, 0x101b, 0xa2, 0xbc, 0x00, 0xaa, 0x00, 0x40, 0x47, 0x70); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index a2dc3fb..5fc62b7 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -43,9 +43,10 @@ static const WCHAR emptyW[] = {0}; #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } static LONG get_refcount(void *iface)

1 0

Nikolay Sivov : oledb32/tests: Simplify recount check.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: dc8f504b51663770cbf2d8ea5246762bd005bfce URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8f504b51663770cbf2d8ea5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:22:12 2016 +0300 oledb32/tests: Simplify recount check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/database.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 483454e..fdf4220 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -42,9 +42,10 @@ static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e' #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } static void test_GetDataSource(WCHAR *initstring)

1 0

Nikolay Sivov : dwrite/tests: Remove unused functions (Clang).
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 474033a4b8ea5eba7fecdc2739bd62857e6ae930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474033a4b8ea5eba7fecdc273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:22:32 2016 +0300 dwrite/tests: Remove unused functions (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 9 +-------- dlls/dwrite/tests/layout.c | 7 ------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index ea09bd5..90d7f6f 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -114,13 +114,6 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index call_seq->count = call_seq->size = 0; } -static inline void flush_sequences(struct call_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); -} - static void init_call_sequences(struct call_sequence **seq, int n) { int i; @@ -902,7 +895,7 @@ static void init_expected_sa(struct call_sequence **seq, const struct sa_test *t static const struct call_entry end_of_sequence = { LastKind }; int i; - flush_sequence(seq, 0); + flush_sequence(seq, ANALYZER_ID); /* add expected calls */ for (i = 0; i < test->item_count; i++) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 54056c7..9b9af6c 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -321,13 +321,6 @@ static inline void flush_sequence(struct drawcall_sequence **seg, int sequence_i call_seq->count = call_seq->size = 0; } -static inline void flush_sequences(struct drawcall_sequence **seq, int n) -{ - int i; - for (i = 0; i < n; i++) - flush_sequence(seq, i); -} - static void init_call_sequences(struct drawcall_sequence **seq, int n) { int i;

1 0

Maarten Lankhorst : dsound: Prevent reopening device from leaving dsound object in invalid state.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 2fb97be1871a78ea6a2889ed975d33515d5468ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb97be1871a78ea6a2889ed9… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Tue May 17 13:40:33 2016 -0500 dsound: Prevent reopening device from leaving dsound object in invalid state. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 49 +++---- dlls/dsound/dsound_private.h | 3 - dlls/dsound/primary.c | 331 ++++++++++++++++++++----------------------- 3 files changed, 174 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fb97be1871a78ea6a288…

1 0

Maarten Lankhorst : dsound: Remove state machine from render buffer.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 5b0914ece97b0732796313588f69ce1085664498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0914ece97b0732796313588… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Tue May 17 13:40:51 2016 -0500 dsound: Remove state machine from render buffer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 2 +- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 36 +------------------------ dlls/dsound/primary.c | 64 ++++---------------------------------------- 4 files changed, 8 insertions(+), 96 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 195da0b..7519951 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -135,7 +135,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->ref = 1; device->priolevel = DSSCL_NORMAL; - device->state = STATE_STOPPED; + device->stopped = 1; device->speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); DSOUND_ParseSpeakerConfig(device); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 3da0c19..0ca8aec 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -76,7 +76,7 @@ struct DirectSoundDevice DWORD priolevel, sleeptime; PWAVEFORMATEX pwfx, primary_pwfx; LPBYTE buffer; - DWORD writelead, buflen, aclen, fraglen, state, playpos, pad; + DWORD writelead, buflen, aclen, fraglen, playpos, pad, stopped; int nrofbuffers; IDirectSoundBufferImpl** buffers; RTL_RWLOCK buffer_list_lock; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 4ca0af1..727ceb8 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -694,10 +694,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) * also wipe out just-played sound data */ if (!pad) WARN("Probable buffer underrun\n"); - else if (device->state == STATE_STOPPED || - device->state == STATE_STARTING) { - TRACE("Buffer restarting\n"); - } hr = IAudioRenderClient_GetBuffer(device->render, maxq / block, (void*)&buffer); if(FAILED(hr)){ @@ -724,23 +720,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) ERR("ReleaseBuffer failed: %08x\n", hr); device->pad += maxq; - - if (maxq) { - if (device->state == STATE_STARTING || - device->state == STATE_STOPPED) { - if(DSOUND_PrimaryPlay(device) != DS_OK) - WARN("DSOUND_PrimaryPlay failed\n"); - else if (device->state == STATE_STARTING) - device->state = STATE_PLAYING; - else - device->state = STATE_STOPPING; - } - } else if (!pad && !maxq && (all_stopped == TRUE) && - (device->state == STATE_STOPPING)) { - device->state = STATE_STOPPED; - DSOUND_PrimaryStop(device); - } - } else if (device->state != STATE_STOPPED) { + } else if (!device->stopped) { if (maxq > device->buflen) maxq = device->buflen; if (writepos + maxq > device->buflen) { @@ -748,20 +728,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) DSOUND_WaveQueue(device, device->buffer, writepos + maxq - device->buflen); } else DSOUND_WaveQueue(device, device->buffer + writepos, maxq); - - /* in the DSSCL_WRITEPRIMARY mode, the app is totally in charge... */ - if (device->state == STATE_STARTING) { - if (DSOUND_PrimaryPlay(device) != DS_OK) - WARN("DSOUND_PrimaryPlay failed\n"); - else - device->state = STATE_PLAYING; - } - else if (device->state == STATE_STOPPING) { - if (DSOUND_PrimaryStop(device) != DS_OK) - WARN("DSOUND_PrimaryStop failed\n"); - else - device->state = STATE_STOPPED; - } } LeaveCriticalSection(&(device->mixlock)); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 72c9475..0dc16f0 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -272,11 +272,6 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, HeapFree(GetProcessHeap(), 0, device->pwfx); device->pwfx = wfx; - if (device->state == STATE_PLAYING) - device->state = STATE_STARTING; - else if (device->state == STATE_STOPPING) - device->state = STATE_STOPPED; - device->writelead = (wfx->nSamplesPerSec / 100) * wfx->nBlockAlign; TRACE("buflen: %u, fraglen: %u\n", device->buflen, device->fraglen); @@ -384,7 +379,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return S_OK; err_service: - ERR("GetService failed: %08x\n", hres); + WARN("GetService failed: %08x\n", hres); err: device->speaker_config = oldspeakerconfig; DSOUND_ParseSpeakerConfig(device); @@ -421,36 +416,6 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) return DS_OK; } -HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) -{ - HRESULT hr; - - TRACE("(%p)\n", device); - - hr = IAudioClient_Start(device->client); - if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ - WARN("Start failed: %08x\n", hr); - return hr; - } - - return DS_OK; -} - -HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) -{ - HRESULT hr; - - TRACE("(%p)\n", device); - - hr = IAudioClient_Stop(device->client); - if(FAILED(hr)){ - WARN("Stop failed: %08x\n", hr); - return hr; - } - - return DS_OK; -} - WAVEFORMATEX *DSOUND_CopyFormat(const WAVEFORMATEX *wfex) { WAVEFORMATEX *pwfx; @@ -698,16 +663,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer *iface, DWORD re return DSERR_INVALIDPARAM; } - /* **** */ - EnterCriticalSection(&(device->mixlock)); - - if (device->state == STATE_STOPPED) - device->state = STATE_STARTING; - else if (device->state == STATE_STOPPING) - device->state = STATE_PLAYING; - - LeaveCriticalSection(&(device->mixlock)); - /* **** */ + device->stopped = 0; return DS_OK; } @@ -718,16 +674,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Stop(IDirectSoundBuffer *iface) DirectSoundDevice *device = This->device; TRACE("(%p)\n", iface); - /* **** */ - EnterCriticalSection(&(device->mixlock)); - - if (device->state == STATE_PLAYING) - device->state = STATE_STOPPING; - else if (device->state == STATE_STARTING) - device->state = STATE_STOPPED; - - LeaveCriticalSection(&(device->mixlock)); - /* **** */ + device->stopped = 1; return DS_OK; } @@ -795,7 +742,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *i *playpos = mixpos; if (writepos) { *writepos = mixpos; - if (device->state != STATE_STOPPED) { + if (!device->stopped) { /* apply the documented 10ms lead to writepos */ *writepos += device->writelead; *writepos %= device->buflen; @@ -821,8 +768,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer *iface, DWO } *status = 0; - if ((device->state == STATE_STARTING) || - (device->state == STATE_PLAYING)) + if (!device->stopped) *status |= DSBSTATUS_PLAYING | DSBSTATUS_LOOPING; TRACE("status=%x\n", *status);

1 0

Maarten Lankhorst : dsound: Remove unconditional memory allocation in mixing thread.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: db316c124365ef73c03e6c8cb3e79a20c72ba856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db316c124365ef73c03e6c8cb… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Tue May 17 13:41:04 2016 -0500 dsound: Remove unconditional memory allocation in mixing thread. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 1 + dlls/dsound/dsound_private.h | 4 ++-- dlls/dsound/mixer.c | 24 ++++++++++++++++-------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7519951..fb9fd66 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -234,6 +234,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioStreamVolume_Release(device->volume); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); + HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer); RtlDeleteResource(&device->buffer_list_lock); device->mixlock.DebugInfo->Spare[0] = 0; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 0ca8aec..d063046 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -87,8 +87,8 @@ struct DirectSoundDevice int speaker_num[DS_MAX_CHANNELS]; int num_speakers; int lfe_channel; - float *tmp_buffer; - DWORD tmp_buffer_len; + float *tmp_buffer, *cp_buffer; + DWORD tmp_buffer_len, cp_buffer_len; DSVOLUMEPAN volpan; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 727ceb8..217d4ce 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -292,18 +292,29 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * UINT fir_cachesize = (fir_len + dsbfirstep - 2) / dsbfirstep; UINT required_input = max_ipos + fir_cachesize; + float *intermediate, *fir_copy, *itmp; + + DWORD len = required_input * channels; + len += fir_cachesize; + len *= sizeof(float); + + if (!dsb->device->cp_buffer) { + dsb->device->cp_buffer = HeapAlloc(GetProcessHeap(), 0, len); + dsb->device->cp_buffer_len = len; + } else if (len > dsb->device->cp_buffer_len) { + dsb->device->cp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->cp_buffer, len); + dsb->device->cp_buffer_len = len; + } - float* intermediate = HeapAlloc(GetProcessHeap(), 0, - sizeof(float) * required_input * channels); + fir_copy = dsb->device->cp_buffer; + intermediate = fir_copy + fir_cachesize; - float* fir_copy = HeapAlloc(GetProcessHeap(), 0, - sizeof(float) * fir_cachesize); /* Important: this buffer MUST be non-interleaved * if you want -msse3 to have any effect. * This is good for CPU cache effects, too. */ - float* itmp = intermediate; + itmp = intermediate; for (channel = 0; channel < channels; channel++) for (i = 0; i < required_input; i++) *(itmp++) = get_current_sample(dsb, @@ -338,9 +349,6 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * *freqAccNum = freqAcc_end % dsb->freqAdjustDen; - HeapFree(GetProcessHeap(), 0, fir_copy); - HeapFree(GetProcessHeap(), 0, intermediate); - return max_ipos; }

1 0