August 2023 - Wine-commits - list.winehq.org

Rémi Bernon : mfplat/tests: Test that BeginRead doesn't use MFASYNC_CALLBACK_QUEUE_STANDARD.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 94cd65844640d7c201d6f60c343e3ccf18381b9b URL: https://gitlab.winehq.org/wine/wine/-/commit/94cd65844640d7c201d6f60c343e3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 8 15:49:16 2023 +0200 mfplat/tests: Test that BeginRead doesn't use MFASYNC_CALLBACK_QUEUE_STANDARD. --- dlls/mfplat/tests/mfplat.c | 254 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 0f4ae026228..9c73f71ca7e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -488,6 +488,7 @@ struct test_callback HANDLE event; DWORD param; IMFMediaEvent *media_event; + IMFAsyncResult *result; }; static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) @@ -535,6 +536,37 @@ static HRESULT WINAPI testcallback_GetParameters(IMFAsyncCallback *iface, DWORD return E_NOTIMPL; } +static HRESULT WINAPI test_async_callback_result_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + + callback->result = result; + IMFAsyncResult_AddRef(callback->result); + SetEvent(callback->event); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl test_async_callback_result_vtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + test_async_callback_result_Invoke, +}; + +static DWORD wait_async_callback_result(IMFAsyncCallback *iface, DWORD timeout, IMFAsyncResult **result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + DWORD res = WaitForSingleObject(callback->event, timeout); + + *result = callback->result; + callback->result = NULL; + + return res; +} + static BOOL check_clsid(CLSID *clsids, UINT32 count) { int i; @@ -2129,15 +2161,191 @@ static void test_attributes(void) IMFAttributes_Release(attributes1); } +struct test_stream +{ + IStream IStream_iface; + LONG refcount; + + HANDLE read_event; + HANDLE done_event; +}; + +static struct test_stream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, struct test_stream, IStream_iface); +} + +static HRESULT WINAPI test_stream_QueryInterface(IStream *iface, REFIID iid, void **out) +{ + if (IsEqualIID(iid, &IID_IUnknown) + || IsEqualIID(iid, &IID_IStream)) + { + *out = iface; + IStream_AddRef(iface); + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_stream_AddRef(IStream *iface) +{ + struct test_stream *stream = impl_from_IStream(iface); + return InterlockedIncrement(&stream->refcount); +} + +static ULONG WINAPI test_stream_Release(IStream *iface) +{ + struct test_stream *stream = impl_from_IStream(iface); + ULONG ref = InterlockedDecrement(&stream->refcount); + + if (!ref) + { + CloseHandle(stream->read_event); + CloseHandle(stream->done_event); + free(stream); + } + + return ref; +} + +static HRESULT WINAPI test_stream_Read(IStream *iface, void *data, ULONG size, ULONG *ret_size) +{ + struct test_stream *stream = impl_from_IStream(iface); + DWORD res; + + SetEvent(stream->read_event); + res = WaitForSingleObject(stream->done_event, 1000); + ok(res == 0, "got %#lx\n", res); + + *ret_size = size; + return S_OK; +} + +static HRESULT WINAPI test_stream_Write(IStream *iface, const void *data, ULONG size, ULONG *ret_size) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_Seek(IStream *iface, LARGE_INTEGER offset, DWORD method, ULARGE_INTEGER *ret_offset) +{ + return S_OK; +} + +static HRESULT WINAPI test_stream_SetSize(IStream *iface, ULARGE_INTEGER size) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGER size, + ULARGE_INTEGER *read_size, ULARGE_INTEGER *write_size) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_Commit(IStream *iface, DWORD flags) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_Revert(IStream *iface) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_LockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD type) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD type) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_stream_Stat(IStream *iface, STATSTG *stat, DWORD flags) +{ + memset(stat, 0, sizeof(STATSTG)); + stat->pwcsName = NULL; + stat->type = STGTY_STREAM; + stat->cbSize.QuadPart = 16; + return S_OK; +} + +static HRESULT WINAPI test_stream_Clone(IStream *iface, IStream **out) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl test_stream_vtbl = +{ + test_stream_QueryInterface, + test_stream_AddRef, + test_stream_Release, + test_stream_Read, + test_stream_Write, + test_stream_Seek, + test_stream_SetSize, + test_stream_CopyTo, + test_stream_Commit, + test_stream_Revert, + test_stream_LockRegion, + test_stream_UnlockRegion, + test_stream_Stat, + test_stream_Clone, +}; + +static HRESULT test_stream_create(IStream **out) +{ + struct test_stream *stream; + + if (!(stream = calloc(1, sizeof(*stream)))) + return E_OUTOFMEMORY; + + stream->IStream_iface.lpVtbl = &test_stream_vtbl; + stream->refcount = 1; + + stream->read_event = CreateEventW(NULL, FALSE, FALSE, NULL); + stream->done_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + *out = &stream->IStream_iface; + return S_OK; +} + +static DWORD test_stream_wait_read(IStream *iface, DWORD timeout) +{ + struct test_stream *stream = impl_from_IStream(iface); + return WaitForSingleObject(stream->read_event, timeout); +} + +static void test_stream_complete_read(IStream *iface) +{ + struct test_stream *stream = impl_from_IStream(iface); + SetEvent(stream->done_event); +} + static void test_MFCreateMFByteStreamOnStream(void) { + struct test_callback *read_callback, *test_callback; IMFByteStream *bytestream; IMFByteStream *bytestream2; IStream *stream; IMFAttributes *attributes = NULL; + IMFAsyncResult *result; DWORD caps, written; IUnknown *unknown; + BYTE buffer[16]; ULONG ref, size; + DWORD res, len; HRESULT hr; UINT count; QWORD to; @@ -2266,6 +2474,52 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFAttributes_Release(attributes); IMFByteStream_Release(bytestream); IStream_Release(stream); + + + /* test that BeginRead doesn't use MFASYNC_CALLBACK_QUEUE_STANDARD */ + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + read_callback = create_test_callback(&test_async_callback_result_vtbl); + test_callback = create_test_callback(&test_async_callback_result_vtbl); + + hr = test_stream_create(&stream); + ok(hr == S_OK, "got %#lx\n", hr); + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream); + ok(hr == S_OK, "got %#lx\n", hr); + + hr = IMFByteStream_BeginRead(bytestream, buffer, 1, &read_callback->IMFAsyncCallback_iface, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + + res = test_stream_wait_read(stream, 1000); + ok(res == 0, "got %#lx\n", res); + res = wait_async_callback_result(&read_callback->IMFAsyncCallback_iface, 10, &result); + ok(res == WAIT_TIMEOUT, "got %#lx\n", res); + + /* MFASYNC_CALLBACK_QUEUE_STANDARD is not blocked */ + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &test_callback->IMFAsyncCallback_iface, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + res = wait_async_callback_result(&test_callback->IMFAsyncCallback_iface, 100, &result); + todo_wine ok(res == 0, "got %#lx\n", res); + if (res == 0) IMFAsyncResult_Release(result); + + test_stream_complete_read(stream); + res = wait_async_callback_result(&read_callback->IMFAsyncCallback_iface, 1000, &result); + ok(res == 0, "got %#lx\n", res); + hr = IMFByteStream_EndRead(bytestream, result, &len); + ok(hr == S_OK, "got %#lx\n", hr); + ok(len == 1, "got %#lx\n", len); + IMFAsyncResult_Release(result); + + IMFByteStream_Release(bytestream); + IStream_Release(stream); + + IMFAsyncCallback_Release(&read_callback->IMFAsyncCallback_iface); + IMFAsyncCallback_Release(&test_callback->IMFAsyncCallback_iface); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); } static void test_file_stream(void)

