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

Eric Pouech : netprofm/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 722ecd5e6549ffb20fc7c08deda83e978fdbb446 URL: https://source.winehq.org/git/wine.git/?a=commit;h=722ecd5e6549ffb20fc7c08d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:35:07 2022 +0100 netprofm/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/tests/Makefile.in | 1 - dlls/netprofm/tests/list.c | 96 ++++++++++++++++++++--------------------- 2 files changed, 48 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=722ecd5e6549ffb20fc7…

1 0

Eric Pouech : ieframe/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 964a6e995332cbe01fcc7bf3cbd1360bf581e856 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964a6e995332cbe01fcc7bf3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:26:27 2022 +0100 ieframe/tests: Enable compilation with long types. 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> --- dlls/ieframe/tests/Makefile.in | 1 - dlls/ieframe/tests/ie.c | 36 +-- dlls/ieframe/tests/intshcut.c | 72 ++--- dlls/ieframe/tests/webbrowser.c | 630 ++++++++++++++++++++-------------------- 4 files changed, 369 insertions(+), 370 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=964a6e995332cbe01fcc…

1 0

Eric Pouech : jscript/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 030a6860101628ee38c7c60539a1566f7ee3089f URL: https://source.winehq.org/git/wine.git/?a=commit;h=030a6860101628ee38c7c605… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 28 08:27:15 2022 +0100 jscript/tests: Enable compilation with long types. 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> --- dlls/jscript/tests/Makefile.in | 1 - dlls/jscript/tests/activex.c | 60 ++-- dlls/jscript/tests/caller.c | 32 +-- dlls/jscript/tests/jscript.c | 608 ++++++++++++++++++++--------------------- dlls/jscript/tests/run.c | 434 ++++++++++++++--------------- 5 files changed, 567 insertions(+), 568 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=030a6860101628ee38c7…

1 0

Eric Pouech : dsound/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 5adca71cd7906b2ca9b7c101004f4158cbcdc9a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5adca71cd7906b2ca9b7c101… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:32:42 2022 +0100 dsound/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/Makefile.in | 1 - dlls/dsound/tests/capture.c | 150 +++++++-------- dlls/dsound/tests/ds3d.c | 250 ++++++++++++------------- dlls/dsound/tests/ds3d8.c | 238 +++++++++++------------ dlls/dsound/tests/dsound.c | 386 +++++++++++++++++++------------------- dlls/dsound/tests/dsound8.c | 426 +++++++++++++++++++++--------------------- dlls/dsound/tests/duplex.c | 76 ++++---- dlls/dsound/tests/propset.c | 124 ++++++------ 8 files changed, 825 insertions(+), 826 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5adca71cd7906b2ca9b7…

1 0

