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

Re: [PATCH v4 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.

by Rémi Bernon

Rémi Bernon (@rbernon) commented about include/windows.media.speechsynthesis.idl: > + { > + [propget] HRESULT Options([out, retval] SpeechSynthesizerOptions **value); > + } > + > + [ > + contract(Windows.Foundation.UniversalApiContract, 1.0), > + exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), > + uuid(b127d6a4-1291-4604-aa9c-83134083352c) > + ] > + interface IVoiceInformation : IInspectable > + { > + [propget] HRESULT DisplayName([out, retval] HSTRING* value); > + [propget] HRESULT Id([out, retval] HSTRING* value); > + [propget] HRESULT Language([out, retval] HSTRING* value); > + [propget] HRESULT Description([out, retval] HSTRING* value); > + [propget] HRESULT Gender([out, retval] VoiceGender* value); Ditto for the pointer stars. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/217#note_1973

June 13, 2022

Re: [PATCH v4 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.

by Rémi Bernon

Rémi Bernon (@rbernon) commented about include/windows.media.speechsynthesis.idl: > + > + [ > + contract(Windows.Foundation.UniversalApiContract, 1.0), > + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream), > + uuid(83e46e93-244c-4622-ba0b-6229c4d0d65d) > + ] > + interface ISpeechSynthesisStream : IInspectable > + requires > + Windows.Storage.Streams.IRandomAccessStreamWithContentType, > + Windows.Storage.Streams.IRandomAccessStream, > + Windows.Foundation.IClosable, > + Windows.Storage.Streams.IInputStream, > + Windows.Storage.Streams.IOutputStream, > + Windows.Storage.Streams.IContentTypeProvider > + { > + [propget] HRESULT Markers([out, retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); Same thing here, while you're making style changes you should change `IMediaMarker*>** value` to at least be `IMediaMarker*> **value`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/217#note_1972

June 13, 2022

Re: [PATCH v4 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.

by Rémi Bernon

Rémi Bernon (@rbernon) commented about include/windows.media.speechsynthesis.idl: > -namespace Windows { > - namespace Foundation { > - interface IClosable; > +namespace Windows.Foundation > +{ > + interface IClosable; > +} > + > +namespace Windows.Storage.Streams > +{ > + interface IRandomAccessStreamWithContentType; > + interface IRandomAccessStream; > + interface IInputStream; > + interface IOutputStream; > + interface IContentTypeProvider; > +} I don't think these forward declaration are actually useful, the SDK does it but it's automatically generated. We can and should simply do `import "windows.storage.stream.idl"` instead and remove the forward declarations. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/217#note_1971

June 13, 2022

Re: [PATCH v4 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.

by Rémi Bernon

Rémi Bernon (@rbernon) commented about include/windows.media.speechsynthesis.idl: > } > } > > -namespace Windows { > - namespace Media { > - interface IMediaMarker; > - } > -} > - > namespace Windows { > namespace Media { > namespace SpeechSynthesis { > declare { > - interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; > interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; > + interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; This seems unrelated, could be done in next commit. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/217#note_1970

June 13, 2022

Re: [PATCH v4 0/9] MR217: windows.media.speech: ISpeechSynthesisStream stub implementation.

by Rémi Bernon

Rémi Bernon (@rbernon) commented about include/windows.media.idl: > - [uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)] > - interface IMediaMarker : IInspectable > - { > - [propget] HRESULT Time([out] [retval] Windows.Foundation.TimeSpan* value); > - [propget] HRESULT MediaMarkerType([out] [retval] HSTRING* value); > - [propget] HRESULT Text([out] [retval] HSTRING* value); > - } > + [ > + contract(Windows.Foundation.UniversalApiContract, 1.0), > + uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625) > + ] > + interface IMediaMarker : IInspectable > + { > + [propget] HRESULT Time([out, retval] Windows.Foundation.TimeSpan* value); > + [propget] HRESULT MediaMarkerType([out, retval] HSTRING* value); > + [propget] HRESULT Text([out, retval] HSTRING* value); Could you change to right aligned pointers too? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/217#note_1969

June 13, 2022

Re: [PATCH v3 0/3] MR225: server: Fix races related to socket errors - approved

by Zebediah Figura (＠zfigura)

This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/225

June 13, 2022

Re: HLSL offsetting

by Zebediah Figura

On 6/13/22 10:59, Francisco Casas wrote: > Hello, > >>> Functions that cannot receive structs or arrays may receive a >>> "flattened" component offset that can then be translated into a >>> route, other functions would require the route as an array. >> >> Not immediately sure what functions you're thinking of, but I imagine >> things like hlsl_compute_component_offset() would now have to >> translate the offset into an array. >> > > For instance, hlsl_new_load(), hlsl_new_resource_load(), and > hlsl_new_store() will have to receive routes instead of single nodes as > offsets now. They'll have to be adjusted, although there's probably simpler ways than to pass arrays to them directly. It'll take writing the patch probably. >>> At this point I can see the benefits of (b) over (a), but also, >>> several complications that may arise (you have pointed most of them): >>> - We will have to translate many things that are already in terms of >>> register offsets into component offsets. >> >> How many things, though? As far as I can see it's: >> >> - copy-prop >> >> - copy splitting >> >> - hlsl_offset_from_deref() [which is part of the point of the whole >> exercise] >> >> That's pretty much it. >> > > Well, maybe it is not too much, but we also have to add initializers to > the list and everywhere else the previous 3 functions are called. > >>> - Once we start supporting non-constant offsets, we may also want to >>> introduce a common subexpression elimination pass for the registers >>> offsets expressions that will arise (currently, the creation of >>> common expressions is mainly avoided by the recursive structure of >>> the split passes). >> >> What cases are you thinking of that would want CSE? >> > > Matteo pointed it out. Basically if we have several copies that come > from a deep struct, let's say 4-dimension array: > > float4 arr[10][10][10][10]; > > Consider the following 2 loads: > > arr[i][j][k][0] > arr[i][j][k][1] > > The idea is that the common part of the SMx-specific register offsets > (4000 * i + 400 * j + 40 * k) > is shared among both and not computed twice. Hmm, interesting. That would be avoidable if we had e.g. HLSL_IR_LOAD instructions, but that still brings us back to the problem where we have unused loads we can't DCE. My inclination is that yeah, if we end up caring about this we should just do a late CSE pass.

June 13, 2022

Re: [PATCH v2 2/2] server: Correctly expose composited parent window on SetWindowPos().

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=116869 Your paranoid android. === debian11 (64 bit WoW report) === user32: msg.c:18754: Test failed: SendMessage from other thread 1: 1: the msg 0x0400 was expected, but got msg 0x0403 instead msg.c:18754: Test failed: SendMessage from other thread 1: 2: the msg sequence is not complete: expected 0000 - actual 0400 msg.c:18768: Test failed: wrong status 00080000 msg.c:18774: Test failed: SendMessage from other thread 3: 0: the msg 0x0403 was expected, but got msg 0x0401 instead msg.c:18774: Test failed: SendMessage from other thread 3: 1: the msg sequence is not complete: expected 0401 - actual 0000

June 13, 2022

[PATCH v4 9/9] windows.media.speech: Add stub ISpeechSynthesisStream iface.

by Bernhard Kölbl

From: Bernhard Kölbl <besentv(a)gmail.com> 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 d74890d1617..dea4f72f755 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 && ss_stream) - { - 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 && ss_stream) - { - 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); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/217

June 13, 2022

[PATCH v4 8/9] windows.media.speech: Return IAsyncOperation from synthesizer_SynthesizeSsmlToStreamAsync.

by Bernhard Kölbl

From: Bernhard Kölbl <besentv(a)gmail.com> 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 | 12 +++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 3a77fc62234..7e1d19cb4c1 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -254,11 +254,17 @@ static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesize text_to_stream_operation, (IAsyncOperation_IInspectable **)operation); } +static HRESULT CALLBACK ssml_to_stream_operation( IInspectable *invoker, IInspectable **result ) +{ + return S_OK; +} + static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesizer *iface, HSTRING ssml, IAsyncOperation_SpeechSynthesisStream **operation ) { FIXME("iface %p, text %p, operation %p stub.\n", iface, ssml, operation); - return E_NOTIMPL; + return async_operation_inspectable_create(&IID_IAsyncOperation_SpeechSynthesisStream, NULL, + ssml_to_stream_operation, (IAsyncOperation_IInspectable **)operation); } static HRESULT WINAPI synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value ) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 392a38c27e2..d74890d1617 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -971,8 +971,7 @@ static void test_SpeechSynthesizer(void) ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); 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; + ok(hr == S_OK, "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr); await_async_inspectable((IAsyncOperation_IInspectable *)operation_ss_stream, &async_inspectable_handler, @@ -998,18 +997,17 @@ static void test_SpeechSynthesizer(void) operation_ss_stream = (void *)0xdeadbeef; hr = ISpeechSynthesizer_SynthesizeSsmlToStreamAsync(synthesizer, NULL, &operation_ss_stream); /* Broken on Win 8 + 8.1 */ - todo_wine ok(hr == S_OK || broken(hr == E_INVALIDARG), "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr); - todo_wine ok(!!operation_ss_stream || broken(operation_ss_stream == NULL), "operation_ss_stream had value %p.\n", operation_ss_stream); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr); + ok(!!operation_ss_stream || broken(operation_ss_stream == NULL), "operation_ss_stream had value %p.\n", operation_ss_stream); if (hr == S_OK) IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); operation_ss_stream = (void *)0xdeadbeef; hr = ISpeechSynthesizer_SynthesizeSsmlToStreamAsync(synthesizer, str, &operation_ss_stream); /* Broken on Win 8 + 8.1 */ - todo_wine ok(hr == S_OK || broken(hr == SPERR_WINRT_INCORRECT_FORMAT), "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr); - todo_wine ok(!!operation_ss_stream || broken(operation_ss_stream == NULL), "operation_ss_stream had value %p.\n", operation_ss_stream); + ok(hr == S_OK || broken(hr == SPERR_WINRT_INCORRECT_FORMAT), "ISpeechSynthesizer_SynthesizeSsmlToStreamAsync failed, hr %#lx\n", hr); + ok(!!operation_ss_stream || broken(operation_ss_stream == NULL), "operation_ss_stream had value %p.\n", operation_ss_stream); if (hr == S_OK) IAsyncOperation_SpeechSynthesisStream_Release(operation_ss_stream); -skip_ss_stream: WindowsDeleteString(str2); WindowsDeleteString(str); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/217

June 13, 2022