February 2022 - Wine-Commits

Paul Gofman : winhttp: Don't allow websocket send if another non-control send is pending.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: 11c835d4718aff84c8250084128f29a7fb7e7ef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11c835d4718aff84c8250084… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 28 12:37:49 2022 +0100 winhttp: Don't allow websocket send if another non-control send is pending. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 16 +++++++++++++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d0732952e11..de011060236 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3349,6 +3349,7 @@ static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx else ret = socket_send( s->socket, s->type, s->buf, s->len, NULL ); send_io_complete( &s->socket->hdr ); + InterlockedExchange( &s->socket->pending_noncontrol_send, 0 ); socket_send_complete( s->socket, ret, s->type, s->len ); release_object( &s->socket->hdr ); @@ -3386,8 +3387,16 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ BOOL async_send, complete_async = FALSE; struct socket_send *s; + if (InterlockedCompareExchange( &socket->pending_noncontrol_send, 1, 0 )) + { + WARN( "Previous send is still queued.\n" ); + release_object( &socket->hdr ); + return ERROR_INVALID_OPERATION; + } + if (!(s = malloc( sizeof(*s) ))) { + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); release_object( &socket->hdr ); return ERROR_OUTOFMEMORY; } @@ -3417,11 +3426,16 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ if ((ret = queue_task( &socket->send_q, task_socket_send, s ))) { InterlockedDecrement( &socket->hdr.pending_sends ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); release_object( &socket->hdr ); free( s ); } } - else InterlockedDecrement( &socket->hdr.pending_sends ); + else + { + InterlockedDecrement( &socket->hdr.pending_sends ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); + } ReleaseSRWLockExclusive( &socket->send_lock ); if (!async_send) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 732f0afaa88..cf6655f561f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -260,6 +260,7 @@ struct socket unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; SRWLOCK send_lock; + volatile LONG pending_noncontrol_send; }; struct send_request

1 0

Eric Pouech : conhost/tests: Add tests for shift-tab processing.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: accacf1a493eebd8d04e5e2b8583782f3001d77e URL: https://source.winehq.org/git/wine.git/?a=commit;h=accacf1a493eebd8d04e5e2b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 18:05:40 2022 +0100 conhost/tests: Add tests for shift-tab processing. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index eab3c37f0d9..1857cdd4aad 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1295,6 +1295,7 @@ static void test_tty_input(void) { "\x1b[D", 0, VK_LEFT, 0 }, { "\x1b[H", 0, VK_HOME, 0 }, { "\x1b[F", 0, VK_END, 0 }, + { "\x1b[Z", 0x9, VK_TAB, SHIFT_PRESSED }, { "\x1b[2~", 0, VK_INSERT, 0 }, { "\x1b[3~", 0, VK_DELETE, 0 }, { "\x1b[5~", 0, VK_PRIOR, 0 }, @@ -1304,8 +1305,8 @@ static void test_tty_input(void) { "\x1b[18~", 0, VK_F7, 0 }, { "\x1b[19~", 0, VK_F8, 0 }, { "\x1b[20~", 0, VK_F9, 0 }, - { "\x1b[21~", 0, VK_F10, 0 }, /* 0x10 */ + { "\x1b[21~", 0, VK_F10, 0 }, { "\x1b[23~", 0, VK_F11, 0 }, { "\x1b[24~", 0, VK_F12, 0 }, { "\x1bOP", 0, VK_F1, 0 }, @@ -1321,8 +1322,8 @@ static void test_tty_input(void) { "\x1b[1;7A", 0, VK_UP, LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, { "\x1b[1;8A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED }, { "\x1b[1;9A", 0, VK_UP, 0 }, - { "\x1b[1;10A", 0, VK_UP, SHIFT_PRESSED }, /* 0x20 */ + { "\x1b[1;10A", 0, VK_UP, SHIFT_PRESSED }, { "\x1b[1;11A", 0, VK_UP, LEFT_ALT_PRESSED }, { "\x1b[1;12A", 0, VK_UP, SHIFT_PRESSED | LEFT_ALT_PRESSED }, { "\x1b[1;13A", 0, VK_UP, LEFT_CTRL_PRESSED }, @@ -1338,6 +1339,7 @@ static void test_tty_input(void) { "\x1b""1", '1', '1', LEFT_ALT_PRESSED }, { "\x1b""x", 'x', 'X', LEFT_ALT_PRESSED }, { "\x1b""[", '[', VK_OEM_4, LEFT_ALT_PRESSED }, + /* 0x30 */ { "\x7f", '\b', VK_BACK, 0 }, };

1 0