1 0

Rémi Bernon : mfplat: Use MFASYNC_CALLBACK_QUEUE_IO for byte stream async requests.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: efbf28afa57fc7eca354e1184c8c07696a5b4072 URL: https://gitlab.winehq.org/wine/wine/-/commit/efbf28afa57fc7eca354e1184c8c07… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 27 17:49:08 2023 +0200 mfplat: Use MFASYNC_CALLBACK_QUEUE_IO for byte stream async requests. --- dlls/mfplat/main.c | 2 +- dlls/mfplat/tests/mfplat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8aaf9f93cdc..96ec23fba9b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3811,7 +3811,7 @@ static HRESULT bytestream_create_io_request(struct bytestream *stream, enum asyn &stream->write_callback, NULL, &request))) goto failed; - RtwqPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, 0, request); + RtwqPutWorkItem(MFASYNC_CALLBACK_QUEUE_IO, 0, request); IRtwqAsyncResult_Release(request); failed: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 9c73f71ca7e..f7ae614a109 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2501,8 +2501,8 @@ static void test_MFCreateMFByteStreamOnStream(void) hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &test_callback->IMFAsyncCallback_iface, NULL); ok(hr == S_OK, "got %#lx\n", hr); res = wait_async_callback_result(&test_callback->IMFAsyncCallback_iface, 100, &result); - todo_wine ok(res == 0, "got %#lx\n", res); - if (res == 0) IMFAsyncResult_Release(result); + ok(res == 0, "got %#lx\n", res); + IMFAsyncResult_Release(result); test_stream_complete_read(stream); res = wait_async_callback_result(&read_callback->IMFAsyncCallback_iface, 1000, &result);

