June 2022 - Wine-Commits - list.winehq.org

Bernhard Kölbl : windows.media.speech: Add stub ISpeechSynthesisStream iface.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: d81bb88366c8ab340b6159b3f905b2ad4be6c940 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d81bb88366c8ab340b6159b3… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Jun 7 21:59:32 2022 +0200 windows.media.speech: Add stub ISpeechSynthesisStream iface. Based on a patch by Connor McAdams <cmcadams(a)codeweavers.com> Silences a warning about narrator being broken in Forza Horizon 5. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 142 ++++++++++++++++++++++++++++++- dlls/windows.media.speech/tests/speech.c | 37 ++++---- 2 files changed, 153 insertions(+), 26 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 7e1d19cb4c1..ce257c7c355 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -146,6 +146,140 @@ static struct voice_information_vector all_voices = 0 }; +/* + * + * ISpeechSynthesisStream + * + */ + +struct synthesis_stream +{ + ISpeechSynthesisStream ISpeechSynthesisStream_iface; + LONG ref; + + IVector_IMediaMarker *markers; +}; + +static inline struct synthesis_stream *impl_from_ISpeechSynthesisStream( ISpeechSynthesisStream *iface ) +{ + return CONTAINING_RECORD(iface, struct synthesis_stream, ISpeechSynthesisStream_iface); +} + +HRESULT WINAPI synthesis_stream_QueryInterface( ISpeechSynthesisStream *iface, REFIID iid, void **out ) +{ + struct synthesis_stream *impl = impl_from_ISpeechSynthesisStream(iface); + + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_ISpeechSynthesisStream)) + { + IInspectable_AddRef((*out = &impl->ISpeechSynthesisStream_iface)); + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +ULONG WINAPI synthesis_stream_AddRef( ISpeechSynthesisStream *iface ) +{ + struct synthesis_stream *impl = impl_from_ISpeechSynthesisStream(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +ULONG WINAPI synthesis_stream_Release( ISpeechSynthesisStream *iface ) +{ + struct synthesis_stream *impl = impl_from_ISpeechSynthesisStream(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %lu.\n", iface, ref); + + if (!ref) + free(impl); + + return ref; +} + +HRESULT WINAPI synthesis_stream_GetIids( ISpeechSynthesisStream *iface, ULONG *iid_count, IID **iids ) +{ + FIXME("iface %p, iid_count %p, iids %p stub.\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +HRESULT WINAPI synthesis_stream_GetRuntimeClassName( ISpeechSynthesisStream *iface, HSTRING *class_name ) +{ + FIXME("iface %p, class_name %p stub.\n", iface, class_name); + return E_NOTIMPL; +} + +HRESULT WINAPI synthesis_stream_GetTrustLevel( ISpeechSynthesisStream *iface, TrustLevel *trust_level ) +{ + FIXME("iface %p, trust_level %p stub.\n", iface, trust_level); + return E_NOTIMPL; +} + +HRESULT WINAPI synthesis_stream_get_Markers( ISpeechSynthesisStream *iface, IVectorView_IMediaMarker **value ) +{ + struct synthesis_stream *impl = impl_from_ISpeechSynthesisStream(iface); + FIXME("iface %p, value %p stub!\n", iface, value); + return IVector_IMediaMarker_GetView(impl->markers, value); +} + +static const struct ISpeechSynthesisStreamVtbl synthesis_stream_vtbl = +{ + /* IUnknown methods */ + synthesis_stream_QueryInterface, + synthesis_stream_AddRef, + synthesis_stream_Release, + /* IInspectable methods */ + synthesis_stream_GetIids, + synthesis_stream_GetRuntimeClassName, + synthesis_stream_GetTrustLevel, + /* ISpeechSynthesisStream methods */ + synthesis_stream_get_Markers +}; + + +static HRESULT synthesis_stream_create( ISpeechSynthesisStream **out ) +{ + struct synthesis_stream *impl; + struct vector_iids markers_iids = + { + .iterable = &IID_IIterable_IMediaMarker, + .iterator = &IID_IIterator_IMediaMarker, + .vector = &IID_IVector_IMediaMarker, + .view = &IID_IVectorView_IMediaMarker, + }; + HRESULT hr; + + TRACE("out %p.\n", out); + + if (!(impl = calloc(1, sizeof(*impl)))) + { + *out = NULL; + return E_OUTOFMEMORY; + } + + impl->ISpeechSynthesisStream_iface.lpVtbl = &synthesis_stream_vtbl; + impl->ref = 1; + if (FAILED(hr = vector_inspectable_create(&markers_iids, (IVector_IInspectable**)&impl->markers))) + goto error; + + TRACE("created ISpeechSynthesisStream %p.\n", impl); + *out = &impl->ISpeechSynthesisStream_iface; + return S_OK; + +error: + free(impl); + return hr; +} + /* * * SpeechSynthesizer runtimeclass @@ -243,26 +377,26 @@ static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, Trus static HRESULT CALLBACK text_to_stream_operation( IInspectable *invoker, IInspectable **result ) { - return S_OK; + return synthesis_stream_create((ISpeechSynthesisStream **)result); } static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesizer *iface, HSTRING text, IAsyncOperation_SpeechSynthesisStream **operation ) { - FIXME("iface %p, text %p, operation %p stub.\n", iface, text, operation); + TRACE("iface %p, text %p, operation %p.\n", iface, text, operation); return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL, text_to_stream_operation, (IAsyncOperation_IInspectable **)operation); } static HRESULT CALLBACK ssml_to_stream_operation( IInspectable *invoker, IInspectable **result ) { - return S_OK; + return synthesis_stream_create((ISpeechSynthesisStream **)result); } static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesizer *iface, HSTRING ssml, IAsyncOperation_SpeechSynthesisStream **operation ) { - FIXME("iface %p, text %p, operation %p stub.\n", iface, ssml, operation); + TRACE("iface %p, ssml %p, operation %p.\n", iface, ssml, operation); return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL, ssml_to_stream_operation, (IAsyncOperation_IInspectable **)operation); } diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index bea3c5104b1..0d67c8b7cdb 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -947,22 +947,19 @@ static void test_SpeechSynthesizer(void) check_interface(operation_ss_stream, &IID_IAgileObject, TRUE); hr = IAsyncOperation_SpeechSynthesisStream_GetResults(operation_ss_stream, &ss_stream); - todo_wine ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); + ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); - if (hr == S_OK) - { - hr = ISpeechSynthesisStream_get_Markers(ss_stream, &media_markers); - todo_wine ok(hr == S_OK, "ISpeechSynthesisStream_get_Markers failed, hr %#lx\n", hr); - check_interface(media_markers, &IID_IVectorView_IMediaMarker, TRUE); - check_interface(media_markers, &IID_IIterable_IMediaMarker, TRUE); - check_interface(media_markers, &IID_IAgileObject, TRUE); + hr = ISpeechSynthesisStream_get_Markers(ss_stream, &media_markers); + ok(hr == S_OK, "ISpeechSynthesisStream_get_Markers failed, hr %#lx\n", hr); + check_interface(media_markers, &IID_IVectorView_IMediaMarker, TRUE); + check_interface(media_markers, &IID_IIterable_IMediaMarker, TRUE); + check_interface(media_markers, &IID_IAgileObject, TRUE); - ref = IVectorView_IMediaMarker_Release(media_markers); - todo_wine ok(ref == 0, "Got unexpected ref %lu.\n", ref); + ref = IVectorView_IMediaMarker_Release(media_markers); + ok(ref == 0, "Got unexpected ref %lu.\n", ref); - ref = ISpeechSynthesisStream_Release(ss_stream); - todo_wine ok(ref == 0, "Got unexpected ref %lu.\n", ref); - } + ref = ISpeechSynthesisStream_Release(ss_stream); + ok(ref == 0, "Got unexpected ref %lu.\n", ref); IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); @@ -981,16 +978,12 @@ static void test_SpeechSynthesizer(void) check_interface(operation_ss_stream, &IID_IAgileObject, TRUE); hr = IAsyncOperation_SpeechSynthesisStream_GetResults(operation_ss_stream, &ss_stream); - todo_wine ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); + ok(hr == S_OK, "IAsyncOperation_SpeechSynthesisStream_GetResults failed, hr %#lx\n", hr); + check_interface(ss_stream, &IID_ISpeechSynthesisStream, TRUE); + check_interface(ss_stream, &IID_IAgileObject, TRUE); - if (hr == S_OK) - { - check_interface(ss_stream, &IID_ISpeechSynthesisStream, TRUE); - check_interface(ss_stream, &IID_IAgileObject, TRUE); - - ref = ISpeechSynthesisStream_Release(ss_stream); - ok(ref == 0, "Got unexpected ref %lu.\n", ref); - } + ref = ISpeechSynthesisStream_Release(ss_stream); + ok(ref == 0, "Got unexpected ref %lu.\n", ref); IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream);

1 0

Bernhard Kölbl : windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeTextToStreamAsync.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: d8637c9b3781bb7e68968b83a207c6f5294c9af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8637c9b3781bb7e68968b83… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Jun 7 21:53:35 2022 +0200 windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeTextToStreamAsync. Based on a patch by Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 8 +++++++- dlls/windows.media.speech/tests/speech.c | 11 +++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index e8c9f0a280d..3a77fc62234 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -241,11 +241,17 @@ static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, Trus return E_NOTIMPL; } +static HRESULT CALLBACK text_to_stream_operation( IInspectable *invoker, IInspectable **result ) +{ + return S_OK; +} + static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesizer *iface, HSTRING text, IAsyncOperation_SpeechSynthesisStream **operation ) { FIXME("iface %p, text %p, operation %p stub.\n", iface, text, operation); - return E_NOTIMPL; + return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL, + text_to_stream_operation, (IAsyncOperation_IInspectable **)operation); } static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesizer *iface, HSTRING ssml, diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index e6f8a32bb80..c9898b2cc03 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -933,13 +933,11 @@ static void test_SpeechSynthesizer(void) ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = ISpeechSynthesizer_SynthesizeTextToStreamAsync(synthesizer, NULL, &operation_ss_stream); - todo_wine ok(hr == S_OK, "ISpeechSynthesizer_SynthesizeTextToStreamAsync failed, hr %#lx\n", hr); - if(FAILED(hr)) goto skip_ss_stream; - + ok(hr == S_OK, "ISpeechSynthesizer_SynthesizeTextToStreamAsync failed, hr %#lx\n", hr); IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); hr = ISpeechSynthesizer_SynthesizeTextToStreamAsync(synthesizer, str, &operation_ss_stream); - todo_wine ok(hr == S_OK, "ISpeechSynthesizer_SynthesizeTextToStreamAsync failed, hr %#lx\n", hr); + ok(hr == S_OK, "ISpeechSynthesizer_SynthesizeTextToStreamAsync failed, hr %#lx\n", hr); await_async_inspectable((IAsyncOperation_IInspectable *)operation_ss_stream, &async_inspectable_handler, @@ -974,6 +972,8 @@ static void test_SpeechSynthesizer(void) hr = ISpeechSynthesizer_SynthesizeSsmlToStreamAsync(synthesizer, str2, &operation_ss_stream); todo_wine ok(hr == S_OK, "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr); + if(FAILED(hr)) goto skip_ss_stream; + await_async_inspectable((IAsyncOperation_IInspectable *)operation_ss_stream, &async_inspectable_handler, &IID_IAsyncOperationCompletedHandler_SpeechSynthesisStream); @@ -1019,9 +1019,8 @@ static void test_SpeechSynthesizer(void) } else todo_wine ok(operation_ss_stream == NULL, "operation_ss_stream had value %p.\n", operation_ss_stream); - WindowsDeleteString(str2); - skip_ss_stream: + WindowsDeleteString(str2); WindowsDeleteString(str); hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable);

1 0

Bernhard Kölbl : include/windows.media.idl: Move IMediaMarker collections from speechsynthesis.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: 6e26dc6b59da93f6ba951430f32a7203459515a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e26dc6b59da93f6ba951430… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Jun 10 17:19:29 2022 +0200 include/windows.media.idl: Move IMediaMarker collections from speechsynthesis. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/windows.media.idl | 9 +++++++++ include/windows.media.speechsynthesis.idl | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/windows.media.idl b/include/windows.media.idl index 1c0b3e82c1d..2c80e49a92b 100644 --- a/include/windows.media.idl +++ b/include/windows.media.idl @@ -26,6 +26,15 @@ import "windows.foundation.idl"; namespace Windows.Media { interface IMediaControl; + interface IMediaMarker; + + declare + { + interface Windows.Foundation.Collections.IIterable<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.Collections.IIterator<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.Collections.IVector<Windows.Media.IMediaMarker*>; + } [ contract(Windows.Foundation.UniversalApiContract, 1.0), diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index b2c86f37137..10fd2f5c897 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -54,12 +54,6 @@ namespace Windows { } } -namespace Windows { - namespace Media { - interface IMediaMarker; - } -} - namespace Windows { namespace Media { namespace SpeechSynthesis { @@ -67,7 +61,6 @@ namespace Windows { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; - interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; }

1 0

Hans Leidekker : winhttp: Fix default port corner cases in WinHttpCrackUrl().
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: 2fccd2cb1067ca3e07b0f978ca4082dfeea482ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fccd2cb1067ca3e07b0f978… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Jun 4 16:07:38 2022 +0200 winhttp: Fix default port corner cases in WinHttpCrackUrl(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/url.c | 9 ++++++++- dlls/winhttp/url.c | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 5f137dc6365..da51117e41e 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -61,6 +61,7 @@ static const WCHAR url18[] = L"http://%0D%1F%20%0A%7F%0D%0A"; static const WCHAR url19[] = L"http://?text=\xfb00"; static const WCHAR url20[] = L"http:///text=\xfb00"; static const WCHAR url21[] = L"https://nba2k19-ws.2ksports.com:19133/nba/v4/Accounts/get_account?x=3789526…"; +static const WCHAR url22[] = L"http://winehq.org:/"; static const WCHAR url_k1[] = L"http://username:password(a)www.winehq.org/site/about"; static const WCHAR url_k2[] = L"http://www.winehq.org"; @@ -807,7 +808,13 @@ static void WinHttpCrackUrl_test( void ) uc.nPort = 1; ret = WinHttpCrackUrl( url17, 0, 0, &uc ); ok( ret, "got %lu\n", GetLastError() ); - todo_wine ok( uc.nPort == 80, "got %u\n", uc.nPort ); + ok( uc.nPort == 80, "got %u\n", uc.nPort ); + + reset_url_components( &uc ); + uc.nPort = 1; + ret = WinHttpCrackUrl( url22, 0, 0, &uc ); + ok( ret, "got %lu\n", GetLastError() ); + ok( uc.nPort == 80, "got %u\n", uc.nPort ); memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 9e7f5478dfe..4d10a17f6a0 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -280,13 +280,18 @@ BOOL WINAPI WinHttpCrackUrl( const WCHAR *url, DWORD len, DWORD flags, URL_COMPO { if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; - if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; + if (!(q - r)) + { + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + } + else if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; } else { if ((err = set_component( &hostname, p, q - p, flags, &overflow ))) goto exit; if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((r = wmemchr( q, '?', len - (q - url) ))) @@ -310,13 +315,18 @@ BOOL WINAPI WinHttpCrackUrl( const WCHAR *url, DWORD len, DWORD flags, URL_COMPO { if ((err = set_component( &hostname, p, r - p, flags, &overflow ))) goto exit; r++; - if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; + if (!*r) + { + if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + } + else if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; } else { if ((err = set_component( &hostname, p, len - (p - url), flags, &overflow ))) goto exit; if (scheme_number == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + else if (scheme_number == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((err = set_component( &path, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit; if ((err = set_component( &extra, (WCHAR *)url + len, 0, flags, &overflow ))) goto exit;

1 0

Rémi Bernon : winegstreamer: Return E_UNEXPECTED from WMReaderAdvanced2_OpenStream when already opened.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: 4edad99303b807f03c001b11d03a8b251f1bd214 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4edad99303b807f03c001b11… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 10 17:27:02 2022 +0200 winegstreamer: Return E_UNEXPECTED from WMReaderAdvanced2_OpenStream when already opened. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wm_asyncreader.c | 7 +++++++ dlls/wmvcore/tests/wmvcore.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index e70498b9858..97ee1fe60cd 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -725,6 +725,13 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, EnterCriticalSection(&reader->reader.cs); + if (reader->reader.wg_parser) + { + LeaveCriticalSection(&reader->reader.cs); + WARN("Stream is already open; returning E_UNEXPECTED.\n"); + return E_UNEXPECTED; + } + if (SUCCEEDED(hr = wm_reader_open_stream(&reader->reader, stream))) open_stream(reader, callback, context); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 59d1f5abcc6..f639184de90 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2181,6 +2181,9 @@ static void test_async_reader_streaming(void) ret = WaitForSingleObject(callback.got_opened, 1000); ok(!ret, "Wait timed out.\n"); + hr = IWMReaderAdvanced2_OpenStream(advanced, &stream.IStream_iface, &callback.IWMReaderCallback_iface, (void **)0xdeadbee0); + ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); + count = 0xdeadbeef; hr = IWMReader_GetOutputCount(reader, &count); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Rémi Bernon : winegstreamer: Move end conditions out of the wm_asyncreader stream loop.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: c64775fd8b50c6d23da284460d7fe9ec5b41d9ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64775fd8b50c6d23da28446… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 10 17:31:15 2022 +0200 winegstreamer: Move end conditions out of the wm_asyncreader stream loop. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wm_asyncreader.c | 115 ++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 59 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 97ee1fe60cd..15e7c2dc9ca 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -74,12 +74,13 @@ static DWORD WINAPI stream_thread(void *arg) struct async_reader *reader = arg; IWMReaderCallback *callback = reader->callback; REFERENCE_TIME start_time; + struct wm_stream *stream; static const DWORD zero; QWORD pts, duration; WORD stream_number; INSSBuffer *sample; + HRESULT hr = S_OK; DWORD flags; - HRESULT hr; start_time = get_current_time(reader); @@ -88,80 +89,76 @@ static DWORD WINAPI stream_thread(void *arg) while (reader->running) { hr = wm_reader_get_stream_sample(&reader->reader, 0, &sample, &pts, &duration, &flags, &stream_number); + if (hr != S_OK) + break; + + stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); - if (hr == S_OK) + if (reader->user_clock) { - struct wm_stream *stream = wm_reader_get_stream_by_stream_number(&reader->reader, stream_number); + QWORD user_time = reader->user_time; - if (reader->user_clock) + if (pts > user_time && reader->reader.callback_advanced) + IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); + while (pts > reader->user_time && reader->running) + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); + if (!reader->running) { - QWORD user_time = reader->user_time; - - if (pts > user_time && reader->reader.callback_advanced) - IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, user_time, reader->context); - while (pts > reader->user_time && reader->running) - SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, INFINITE); - if (!reader->running) - { - INSSBuffer_Release(sample); - goto out; - } + INSSBuffer_Release(sample); + goto out; } - else + } + else + { + for (;;) { - for (;;) - { - REFERENCE_TIME current_time = get_current_time(reader); + REFERENCE_TIME current_time = get_current_time(reader); - if (pts <= current_time - start_time) - break; + if (pts <= current_time - start_time) + break; - SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, - (pts - (current_time - start_time)) / 10000); + SleepConditionVariableCS(&reader->stream_cv, &reader->stream_cs, + (pts - (current_time - start_time)) / 10000); - if (!reader->running) - { - INSSBuffer_Release(sample); - goto out; - } + if (!reader->running) + { + INSSBuffer_Release(sample); + goto out; } } - - if (stream->read_compressed) - hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, - stream_number, pts, duration, flags, sample, reader->context); - else - hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, - flags, sample, reader->context); - TRACE("Callback returned %#lx.\n", hr); - INSSBuffer_Release(sample); } - else if (hr == NS_E_NO_MORE_SAMPLES) - { - IWMReaderCallback_OnStatus(callback, WMT_END_OF_STREAMING, S_OK, - WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); - IWMReaderCallback_OnStatus(callback, WMT_EOF, S_OK, - WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); - - if (reader->user_clock && reader->reader.callback_advanced) - { - /* We can only get here if user_time is greater than the PTS - * of all samples, in which case we cannot have sent this - * notification already. */ - IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, - reader->user_time, reader->context); - } - TRACE("Reached end of stream; exiting.\n"); - LeaveCriticalSection(&reader->stream_cs); - return 0; - } + if (stream->read_compressed) + hr = IWMReaderCallbackAdvanced_OnStreamSample(reader->reader.callback_advanced, + stream_number, pts, duration, flags, sample, reader->context); else + hr = IWMReaderCallback_OnSample(callback, stream_number - 1, pts, duration, + flags, sample, reader->context); + TRACE("Callback returned %#lx.\n", hr); + INSSBuffer_Release(sample); + } + + if (hr == NS_E_NO_MORE_SAMPLES) + { + IWMReaderCallback_OnStatus(callback, WMT_END_OF_STREAMING, S_OK, + WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); + IWMReaderCallback_OnStatus(callback, WMT_EOF, S_OK, + WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); + + if (reader->user_clock && reader->reader.callback_advanced) { - ERR("Failed to get sample, hr %#lx.\n", hr); - LeaveCriticalSection(&reader->stream_cs); - return 0; + /* We can only get here if user_time is greater than the PTS + * of all samples, in which case we cannot have sent this + * notification already. */ + IWMReaderCallbackAdvanced_OnTime(reader->reader.callback_advanced, + reader->user_time, reader->context); } + + TRACE("Reached end of stream; exiting.\n"); + } + else if (hr != S_OK) + { + ERR("Failed to get sample, hr %#lx.\n", hr); } out:

1 0

Rémi Bernon : winegstreamer: Return E_UNEXPECTED from WMReader_Open when already opened.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: d6af590a8078bb555996ab96dc8845d3d0a3259f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6af590a8078bb555996ab96… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 10 17:27:02 2022 +0200 winegstreamer: Return E_UNEXPECTED from WMReader_Open when already opened. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wm_asyncreader.c | 7 +++++++ dlls/wmvcore/tests/wmvcore.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index df7c701f6f0..e70498b9858 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -222,6 +222,13 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, EnterCriticalSection(&reader->reader.cs); + if (reader->reader.wg_parser) + { + LeaveCriticalSection(&reader->reader.cs); + WARN("Stream is already open; returning E_UNEXPECTED.\n"); + return E_UNEXPECTED; + } + if (SUCCEEDED(hr = wm_reader_open_file(&reader->reader, url))) open_stream(reader, callback, context); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 315173b9860..59d1f5abcc6 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2541,6 +2541,9 @@ static void test_async_reader_file(void) ret = WaitForSingleObject(callback.got_opened, 1000); ok(!ret, "Wait timed out.\n"); + hr = IWMReader_Open(reader, filename, &callback.IWMReaderCallback_iface, (void **)0xdeadbee0); + ok(hr == E_UNEXPECTED, "Got hr %#lx.\n", hr); + count = 0xdeadbeef; hr = IWMReader_GetOutputCount(reader, &count); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Jacek Caban : win32u: Move NtUserDrawMenuBarTemp implementation from user32.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: af00521e290fab8966c61ec8dd956152e47ddaa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af00521e290fab8966c61ec8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 20:15:53 2022 +0200 win32u: Move NtUserDrawMenuBarTemp implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 140 +---------- dlls/user32/user32.spec | 2 +- dlls/win32u/dc.c | 13 + dlls/win32u/defwnd.c | 77 +++++- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 556 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/ntgdi_private.h | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 5 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 11 files changed, 659 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af00521e290fab8966c6…

1 0

Jacek Caban : win32u: Move MENU_DrawMenuBar implementation from user32.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: e13145c893e3de376008b3eeaf531e3f000a7410 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e13145c893e3de376008b3ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 20:27:33 2022 +0200 win32u: Move MENU_DrawMenuBar implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/controls.h | 1 - dlls/user32/menu.c | 20 -------------------- dlls/user32/user_main.c | 1 - dlls/win32u/defwnd.c | 7 +++++-- dlls/win32u/menu.c | 2 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u_private.h | 1 + 7 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 2b6c4912709..c09ab1233d0 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -116,7 +116,6 @@ extern BOOL update_wallpaper( const WCHAR *wallpaper, const WCHAR *pattern ) DEC extern HWND MENU_IsMenuActive(void) DECLSPEC_HIDDEN; extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt ) DECLSPEC_HIDDEN; extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC_HIDDEN; -extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) DECLSPEC_HIDDEN; extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; extern HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 1372baca6cc..2d01e01872c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1693,26 +1693,6 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) } } -/*********************************************************************** - * MENU_DrawMenuBar - * - * Paint a menu bar. Returns the height of the menu bar. - * called from [windows/nonclient.c] - */ -UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) -{ - LPPOPUPMENU lppop; - HMENU hMenu = GetMenu(hwnd); - - lppop = MENU_GetMenu( hMenu ); - if (lppop == NULL || lprect == NULL) - { - return GetSystemMetrics(SM_CYMENU); - } - - return NtUserDrawMenuBarTemp( hwnd, hDC, lprect, hMenu, NULL ); -} - /*********************************************************************** * MENU_InitPopup diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 5344dafd359..bca56fc4141 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -145,7 +145,6 @@ static const struct user_callbacks user_funcs = ImmProcessKey, ImmTranslateMessage, NtWaitForMultipleObjects, - MENU_DrawMenuBar, SCROLL_DrawNCScrollBar, free_win_ptr, MENU_GetSysMenu, diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 9a51b9a463a..f9a23bcee3f 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1487,12 +1487,15 @@ static void nc_paint( HWND hwnd, HRGN clip ) if (has_menu( hwnd, style )) { RECT r = rect; + HMENU menu; + r.bottom = rect.top + get_system_metrics( SM_CYMENU ); TRACE( "drawing menu with rect %s\n", wine_dbgstr_rect( &r )); - if (user_callbacks) - rect.top += user_callbacks->draw_menu( hdc, &r, hwnd ) + 1; + menu = get_menu( hwnd ); + if (!is_menu( menu )) rect.top += get_system_metrics( SM_CYMENU ); + else rect.top += NtUserDrawMenuBarTemp( hwnd, hdc, &r, menu, NULL ); } TRACE( "rect after menu %s\n", wine_dbgstr_rect( &rect )); diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 182dbb6cf58..b794b9a162a 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -241,7 +241,7 @@ static POPUPMENU *unsafe_menu_ptr( HMENU handle ) } /* see IsMenu */ -static BOOL is_menu( HMENU handle ) +BOOL is_menu( HMENU handle ) { POPUPMENU *menu; BOOL is_menu; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 6fc1c1423bd..69fb831c03f 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -36,7 +36,6 @@ struct user_callbacks BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); - UINT (CDECL *draw_menu)( HDC hDC, LPRECT lprect, HWND hwnd ); void (CDECL *draw_nc_scrollbar)( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ); void (CDECL *free_win_ptr)( struct tagWND *win ); HMENU (CDECL *get_sys_menu)( HWND hwnd, HMENU popup ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 5f5563ec9f9..cf3e5c75b16 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -401,6 +401,7 @@ extern UINT get_menu_bar_height( HWND hwnd, UINT width, INT org_x, INT org_y ) D extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN; extern UINT get_menu_state( HMENU handle, UINT item_id, UINT flags ) DECLSPEC_HIDDEN; +extern BOOL is_menu( HMENU handle ) DECLSPEC_HIDDEN; extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN; /* message.c */

1 0

Jacek Caban : win32u: Move PopupMenuWndProc implementation from user32.
by Alexandre Julliard June 14, 2022

June 14, 2022

Module: wine Branch: master Commit: d4b8ca785307083abc449dd09efa3394d9ad9771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4b8ca785307083abc449dd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 11 01:42:50 2022 +0200 win32u: Move PopupMenuWndProc implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/menu.c | 165 ++------------------------------------- dlls/win32u/menu.c | 181 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/message.c | 2 + dlls/win32u/win32u_private.h | 3 + dlls/win32u/window.c | 2 +- include/ntuser.h | 1 + 6 files changed, 194 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4b8ca785307083abc44…

1 0