Esme Povirk : mscoree: Add an override option for skipping the AppDomain search path.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 6a0d678abb0bcf1496a105b3511de113813a73eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a0d678abb0bcf1496a105b3… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Feb 28 14:49:16 2022 -0600 mscoree: Add an override option for skipping the AppDomain search path. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 36 +++++++++++++++++++++++++++++++++--- dlls/mscoree/mscoree_private.h | 2 ++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 8e28ad2f8db..c72f510c8ac 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -130,10 +130,12 @@ MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); +static void (CDECL *wine_mono_install_assembly_preload_hook)(WineMonoAssemblyPreLoadFunc func, void *user_data); static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +static MonoAssembly* CDECL wine_mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, int *search_path, void *user_data); static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof); @@ -249,6 +251,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_OPT_MONO_FUNCTION(mono_set_crash_chaining, set_crash_chaining_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_print_handler, set_print_handler_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_printerr_handler, set_print_handler_dummy); + LOAD_OPT_MONO_FUNCTION(wine_mono_install_assembly_preload_hook, NULL); #undef LOAD_OPT_MONO_FUNCTION @@ -279,7 +282,10 @@ static HRESULT load_mono(LPCWSTR mono_path) mono_config_parse(NULL); - mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); + if (wine_mono_install_assembly_preload_hook) + wine_mono_install_assembly_preload_hook(wine_mono_assembly_preload_hook_fn, NULL); + else + mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); aot_size = GetEnvironmentVariableA("WINE_MONO_AOT", aot_setting, sizeof(aot_setting)); @@ -1366,6 +1372,9 @@ HRESULT CLRMetaHostPolicy_CreateInstance(REFIID riid, void **ppobj) * WINE_MONO_OVERRIDES=*,Gac=n * Never search the GAC for libraries. * + * WINE_MONO_OVERRIDES=*,PrivatePath=n + * Never search the AppDomain search path for libraries. + * * WINE_MONO_OVERRIDES=Microsoft.Xna.Framework,Gac=n * Never search the GAC for Microsoft.Xna.Framework * @@ -1377,7 +1386,8 @@ HRESULT CLRMetaHostPolicy_CreateInstance(REFIID riid, void **ppobj) /* assembly search override flags */ #define ASSEMBLY_SEARCH_GAC 1 #define ASSEMBLY_SEARCH_UNDEFINED 2 -#define ASSEMBLY_SEARCH_DEFAULT ASSEMBLY_SEARCH_GAC +#define ASSEMBLY_SEARCH_PRIVATEPATH 4 +#define ASSEMBLY_SEARCH_DEFAULT (ASSEMBLY_SEARCH_GAC|ASSEMBLY_SEARCH_PRIVATEPATH) typedef struct override_entry { char *name; @@ -1426,6 +1436,14 @@ static void parse_override_entry(override_entry *entry, const char *string, int entry->flags &= ~ASSEMBLY_SEARCH_GAC; } break; + case 11: + if (!_strnicmp(string, "privatepath", 11)) { + if (IS_OPTION_TRUE(*value)) + entry->flags |= ASSEMBLY_SEARCH_PRIVATEPATH; + else if (IS_OPTION_FALSE(*value)) + entry->flags &= ~ASSEMBLY_SEARCH_PRIVATEPATH; + } + break; default: break; } @@ -1688,6 +1706,12 @@ static MonoAssembly* mono_assembly_try_load(WCHAR *path) } static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +{ + int dummy; + return wine_mono_assembly_preload_hook_fn(aname, assemblies_path, &dummy, user_data); +} + +static MonoAssembly* CDECL wine_mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, int *halt_search, void *user_data) { HRESULT hr; MonoAssembly *result=NULL; @@ -1720,7 +1744,7 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname if (!stringname || !assemblyname) return NULL; search_flags = get_assembly_search_flags(aname); - if (private_path) + if (private_path && (search_flags & ASSEMBLY_SEARCH_PRIVATEPATH) != 0) { stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, assemblyname, -1, NULL, 0); stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); @@ -1798,6 +1822,12 @@ static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname else TRACE("skipping Windows GAC search due to override setting\n"); + if ((search_flags & ASSEMBLY_SEARCH_PRIVATEPATH) == 0) + { + TRACE("skipping AppDomain search path due to override setting\n"); + *halt_search = 1; + } + done: HeapFree(GetProcessHeap(), 0, cultureW); mono_free(stringname); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 67b37482c5a..8f3441cd84e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -143,6 +143,8 @@ typedef enum { typedef MonoAssembly* (CDECL *MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data); +typedef MonoAssembly* (CDECL *WineMonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, int *halt_search, void *user_data); + typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof); typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout);

1 0

Alexandre Julliard : ntdll/tests: Avoid referencing a global variable from inline asm.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: bf3ef684e254d706b43e8869e0c78bd264a9b840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3ef684e254d706b43e8869… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 17:17:33 2022 +0100 ntdll/tests: Avoid referencing a global variable from inline asm. It breaks on old gccs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 4307016f149..549a05b0ece 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -9068,7 +9068,7 @@ static DWORD test_extended_context_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGI done: #ifdef __GNUC__ - __asm__ volatile("vmovups %0,%%ymm0" : : "m"(test_extended_context_spoil_data2)); + __asm__ volatile("vmovups (%0),%%ymm0" : : "r"(test_extended_context_spoil_data2)); #endif #ifdef __x86_64__ ++context->Rip;

1 0