1 0

Shaun Ren : sapi: Call CoInitializeEx/CoUninitialize in async_worker.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 679e3a9d003f2bb0d11e620171a048f23ac82fc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/679e3a9d003f2bb0d11e620171a048… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Aug 4 13:41:42 2023 -0400 sapi: Call CoInitializeEx/CoUninitialize in async_worker. --- dlls/sapi/async.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sapi/async.c b/dlls/sapi/async.c index b02778ae7ba..61b99019abe 100644 --- a/dlls/sapi/async.c +++ b/dlls/sapi/async.c @@ -71,6 +71,7 @@ static void CALLBACK async_worker(TP_CALLBACK_INSTANCE *instance, void *ctx) HANDLE handles[2] = { queue->cancel, queue->wait }; DWORD ret; + CoInitializeEx(NULL, COINIT_MULTITHREADED); SetEvent(queue->ready); for (;;) @@ -99,6 +100,7 @@ static void CALLBACK async_worker(TP_CALLBACK_INSTANCE *instance, void *ctx) cancel: async_empty_queue(queue); + CoUninitialize(); TRACE("cancelled.\n"); SetEvent(queue->ready); }

1 0

Shaun Ren : sapi: Start async queue in ISpVoice::SetOutput.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: cdc3eeb77638f925e2af1228f32255bcb4fd719f URL: https://gitlab.winehq.org/wine/wine/-/commit/cdc3eeb77638f925e2af1228f32255… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Aug 4 13:43:13 2023 -0400 sapi: Start async queue in ISpVoice::SetOutput. --- dlls/sapi/tts.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 4763ef9f324..b1c90627d5e 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -591,6 +591,9 @@ static HRESULT WINAPI spvoice_SetOutput(ISpVoice *iface, IUnknown *unk, BOOL all if (!allow_format_changes) FIXME("ignoring allow_format_changes = FALSE.\n"); + if (FAILED(hr = async_start_queue(&This->queue))) + return hr; + if (!unk) { /* TODO: Create the default SpAudioOut token here once SpMMAudioEnum is implemented. */

1 0

