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

[PATCH 4/5] include/windows.media.speechrecognition.idl: Add SpeechRecognizerStateChangedEventArgs.

by Bernhard Kölbl

And a needed enum. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/windows.media.speechrecognition.idl | 36 +++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 5e4d0adbd4e..5e15390ef56 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -38,6 +38,7 @@ namespace Windows { typedef enum SpeechRecognitionConstraintProbability SpeechRecognitionConstraintProbability; typedef enum SpeechRecognitionConstraintType SpeechRecognitionConstraintType; typedef enum SpeechRecognitionResultStatus SpeechRecognitionResultStatus; + typedef enum SpeechRecognizerState SpeechRecognizerState; interface ISpeechContinuousRecognitionCompletedEventArgs; interface ISpeechContinuousRecognitionResultGeneratedEventArgs; interface ISpeechContinuousRecognitionSession; @@ -49,6 +50,7 @@ namespace Windows { interface ISpeechRecognitionResult; interface ISpeechRecognitionResult2; interface ISpeechRecognitionSemanticInterpretation; + interface ISpeechRecognizerStateChangedEventArgs; interface ISpeechRecognizerTimeouts; interface ISpeechRecognizerUIOptions; runtimeclass SpeechContinuousRecognitionCompletedEventArgs; @@ -60,6 +62,7 @@ namespace Windows { runtimeclass SpeechRecognitionQualityDegradingEventArgs; runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; + runtimeclass SpeechRecognizerStateChangedEventArgs; runtimeclass SpeechRecognizerTimeouts; runtimeclass SpeechRecognizerUIOptions; } @@ -149,6 +152,20 @@ namespace Windows { MicrophoneUnavailable = 10, }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechRecognizerState + { + Idle = 0, + Capturing = 1, + Processing = 2, + SoundStarted = 3, + SoundEnded = 4, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + SpeechDetected = 5, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Paused = 6, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechRecognition.SpeechContinuousRecognitionCompletedEventArgs), @@ -287,6 +304,16 @@ namespace Windows { [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*> **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognizerStateChangedEventArgs), + uuid(563d4f09-ba03-4bad-ad81-ddc6c4dab0c3) + ] + interface ISpeechRecognizerStateChangedEventArgs : IInspectable + { + [propget] HRESULT State([out, retval] Windows.Media.SpeechRecognition.SpeechRecognizerState *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognizerTimeouts), @@ -406,6 +433,15 @@ namespace Windows { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionSemanticInterpretation; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognizerStateChangedEventArgs + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognizerStateChangedEventArgs; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile) -- 2.35.1

March 1, 2022

[PATCH 3/5] include/windows.media.speechrecognition.idl: Add SpeechRecognitionQualityDegradingEventArgs.

by Bernhard Kölbl

And a needed enum. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/windows.media.speechrecognition.idl | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index c9e1305fcac..5e4d0adbd4e 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -33,6 +33,7 @@ namespace Windows { namespace Media { namespace SpeechRecognition { typedef enum SpeechContinuousRecognitionMode SpeechContinuousRecognitionMode; + typedef enum SpeechRecognitionAudioProblem SpeechRecognitionAudioProblem; typedef enum SpeechRecognitionConfidence SpeechRecognitionConfidence; typedef enum SpeechRecognitionConstraintProbability SpeechRecognitionConstraintProbability; typedef enum SpeechRecognitionConstraintType SpeechRecognitionConstraintType; @@ -44,6 +45,7 @@ namespace Windows { interface ISpeechRecognitionConstraint; interface ISpeechRecognitionHypothesis; interface ISpeechRecognitionHypothesisGeneratedEventArgs; + interface ISpeechRecognitionQualityDegradingEventArgs; interface ISpeechRecognitionResult; interface ISpeechRecognitionResult2; interface ISpeechRecognitionSemanticInterpretation; @@ -55,6 +57,7 @@ namespace Windows { runtimeclass SpeechRecognitionCompilationResult; runtimeclass SpeechRecognitionHypothesis; runtimeclass SpeechRecognitionHypothesisGeneratedEventArgs; + runtimeclass SpeechRecognitionQualityDegradingEventArgs; runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; runtimeclass SpeechRecognizerTimeouts; @@ -88,6 +91,18 @@ namespace Windows { PauseOnRecognition = 1, }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechRecognitionAudioProblem + { + None = 0, + TooNoisy = 1, + NoSignal = 2, + TooLoud = 3, + TooQuiet = 4, + TooFast = 5, + TooSlow = 6, + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] enum SpeechRecognitionConfidence { @@ -224,6 +239,16 @@ namespace Windows { [propget] HRESULT Hypothesis([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionHypothesis **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionQualityDegradingEventArgs), + uuid(4fe24105-8c3a-4c7e-8d0a-5bd4f5b14ad8) + ] + interface ISpeechRecognitionQualityDegradingEventArgs : IInspectable + { + [propget] HRESULT Problem([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionAudioProblem **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionResult), @@ -353,6 +378,15 @@ namespace Windows { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionHypothesisGeneratedEventArgs; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognitionQualityDegradingEventArgs + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionQualityDegradingEventArgs; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile) -- 2.35.1

March 1, 2022

[PATCH 2/5] include/windows.media.speechrecognition.idl: Add SpeechRecognitionCompilationResult.

by Bernhard Kölbl

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/windows.media.speechrecognition.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 9c288ce4066..c9e1305fcac 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -40,6 +40,7 @@ namespace Windows { interface ISpeechContinuousRecognitionCompletedEventArgs; interface ISpeechContinuousRecognitionResultGeneratedEventArgs; interface ISpeechContinuousRecognitionSession; + interface ISpeechRecognitionCompilationResult; interface ISpeechRecognitionConstraint; interface ISpeechRecognitionHypothesis; interface ISpeechRecognitionHypothesisGeneratedEventArgs; @@ -51,6 +52,7 @@ namespace Windows { runtimeclass SpeechContinuousRecognitionCompletedEventArgs; runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; runtimeclass SpeechContinuousRecognitionSession; + runtimeclass SpeechRecognitionCompilationResult; runtimeclass SpeechRecognitionHypothesis; runtimeclass SpeechRecognitionHypothesisGeneratedEventArgs; runtimeclass SpeechRecognitionResult; @@ -177,6 +179,16 @@ namespace Windows { [eventremove] HRESULT ResultGenerated([in] EventRegistrationToken token); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionCompilationResult), + uuid(407e6c5d-6ac7-4da4-9cc1-2fce32cf7489) + ] + interface ISpeechRecognitionCompilationResult : IInspectable + { + [propget] HRESULT Status([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionResultStatus *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(79ac1628-4d68-43c4-8911-40dc4101b55b) @@ -312,6 +324,15 @@ namespace Windows { [default] interface Windows.Media.SpeechRecognition.ISpeechContinuousRecognitionSession; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognitionCompilationResult + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionCompilationResult; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), -- 2.35.1

March 1, 2022

[PATCH 1/5] include/windows.media.speechrecognition.idl: Add SpeechRecognizerUIOptions.

by Bernhard Kölbl

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- include/windows.media.speechrecognition.idl | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index ebcd579865d..9c288ce4066 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -47,6 +47,7 @@ namespace Windows { interface ISpeechRecognitionResult2; interface ISpeechRecognitionSemanticInterpretation; interface ISpeechRecognizerTimeouts; + interface ISpeechRecognizerUIOptions; runtimeclass SpeechContinuousRecognitionCompletedEventArgs; runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; runtimeclass SpeechContinuousRecognitionSession; @@ -55,6 +56,7 @@ namespace Windows { runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; runtimeclass SpeechRecognizerTimeouts; + runtimeclass SpeechRecognizerUIOptions; } } } @@ -263,6 +265,23 @@ namespace Windows { [propput] HRESULT BabbleTimeout([in] Windows.Foundation.TimeSpan value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognizerUIOptions), + uuid(7888d641-b92b-44ba-a25f-d1864630641f) + ] + interface ISpeechRecognizerUIOptions : IInspectable + { + [propget] HRESULT ExampleText([out, retval] HSTRING *value); + [propput] HRESULT ExampleText([in] HSTRING value); + [propget] HRESULT AudiblePrompt([out, retval] HSTRING *value); + [propput] HRESULT AudiblePrompt([in] HSTRING value); + [propget] HRESULT IsReadBackEnabled([out, retval] boolean *value); + [propput] HRESULT IsReadBackEnabled([in] boolean value); + [propget] HRESULT ShowConfirmation([out, retval] boolean *value); + [propput] HRESULT ShowConfirmation([in] boolean value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -340,6 +359,15 @@ namespace Windows { { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognizerTimeouts; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognizerUIOptions + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognizerUIOptions; + } } } } -- 2.35.1

March 1, 2022

Re: [PATCH v3 1/8] server: Actually set initial status in set_async_direct_result handler.

by Jinoh Kang

On 2/26/22 03:57, Zebediah Figura (she/her) wrote: > On 2/21/22 11:23, Jinoh Kang wrote: >> Commit 15483b1a126 (server: Allow calling async_handoff() with status >> code STATUS_ALERTED., 2022-02-10) introduced the set_async_direct_result >> handler which calls async_set_initial_status(). >> >> However, the async_set_initial_status() call does nothing since >> async->terminated is set, leaving the async in a confusing state >> (unknown_status = 1 but pending/completed). >> >> So far, this issue is unlikely to have been a problem in practice for >> the following reasons: >> >> 1. async_set_initial_status() would have unset unknown_status, but it >> remains set instead. This is usually not a problem, since >> unknown_status is usually ever read by code paths effectively >> unreachable for non-device (e.g. socket) asyncs. >> >> It would still potentially allow set_async_direct_result to be called >> multiple times, but it wouldn't actually happen in practice unless >> something goes wrong. >> >> 2. async_set_initial_status() would have set initial_status; however, >> it is left with the default value STATUS_PENDING. If the actual >> status is something other than that, the handler closes the wait >> handle and async_satisfied (the only realconsumer of initial_status) >> would never be called anyway. >> >> For reasons above, this issue is not effectively observable or testable. >> Nonetheless, the current code does leave the async object in an >> inconsistent state. >> >> Fix this by setting the initial_status directly (and unsetting >> unknown_status as well). >> >> Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> >> --- >> >> Notes: >> v1 -> v2: no changes >> v2 -> v3: no changes >> >> server/async.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/server/async.c b/server/async.c >> index 7d0ff10f7a4..f078f42f34c 100644 >> --- a/server/async.c >> +++ b/server/async.c >> @@ -769,7 +769,8 @@ DECL_HANDLER(set_async_direct_result) >> return; >> } >> >> - async_set_initial_status( async, status ); >> + async->initial_status = status; >> + async->unknown_status = 0; >> >> if (status == STATUS_PENDING) >> { > > I feel like this raises further questions, like "why does > async_set_initial_status() assert async->unknown_status To prevent overwriting initial status that was already set, I guess? > but then return if async->terminated?" This function was introduced in commit 484b78bda01 (ntoskrnl: Report the initial status of an IRP separately from the IOSB status., 2021-09-12), but it provides no explanation. I guess it was to keep it in sync with set_async_pending()? That said, I suppose nothing will go wrong even if we pull out the !async->terminated check. Nobody really cares about the initial status after termination, except async_satisfied(). > > For IRPs I think the async can be terminated with unknown_status if the > process dies. I'm not sure if we have an actual bug here, This is not a bug (yet), but subsequent patches in this series require that the initial status is eventually set. > but conceptually we should probably be resetting unknown_status and setting > initial_status in async_set_result() if necessary. Great. > > Of course, if we do that, I think it becomes possible to call > async_set_initial_status() on an async which already has > !async->unknown_status, so that assert() would have to go away. Yeah, and also the !async->terminated check. -- Sincerely, Jinoh Kang

March 1, 2022

Re: [PATCH v3 3/4] programs/conhost/tests: add tests for ReadConsoleW with control

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=109521 Your paranoid android. === w10pro64_ja (64 bit report) === conhost.exe: tty: Timeout

March 1, 2022

Re: [PATCH v3 3/8] server: Defer postprocessing until after setting initial status in recv_socket handler.

by Jinoh Kang

On 2/26/22 03:42, Zebediah Figura (she/her) wrote: > On 2/21/22 11:23, Jinoh Kang wrote: >> This allows the client to postpone the initial I/O until after the >> server has actually queued the I/O request. The server should perform >> the postprocessing only after the initial I/O has been done. >> >> In the case of recv_socket, the manipulation of event flags shall >> ideally be done *after* (not *before*) the client has attempted the >> initial I/O, since the readiness of the socket may change in the >> meanwhile. >> >> Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> > > What's the point of doing this? Clarity, mostly. Clearing pending_events indicates that we're interested in polling I/O again. Since the recv() call has not yet happened, it means the incoming queue may still have pending data. One might reason that this will erroneously trigger AFD_POLL_READ event, even though the recv() call will consume all the remaining data. Now, the above scenario won't really happen since we never poll for POLLIN if async_waiting( &sock->read_q ) is false. I nonetheless find it much more intuitive to have the event flag cleared *after* performing the initial I/O. This also makes it consistent with the send_socket case. -- Sincerely, Jinoh Kang

March 1, 2022

Re: [PATCH vkd3d 06/10] include: Introduce a common macro for defining tags.

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=109533 Your paranoid android. === debian11 (build log) === Task: Patch failed to apply === debian11 (build log) === Task: Patch failed to apply

March 1, 2022

[PATCH vkd3d 10/10] vkd3d: Recognise newer memory properties in debug_vk_memory_property_flags().

by Henri Verbeet

The two _AMD properties would require bumping the version of the Vulkan headers we require; that doesn't seem worth it for making a FIXME go away. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/utils.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 873f840c..5f67c8b9 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -717,7 +717,7 @@ const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) { - char buffer[200]; + char buffer[320]; buffer[0] = '\0'; #define FLAG_TO_STR(f) if (flags & f) { strcat(buffer, " | "#f); flags &= ~f; } @@ -726,6 +726,11 @@ const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) FLAG_TO_STR(VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) FLAG_TO_STR(VK_MEMORY_PROPERTY_HOST_CACHED_BIT) FLAG_TO_STR(VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) + FLAG_TO_STR(VK_MEMORY_PROPERTY_PROTECTED_BIT) +#undef FLAG_TO_STR +#define FLAG_TO_STR(f, n) if (flags & f) { strcat(buffer, " | "#n); flags &= ~f; } + FLAG_TO_STR(0x40, VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD) + FLAG_TO_STR(0x80, VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD) #undef FLAG_TO_STR if (flags) FIXME("Unrecognized flag(s) %#x.\n", flags); -- 2.20.1

March 1, 2022

[PATCH vkd3d 09/10] vkd3d-shader/d3d-asm: Add an l-suffix on double literals.

by Henri Verbeet

Like fxc/d3dcompiler does. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index fde704a2..c292c847 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -775,7 +775,7 @@ static void shader_print_double_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%s", prefix, sign, compiler->colours.literal); vkd3d_string_buffer_print_f64(&compiler->buffer, d); - vkd3d_string_buffer_printf(&compiler->buffer, "%s%s", compiler->colours.reset, suffix); + vkd3d_string_buffer_printf(&compiler->buffer, "l%s%s", compiler->colours.reset, suffix); } static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler, -- 2.20.1

March 1, 2022