Alexandre Julliard : configure: Check for working -mabi=ms support on x86_64.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 9226d0c3d88bfa2c87daf0cd4a5ef2db54fa5a9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9226d0c3d88bfa2c87daf0cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 1 14:32:27 2022 +0100 configure: Check for working -mabi=ms support on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 45 ++++++++++++++++++++++++++------------------- configure.ac | 12 +++++++++++- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 2597bc0e791..d757194be45 100755 --- a/configure +++ b/configure @@ -19273,34 +19273,41 @@ if test "x$ac_cv_cflags__Wno_format" = xyes then : EXTRACFLAGS="$EXTRACFLAGS -Wno-format" fi ;; - *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -mabi=ms" >&5 -printf %s "checking whether the compiler supports -mabi=ms... " >&6; } -if test ${ac_cv_cflags__mabi_ms+y} + *) if test -z "$CROSSTARGET" + then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working -mabi=ms" >&5 +printf %s "checking for working -mabi=ms... " >&6; } +if test ${ac_cv_mabi_ms+y} then : printf %s "(cached) " >&6 else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -mabi=ms" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + CFLAGS="$CFLAGS -mabi=ms" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } +#include <stdarg.h> +int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); } +int +main (void) +{ + + ; + return 0; +} _ACEOF -if ac_fn_c_try_link "$LINENO" +if ac_fn_c_try_compile "$LINENO" then : - ac_cv_cflags__mabi_ms=yes + ac_cv_mabi_ms=yes else $as_nop - ac_cv_cflags__mabi_ms=no + ac_cv_mabi_ms=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CFLAGS=$saved_CFLAGS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__mabi_ms" >&5 -printf "%s\n" "$ac_cv_cflags__mabi_ms" >&6; } -if test "x$ac_cv_cflags__mabi_ms" = xyes -then : - MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" -fi ;; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mabi_ms" >&5 +printf "%s\n" "$ac_cv_mabi_ms" >&6; } + test $ac_cv_mabi_ms = yes || as_fn_error $? "The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64." "$LINENO" 5 + fi + MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;; esac ;; esac diff --git a/configure.ac b/configure.ac index d14cc396e51..7881af45e5b 100644 --- a/configure.ac +++ b/configure.ac @@ -1893,7 +1893,17 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= dnl Mingw uses Windows 64-bit types, not Unix ones cygwin*|mingw32*) WINE_TRY_CFLAGS([-Wno-format]) ;; dnl Default to ms_abi on 64-bit - *) WINE_TRY_CFLAGS([-mabi=ms],[MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms"]) ;; + *) if test -z "$CROSSTARGET" + then + AC_CACHE_CHECK([for working -mabi=ms], ac_cv_mabi_ms, + [CFLAGS="$CFLAGS -mabi=ms" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h> +int a(int b, ...) { __builtin_ms_va_list list; __builtin_ms_va_start(list,b); }]])], + [ac_cv_mabi_ms=yes],[ac_cv_mabi_ms=no]) + CFLAGS=$saved_CFLAGS]) + test $ac_cv_mabi_ms = yes || AC_MSG_ERROR([The compiler doesn't support -mabi=ms. Use gcc instead of clang, or install mingw-w64.]) + fi + MSVCRTFLAGS="$MSVCRTFLAGS -mabi=ms" ;; esac ;; esac

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognizerUIOptions.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: b5147ad87c5dece9e2747d6398f98b0b79d7edbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5147ad87c5dece9e2747d63… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 1 17:42:36 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognizerUIOptions. 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 | 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; + } } } }

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognitionCompilationResult.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 71d9e9663aa09f17584286df4add56d86498893d URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d9e9663aa09f17584286df… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 1 17:42:37 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognitionCompilationResult. 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 | 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),

1 0

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognitionQualityDegradingEventArgs.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 9f78b0a6464fafb0427fcb99e93e13e52a2c941d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f78b0a6464fafb0427fcb99… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 1 17:42:38 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognitionQualityDegradingEventArgs. And a needed enum. 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 | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index c9e1305fcac..87e8d4c7bf5 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)

1 0