Shaun Ren : sapi/tests: Add test for implicit MTA initialized by SpVoice.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 738bbeb9b7d6be802119cb0d78735a1fbf023d0b URL: https://gitlab.winehq.org/wine/wine/-/commit/738bbeb9b7d6be802119cb0d78735a… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Aug 4 13:44:04 2023 -0400 sapi/tests: Add test for implicit MTA initialized by SpVoice. Based on a patch by Connor McAdams. --- dlls/sapi/tests/tts.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 39f62ac551e..eb0258bbef3 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -34,6 +34,46 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %ld, expected %ld.\n", rc, ref); } +#define APTTYPE_UNITIALIZED APTTYPE_CURRENT +static struct +{ + APTTYPE type; + APTTYPEQUALIFIER qualifier; +} test_apt_data; + +static DWORD WINAPI test_apt_thread(void *param) +{ + HRESULT hr; + + hr = CoGetApartmentType(&test_apt_data.type, &test_apt_data.qualifier); + if (hr == CO_E_NOTINITIALIZED) + { + test_apt_data.type = APTTYPE_UNITIALIZED; + test_apt_data.qualifier = 0; + } + + return 0; +} + +static void check_apttype(void) +{ + HANDLE thread; + MSG msg; + + memset(&test_apt_data, 0xde, sizeof(test_apt_data)); + + thread = CreateThread(NULL, 0, test_apt_thread, NULL, 0, NULL); + while (MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) != WAIT_OBJECT_0) + { + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + CloseHandle(thread); +} + static void test_interfaces(void) { ISpeechVoice *speech_voice, *speech_voice2; @@ -380,6 +420,7 @@ static void test_spvoice(void) static const WCHAR test_text[] = L"Hello! This is a test sentence."; ISpVoice *voice; + IUnknown *dummy; ISpMMSysAudio *audio_out; ISpObjectTokenCategory *token_cat; ISpObjectToken *token; @@ -397,23 +438,57 @@ static void test_spvoice(void) return; } + check_apttype(); + ok(test_apt_data.type == APTTYPE_UNITIALIZED, "got apt type %d.\n", test_apt_data.type); + hr = CoCreateInstance(&CLSID_SpVoice, NULL, CLSCTX_INPROC_SERVER, &IID_ISpVoice, (void **)&voice); ok(hr == S_OK, "Failed to create SpVoice: %#lx.\n", hr); - hr = ISpVoice_SetOutput(voice, NULL, TRUE); - ok(hr == S_OK, "got %#lx.\n", hr); + check_apttype(); + ok(test_apt_data.type == APTTYPE_UNITIALIZED, "got apt type %d.\n", test_apt_data.type); + + /* SpVoice initializes a MTA in SetOutput even if an invalid output object is given. */ + hr = CoCreateInstance(&CLSID_SpDataKey, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&dummy); + ok(hr == S_OK, "Failed to create dummy: %#lx.\n", hr); + + hr = ISpVoice_SetOutput(voice, dummy, TRUE); + ok(hr == E_INVALIDARG, "got %#lx.\n", hr); + + check_apttype(); + ok(test_apt_data.type == APTTYPE_MTA || broken(test_apt_data.type == APTTYPE_UNITIALIZED) /* w8, w10v1507 */, + "got apt type %d.\n", test_apt_data.type); + if (test_apt_data.type == APTTYPE_MTA) + ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "got apt type qualifier %d.\n", test_apt_data.qualifier); + else + win_skip("apt type is not MTA.\n"); + + IUnknown_Release(dummy); hr = CoCreateInstance(&CLSID_SpMMAudioOut, NULL, CLSCTX_INPROC_SERVER, &IID_ISpMMSysAudio, (void **)&audio_out); ok(hr == S_OK, "Failed to create SpMMAudioOut: %#lx.\n", hr); + hr = ISpVoice_SetOutput(voice, NULL, TRUE); + ok(hr == S_OK, "got %#lx.\n", hr); + hr = ISpVoice_SetOutput(voice, (IUnknown *)audio_out, TRUE); todo_wine ok(hr == S_FALSE, "got %#lx.\n", hr); hr = ISpVoice_SetVoice(voice, NULL); todo_wine ok(hr == S_OK, "got %#lx.\n", hr); + check_apttype(); + ok(test_apt_data.type == APTTYPE_MTA || broken(test_apt_data.type == APTTYPE_UNITIALIZED) /* w8, w10v1507 */, + "got apt type %d.\n", test_apt_data.type); + if (test_apt_data.type == APTTYPE_MTA) + ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "got apt type qualifier %d.\n", test_apt_data.qualifier); + else + win_skip("apt type is not MTA.\n"); + hr = ISpVoice_GetVoice(voice, &token); todo_wine ok(hr == S_OK, "got %#lx.\n", hr); @@ -517,6 +592,15 @@ static void test_spvoice(void) hr = ISpVoice_SetVoice(voice, token); ok(hr == S_OK, "got %#lx.\n", hr); + check_apttype(); + ok(test_apt_data.type == APTTYPE_MTA || broken(test_apt_data.type == APTTYPE_UNITIALIZED) /* w8, w10v1507 */, + "got apt type %d.\n", test_apt_data.type); + if (test_apt_data.type == APTTYPE_MTA) + ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "got apt type qualifier %d.\n", test_apt_data.qualifier); + else + win_skip("apt type is not MTA.\n"); + test_engine.speak_called = FALSE; hr = ISpVoice_Speak(voice, NULL, SPF_PURGEBEFORESPEAK, NULL); ok(hr == S_OK, "got %#lx.\n", hr); @@ -548,6 +632,11 @@ static void test_spvoice(void) ok(stream_num == 1, "got %lu.\n", stream_num); ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + check_apttype(); + ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type); + ok(test_apt_data.qualifier == APTTYPEQUALIFIER_IMPLICIT_MTA, + "got apt type qualifier %d.\n", test_apt_data.qualifier); + start = GetTickCount(); hr = ISpVoice_WaitUntilDone(voice, INFINITE); duration = GetTickCount() - start; @@ -602,7 +691,8 @@ done: START_TEST(tts) { CoInitialize(NULL); - test_interfaces(); + /* Run spvoice tests before interface tests so that a MTA won't be created before this test is run. */ test_spvoice(); + test_interfaces(); CoUninitialize(); }