Rémi Bernon : windows.gaming.input: Introduce a generic IVector<IInspectable *> implementation.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: 46f4975b050038daa61c93d8512654489fddad3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46f4975b050038daa61c93d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 26 18:35:13 2022 +0100 windows.gaming.input: Introduce a generic IVector<IInspectable *> implementation. And use it to factor all the IVectorView<T> stubs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 3 +- dlls/windows.gaming.input/controller.c | 134 +--------- dlls/windows.gaming.input/gamepad.c | 133 +--------- dlls/windows.gaming.input/private.h | 2 + dlls/windows.gaming.input/vector.c | 464 +++++++++++++++++++++++++++++++++ include/windows.foundation.idl | 2 + include/windows.gaming.input.idl | 2 + 7 files changed, 498 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46f4975b050038daa61c…

1 0

Eric Pouech : conhost: Handle csi escape sequence for shift tab.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: 5b3bc2eeb44185ab36db56a8f53b025c1b85dca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b3bc2eeb44185ab36db56a8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 23 18:05:34 2022 +0100 conhost: Handle csi escape sequence for shift tab. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8b03d749d21..ae1f4e35f41 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1507,8 +1507,11 @@ static void char_key_press( struct console *console, WCHAR ch, unsigned int ctrl key_press( console, ch, vk, ctrl ); } -static unsigned int escape_char_to_vk( WCHAR ch ) +static unsigned int escape_char_to_vk( WCHAR ch, unsigned int *ctrl, WCHAR *outuch ) { + if (ctrl) *ctrl = 0; + if (outuch) *outuch = '\0'; + switch (ch) { case 'A': return VK_UP; @@ -1521,6 +1524,8 @@ static unsigned int escape_char_to_vk( WCHAR ch ) case 'Q': return VK_F2; case 'R': return VK_F3; case 'S': return VK_F4; + case 'Z': if (ctrl && outuch) {*ctrl = SHIFT_PRESSED; *outuch = '\t'; return VK_TAB;} + return 0; default: return 0; } } @@ -1558,7 +1563,8 @@ static unsigned int convert_modifiers( unsigned int n ) static unsigned int process_csi_sequence( struct console *console, const WCHAR *buf, size_t size ) { - unsigned int n, count = 0, params[8], params_cnt = 0, vk; + unsigned int n, count = 0, params[8], params_cnt = 0, vk, ctrl; + WCHAR outuch; for (;;) { @@ -1572,9 +1578,9 @@ static unsigned int process_csi_sequence( struct console *console, const WCHAR * if (++count == size) return 0; } - if ((vk = escape_char_to_vk( buf[count] ))) + if ((vk = escape_char_to_vk( buf[count], &ctrl, &outuch ))) { - key_press( console, 0, vk, params_cnt >= 2 ? convert_modifiers( params[1] ) : 0 ); + key_press( console, outuch, vk, params_cnt >= 2 ? convert_modifiers( params[1] ) : ctrl ); return count + 1; } @@ -1610,7 +1616,7 @@ static unsigned int process_input_escape( struct console *console, const WCHAR * case 'O': if (++count == size) break; - vk = escape_char_to_vk( buf[1] ); + vk = escape_char_to_vk( buf[1], NULL, NULL ); if (vk) { key_press( console, 0, vk, 0 );

1 0

Rémi Bernon : windows.gaming.input: Split Gamepad runtimeclass to a separate source.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: c565d0035edd81077736ee007ae832a46fc958fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c565d0035edd81077736ee00… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 26 18:35:12 2022 +0100 windows.gaming.input: Split Gamepad runtimeclass to a separate source. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/gamepad.c | 339 +++++++++++++++++++++++++++++++++ dlls/windows.gaming.input/main.c | 341 +--------------------------------- dlls/windows.gaming.input/private.h | 1 + 4 files changed, 342 insertions(+), 340 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c565d0035edd81077736…

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognizerTimeouts.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: d6900bccab58170a926ac96df0a9b7d0c5a0ef15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6900bccab58170a926ac96d… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Sat Feb 26 09:27:33 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognizerTimeouts. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechrecognition.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 2cd6170ec42..ebcd579865d 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -46,6 +46,7 @@ namespace Windows { interface ISpeechRecognitionResult; interface ISpeechRecognitionResult2; interface ISpeechRecognitionSemanticInterpretation; + interface ISpeechRecognizerTimeouts; runtimeclass SpeechContinuousRecognitionCompletedEventArgs; runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; runtimeclass SpeechContinuousRecognitionSession; @@ -53,6 +54,7 @@ namespace Windows { runtimeclass SpeechRecognitionHypothesisGeneratedEventArgs; runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; + runtimeclass SpeechRecognizerTimeouts; } } } @@ -246,6 +248,21 @@ 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.SpeechRecognizerTimeouts), + uuid(2ef76fca-6a3c-4dca-a153-df1bc88a79af) + ] + interface ISpeechRecognizerTimeouts : IInspectable + { + [propget] HRESULT InitialSilenceTimeout([out, retval] Windows.Foundation.TimeSpan *value); + [propput] HRESULT InitialSilenceTimeout([in] Windows.Foundation.TimeSpan value); + [propget] HRESULT EndSilenceTimeout([out, retval] Windows.Foundation.TimeSpan *value); + [propput] HRESULT EndSilenceTimeout([in] Windows.Foundation.TimeSpan value); + [propget] HRESULT BabbleTimeout([out, retval] Windows.Foundation.TimeSpan *value); + [propput] HRESULT BabbleTimeout([in] Windows.Foundation.TimeSpan value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -314,6 +331,15 @@ namespace Windows { { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionSemanticInterpretation; } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognizerTimeouts + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognizerTimeouts; + } } } }

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognitionHypothesis.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: dc1d318ea27a72841c2b94926935af57e410c02c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc1d318ea27a72841c2b9492… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Sat Feb 26 09:27:31 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognitionHypothesis. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechrecognition.idl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index ad0590bcae6..d921241ac55 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -41,12 +41,14 @@ namespace Windows { interface ISpeechContinuousRecognitionResultGeneratedEventArgs; interface ISpeechContinuousRecognitionSession; interface ISpeechRecognitionConstraint; + interface ISpeechRecognitionHypothesis; interface ISpeechRecognitionResult; interface ISpeechRecognitionResult2; interface ISpeechRecognitionSemanticInterpretation; runtimeclass SpeechContinuousRecognitionCompletedEventArgs; runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; runtimeclass SpeechContinuousRecognitionSession; + runtimeclass SpeechRecognitionHypothesis; runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; } @@ -184,6 +186,16 @@ namespace Windows { [propput] HRESULT Probability([in] Windows.Media.SpeechRecognition.SpeechRecognitionConstraintProbability value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionHypothesis), + uuid(7a7b25b0-99c5-4f7d-bf84-10aa1302b634) + ] + interface ISpeechRecognitionHypothesis : IInspectable + { + [propget] HRESULT Text([out, retval] HSTRING *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionResult), @@ -252,6 +264,16 @@ namespace Windows { [default] interface Windows.Media.SpeechRecognition.ISpeechContinuousRecognitionSession; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass SpeechRecognitionHypothesis + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionHypothesis; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile)

1 0

Rémi Bernon : windows.gaming.input: Split RawGameController runtimeclass to separate source.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: e8219b59895baf0072a949395d559ba4849d7713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8219b59895baf0072a94939… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 26 18:35:11 2022 +0100 windows.gaming.input: Split RawGameController runtimeclass to separate source. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/controller.c | 348 +++++++++++++++++++++++++++++++++ dlls/windows.gaming.input/main.c | 289 ++------------------------- dlls/windows.gaming.input/private.h | 37 ++++ 4 files changed, 403 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8219b59895baf0072a9…

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognitionHypothesisGeneratedEventArgs.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: c4147e92cfa0cd4d8b8fad460cd9d4ccfb901e66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4147e92cfa0cd4d8b8fad46… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Sat Feb 26 09:27:32 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognitionHypothesisGeneratedEventArgs. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechrecognition.idl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index d921241ac55..2cd6170ec42 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -42,6 +42,7 @@ namespace Windows { interface ISpeechContinuousRecognitionSession; interface ISpeechRecognitionConstraint; interface ISpeechRecognitionHypothesis; + interface ISpeechRecognitionHypothesisGeneratedEventArgs; interface ISpeechRecognitionResult; interface ISpeechRecognitionResult2; interface ISpeechRecognitionSemanticInterpretation; @@ -49,6 +50,7 @@ namespace Windows { runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; runtimeclass SpeechContinuousRecognitionSession; runtimeclass SpeechRecognitionHypothesis; + runtimeclass SpeechRecognitionHypothesisGeneratedEventArgs; runtimeclass SpeechRecognitionResult; runtimeclass SpeechRecognitionSemanticInterpretation; } @@ -196,6 +198,16 @@ namespace Windows { [propget] HRESULT Text([out, retval] HSTRING *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionHypothesisGeneratedEventArgs), + uuid(55161a7a-8023-5866-411d-1213bb271476) + ] + interface ISpeechRecognitionHypothesisGeneratedEventArgs : IInspectable + { + [propget] HRESULT Hypothesis([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionHypothesis **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionResult), @@ -274,6 +286,16 @@ namespace Windows { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionHypothesis; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass SpeechRecognitionHypothesisGeneratedEventArgs + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionHypothesisGeneratedEventArgs; + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile)

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognitionResult.
by Alexandre Julliard Feb. 28, 2022

Feb. 28, 2022

Module: wine Branch: master Commit: e0ab86d60161b22906e0adf6baf091227b0becf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0ab86d60161b22906e0adf6… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Sat Feb 26 09:27:29 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognitionResult. And its dependencies. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.media.speechrecognition.idl | 96 +++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 65c9d5ef8da..0e7be63036d 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -32,9 +32,16 @@ import "windows.globalization.idl"; namespace Windows { namespace Media { namespace SpeechRecognition { + typedef enum SpeechRecognitionConfidence SpeechRecognitionConfidence; typedef enum SpeechRecognitionConstraintProbability SpeechRecognitionConstraintProbability; typedef enum SpeechRecognitionConstraintType SpeechRecognitionConstraintType; + typedef enum SpeechRecognitionResultStatus SpeechRecognitionResultStatus; interface ISpeechRecognitionConstraint; + interface ISpeechRecognitionResult; + interface ISpeechRecognitionResult2; + interface ISpeechRecognitionSemanticInterpretation; + runtimeclass SpeechRecognitionResult; + runtimeclass SpeechRecognitionSemanticInterpretation; } } } @@ -43,6 +50,9 @@ namespace Windows { namespace Media { namespace SpeechRecognition { declare { + interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechRecognition.SpeechRecognitionResult*>; + interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechRecognition.SpeechRecognitionResult*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechRecognition.SpeechRecognitionResult*>; } } } @@ -52,6 +62,15 @@ namespace Windows { namespace Media { namespace SpeechRecognition { + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechRecognitionConfidence + { + High = 0, + Medium = 1, + Low = 2, + Rejected = 3, + }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] enum SpeechRecognitionConstraintProbability { @@ -69,6 +88,26 @@ namespace Windows { VoiceCommandDefinition = 3, }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum SpeechRecognitionResultStatus + { + Success = 0, + TopicLanguageNotSupported = 1, + GrammarLanguageMismatch = 2, + GrammarCompilationFailure = 3, + AudioQualityFailure = 4, + UserCanceled = 5, + Unknown = 6, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TimeoutExceeded = 7, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + PauseLimitExceeded = 8, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NetworkFailure = 9, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + MicrophoneUnavailable = 10, + }; + [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(79ac1628-4d68-43c4-8911-40dc4101b55b) @@ -83,6 +122,63 @@ namespace Windows { [propget] HRESULT Probability([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionConstraintProbability *value); [propput] HRESULT Probability([in] Windows.Media.SpeechRecognition.SpeechRecognitionConstraintProbability value); } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionResult), + uuid(4e303157-034e-4652-857e-d0454cc4beec) + ] + interface ISpeechRecognitionResult : IInspectable + { + [propget] HRESULT Status([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionResultStatus *value); + [propget] HRESULT Text([out, retval] HSTRING *value); + [propget] HRESULT Confidence([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionConfidence *value); + [propget] HRESULT SemanticInterpretation([out, retval] Windows.Media.SpeechRecognition.SpeechRecognitionSemanticInterpretation **value); + HRESULT GetAlternates([in] UINT32 max_amount, [out, retval] Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechRecognition.SpeechRecognitionResult*> **results); + [propget] HRESULT Constraint([out, retval] Windows.Media.SpeechRecognition.ISpeechRecognitionConstraint **value); + [propget] HRESULT RulePath([out, retval] Windows.Foundation.Collections.IVectorView<HSTRING> **value); + [propget] HRESULT RawConfidence([out, retval] DOUBLE *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionResult), + uuid(af7ed1ba-451b-4166-a0c1-1ffe84032d03) + ] + interface ISpeechRecognitionResult2 : IInspectable + { + [propget] HRESULT PhraseStartTime([out, retval] Windows.Foundation.DateTime *value); + [propget] HRESULT PhraseDuration([out, retval] Windows.Foundation.TimeSpan *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.SpeechRecognitionSemanticInterpretation), + uuid(aae1da9b-7e32-4c1f-89fe-0c65f486f52e) + ] + interface ISpeechRecognitionSemanticInterpretation : IInspectable + { + [propget] HRESULT Properties([out, retval] Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognitionResult + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionResult; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Media.SpeechRecognition.ISpeechRecognitionResult2; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechRecognitionSemanticInterpretation + { + [default] interface Windows.Media.SpeechRecognition.ISpeechRecognitionSemanticInterpretation; + } } } }

1 0