1 0

Shaun Ren : sapi: Change ISpObjectToken::SetId FIXME to TRACE.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: b9dbe482eea774122d2293a3bb3bdb0f0e645a88 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9dbe482eea774122d2293a3bb3bdb… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Aug 4 13:51:17 2023 -0400 sapi: Change ISpObjectToken::SetId FIXME to TRACE. --- dlls/sapi/token.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index af98db02048..f599bdb6b14 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -1305,7 +1305,7 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, HKEY root, key; const WCHAR *subkey; - FIXME( "(%p)->(%s %s %d): semi-stub\n", This, debugstr_w( category_id ), + TRACE( "(%p)->(%s %s %d)\n", This, debugstr_w( category_id ), debugstr_w(token_id), create ); if (This->data_key) return SPERR_ALREADY_INITIALIZED;

1 0

Shaun Ren : sapi/tests: Increase timeout in tts test_spvoice.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: cff2e87e03ff045fbe1a3718a81574fe077ab189 URL: https://gitlab.winehq.org/wine/wine/-/commit/cff2e87e03ff045fbe1a3718a81574… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Aug 4 13:57:55 2023 -0400 sapi/tests: Increase timeout in tts test_spvoice. --- dlls/sapi/tests/tts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index eb0258bbef3..6912dc08e0d 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -630,7 +630,7 @@ static void test_spvoice(void) ok(test_engine.rate == 0, "got %ld.\n", test_engine.rate); ok(test_engine.volume == 100, "got %d.\n", test_engine.volume); ok(stream_num == 1, "got %lu.\n", stream_num); - ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + ok(duration > 800 && duration < 3500, "took %lu ms.\n", duration); check_apttype(); ok(test_apt_data.type == APTTYPE_MTA, "got apt type %d.\n", test_apt_data.type); @@ -658,7 +658,7 @@ static void test_spvoice(void) hr = ISpVoice_WaitUntilDone(voice, INFINITE); duration = GetTickCount() - start; ok(hr == S_OK, "got %#lx.\n", hr); - ok(duration > 800 && duration < 3000, "took %lu ms.\n", duration); + ok(duration > 800 && duration < 3500, "took %lu ms.\n", duration); ok(test_engine.speak_called, "ISpTTSEngine::Speak was not called.\n"); ok(test_engine.flags == SPF_NLP_SPEAK_PUNC, "got %#lx.\n", test_engine.flags);

1 0

Santino Mazza : evr: Release sample queue when streaming ends.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 072fe5d62a63b9b46de030a5d3d437cf9ff481a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/072fe5d62a63b9b46de030a5d3d437… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Jul 31 11:45:18 2023 -0300 evr: Release sample queue when streaming ends. --- dlls/evr/presenter.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 06592f8766e..97080717288 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -467,6 +467,18 @@ static BOOL video_presenter_sample_queue_pop(struct video_presenter *presenter, return *sample != NULL; } + +static void video_presenter_sample_queue_free(struct video_presenter *presenter) +{ + struct sample_queue *queue = &presenter->thread.queue; + IMFSample *sample; + + while (video_presenter_sample_queue_pop(presenter, &sample)) + IMFSample_Release(sample); + + free(queue->samples); +} + static HRESULT video_presenter_get_sample_surface(IMFSample *sample, IDirect3DSurface9 **surface) { IMFMediaBuffer *buffer; @@ -754,6 +766,7 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) if (presenter->thread.queue.last_presented) IMFSample_Release(presenter->thread.queue.last_presented); + video_presenter_sample_queue_free(presenter); memset(&presenter->thread, 0, sizeof(presenter->thread)); video_presenter_set_allocator_callback(presenter, NULL);

1 0

Santino Mazza : evr: Create critical section for sample queue.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 7c0731e1849ea2c007783145d7335f7b4fce7081 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c0731e1849ea2c007783145d7335f… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Mon Jul 31 11:44:35 2023 -0300 evr: Create critical section for sample queue. --- dlls/evr/presenter.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 97080717288..645a2461e4c 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -66,6 +66,7 @@ struct sample_queue unsigned int front; unsigned int back; IMFSample *last_presented; + CRITICAL_SECTION cs; }; struct streaming_thread @@ -425,6 +426,7 @@ static HRESULT video_presenter_sample_queue_init(struct video_presenter *present queue->size = presenter->allocator_capacity; queue->back = queue->size - 1; + InitializeCriticalSection(&queue->cs); return S_OK; } @@ -435,7 +437,7 @@ static void video_presenter_sample_queue_push(struct video_presenter *presenter, struct sample_queue *queue = &presenter->thread.queue; unsigned int idx; - EnterCriticalSection(&presenter->cs); + EnterCriticalSection(&queue->cs); if (queue->used != queue->size) { if (at_front) @@ -446,14 +448,14 @@ static void video_presenter_sample_queue_push(struct video_presenter *presenter, queue->used++; IMFSample_AddRef(sample); } - LeaveCriticalSection(&presenter->cs); + LeaveCriticalSection(&queue->cs); } static BOOL video_presenter_sample_queue_pop(struct video_presenter *presenter, IMFSample **sample) { struct sample_queue *queue = &presenter->thread.queue; - EnterCriticalSection(&presenter->cs); + EnterCriticalSection(&queue->cs); if (queue->used) { *sample = queue->samples[queue->front]; @@ -462,7 +464,7 @@ static BOOL video_presenter_sample_queue_pop(struct video_presenter *presenter, } else *sample = NULL; - LeaveCriticalSection(&presenter->cs); + LeaveCriticalSection(&queue->cs); return *sample != NULL; } @@ -477,6 +479,7 @@ static void video_presenter_sample_queue_free(struct video_presenter *presenter) IMFSample_Release(sample); free(queue->samples); + DeleteCriticalSection(&queue->cs); } static HRESULT video_presenter_get_sample_surface(IMFSample *sample, IDirect3DSurface9 **surface) @@ -502,6 +505,7 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM { IDirect3DSurface9 *surface, *backbuffer; IDirect3DDevice9 *device; + struct sample_queue *queue = &presenter->thread.queue; HRESULT hr; if (FAILED(hr = video_presenter_get_sample_surface(sample, &surface))) @@ -527,12 +531,12 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM WARN("Failed to get a backbuffer, hr %#lx.\n", hr); } - EnterCriticalSection(&presenter->cs); - if (presenter->thread.queue.last_presented) - IMFSample_Release(presenter->thread.queue.last_presented); - presenter->thread.queue.last_presented = sample; - IMFSample_AddRef(presenter->thread.queue.last_presented); - LeaveCriticalSection(&presenter->cs); + EnterCriticalSection(&queue->cs); + if (queue->last_presented) + IMFSample_Release(queue->last_presented); + queue->last_presented = sample; + IMFSample_AddRef(queue->last_presented); + LeaveCriticalSection(&queue->cs); IDirect3DSurface9_Release(surface); }

1 0

Santino Mazza : evr: Don't lock presenter allocator when calling NotifyRelease.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: fa3ebd5044d26e6364e0ea0068cb3c4716b50b4e URL: https://gitlab.winehq.org/wine/wine/-/commit/fa3ebd5044d26e6364e0ea0068cb3c… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Wed Aug 9 19:43:42 2023 -0300 evr: Don't lock presenter allocator when calling NotifyRelease. The changes in the video sample allocator are not part of the public api specification, it's only made for internal use in the evr presenter implementation. --- dlls/evr/evr_private.h | 2 ++ dlls/evr/presenter.c | 2 +- dlls/evr/sample.c | 30 ++++++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index ef38b0f70cf..93047b50c94 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -55,4 +55,6 @@ HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; +HRESULT create_video_sample_allocator(BOOL lock_notify_release, REFIID riid, void **obj); + #endif /* __EVR_PRIVATE_INCLUDED__ */ diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 645a2461e4c..3ae9b24ad4a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -2149,7 +2149,7 @@ static HRESULT video_presenter_init_d3d(struct video_presenter *presenter) if (FAILED(hr)) WARN("Failed to set new device for the manager, hr %#lx.\n", hr); - if (SUCCEEDED(hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&presenter->allocator))) + if (SUCCEEDED(hr = create_video_sample_allocator(FALSE, &IID_IMFVideoSampleAllocator, (void **)&presenter->allocator))) { hr = IMFVideoSampleAllocator_SetDirectXManager(presenter->allocator, (IUnknown *)presenter->device_manager); } diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 6a1bbf564f5..aa3f120b115 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -395,6 +395,7 @@ struct sample_allocator unsigned int free_sample_count; struct list free_samples; struct list used_samples; + BOOL lock_notify_release; CRITICAL_SECTION cs; }; @@ -809,6 +810,7 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback struct queued_sample *iter; IUnknown *object = NULL; IMFSample *sample = NULL; + IMFVideoSampleAllocatorNotify *callback = NULL; HRESULT hr; if (FAILED(IMFAsyncResult_GetObject(result, &object))) @@ -836,10 +838,24 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback IMFSample_Release(sample); if (allocator->callback) - IMFVideoSampleAllocatorNotify_NotifyRelease(allocator->callback); + { + if (allocator->lock_notify_release) + IMFVideoSampleAllocatorNotify_NotifyRelease(allocator->callback); + else + { + callback = allocator->callback; + IMFVideoSampleAllocatorNotify_AddRef(callback); + } + } LeaveCriticalSection(&allocator->cs); + if (callback) + { + IMFVideoSampleAllocatorNotify_NotifyRelease(callback); + IMFVideoSampleAllocatorNotify_Release(callback); + } + return S_OK; } @@ -852,13 +868,11 @@ static const IMFAsyncCallbackVtbl sample_allocator_tracking_callback_vtbl = sample_allocator_tracking_callback_Invoke, }; -HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) +HRESULT create_video_sample_allocator(BOOL lock_notify_release, REFIID riid, void **obj) { struct sample_allocator *object; HRESULT hr; - TRACE("%s, %p.\n", debugstr_guid(riid), obj); - if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -868,6 +882,7 @@ HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) object->refcount = 1; list_init(&object->used_samples); list_init(&object->free_samples); + object->lock_notify_release = lock_notify_release; InitializeCriticalSection(&object->cs); hr = IMFVideoSampleAllocator_QueryInterface(&object->IMFVideoSampleAllocator_iface, riid, obj); @@ -876,6 +891,13 @@ HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) return hr; } +HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) +{ + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + return create_video_sample_allocator(TRUE, riid, obj); +} + static HRESULT WINAPI video_sample_QueryInterface(IMFSample *iface, REFIID riid, void **out) { struct video_sample *sample = impl_from_IMFSample(iface);

1 0