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

Jacek Caban : mshtml: Add IDOMMessageEvent stub implementation.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 223704aaedc2e6da59e1397338725f062205ead8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=223704aaedc2e6da59e13973… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 1 20:10:20 2022 +0100 mshtml: Add IDOMMessageEvent stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 145 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + include/mshtml.idl | 32 ++++++++++ 3 files changed, 179 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a44c1189b93..abf357a66ad 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2147,6 +2147,128 @@ static void DOMCustomEvent_destroy(DOMEvent *event) VariantClear(&custom_event->detail); } +typedef struct { + DOMEvent event; + IDOMMessageEvent IDOMMessageEvent_iface; +} DOMMessageEvent; + +static inline DOMMessageEvent *impl_from_IDOMMessageEvent(IDOMMessageEvent *iface) +{ + return CONTAINING_RECORD(iface, DOMMessageEvent, IDOMMessageEvent_iface); +} + +static HRESULT WINAPI DOMMessageEvent_QueryInterface(IDOMMessageEvent *iface, REFIID riid, void **ppv) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDOMEvent_QueryInterface(&This->event.IDOMEvent_iface, riid, ppv); +} + +static ULONG WINAPI DOMMessageEvent_AddRef(IDOMMessageEvent *iface) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDOMEvent_AddRef(&This->event.IDOMEvent_iface); +} + +static ULONG WINAPI DOMMessageEvent_Release(IDOMMessageEvent *iface) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDOMEvent_Release(&This->event.IDOMEvent_iface); +} + +static HRESULT WINAPI DOMMessageEvent_GetTypeInfoCount(IDOMMessageEvent *iface, UINT *pctinfo) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDispatchEx_GetTypeInfoCount(&This->event.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DOMMessageEvent_GetTypeInfo(IDOMMessageEvent *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDispatchEx_GetTypeInfo(&This->event.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DOMMessageEvent_GetIDsOfNames(IDOMMessageEvent *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDispatchEx_GetIDsOfNames(&This->event.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI DOMMessageEvent_Invoke(IDOMMessageEvent *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + return IDispatchEx_Invoke(&This->event.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DOMMessageEvent_get_data(IDOMMessageEvent *iface, BSTR *p) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + + FIXME("(%p)->(%p)\n", This, p); + + *p = NULL; + return S_OK; +} + +static HRESULT WINAPI DOMMessageEvent_get_origin(IDOMMessageEvent *iface, BSTR *p) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMMessageEvent_get_source(IDOMMessageEvent *iface, IHTMLWindow2 **p) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMMessageEvent_initMessageEvent(IDOMMessageEvent *iface, BSTR type, VARIANT_BOOL can_bubble, + VARIANT_BOOL cancelable, BSTR data, BSTR origin, + BSTR last_event_id, IHTMLWindow2 *source) +{ + DOMMessageEvent *This = impl_from_IDOMMessageEvent(iface); + FIXME("(%p)->(%s %x %x %s %s %s %p)\n", This, debugstr_w(type), can_bubble, cancelable, + debugstr_w(data), debugstr_w(origin), debugstr_w(last_event_id), source); + return E_NOTIMPL; +} + +static const IDOMMessageEventVtbl DOMMessageEventVtbl = { + DOMMessageEvent_QueryInterface, + DOMMessageEvent_AddRef, + DOMMessageEvent_Release, + DOMMessageEvent_GetTypeInfoCount, + DOMMessageEvent_GetTypeInfo, + DOMMessageEvent_GetIDsOfNames, + DOMMessageEvent_Invoke, + DOMMessageEvent_get_data, + DOMMessageEvent_get_origin, + DOMMessageEvent_get_source, + DOMMessageEvent_initMessageEvent +}; + +static DOMMessageEvent *DOMMessageEvent_from_DOMEvent(DOMEvent *event) +{ + return CONTAINING_RECORD(event, DOMMessageEvent, event); +} + +static void *DOMMessageEvent_query_interface(DOMEvent *event, REFIID riid) +{ + DOMMessageEvent *message_event = DOMMessageEvent_from_DOMEvent(event); + if(IsEqualGUID(&IID_IDOMMessageEvent, riid)) + return &message_event->IDOMMessageEvent_iface; + return NULL; +} + +static void DOMMessageEvent_destroy(DOMEvent *event) +{ +} static const tid_t DOMEvent_iface_tids[] = { IDOMEvent_tid, @@ -2214,6 +2336,19 @@ static dispex_static_data_t DOMCustomEvent_dispex = { DOMCustomEvent_iface_tids }; +static const tid_t DOMMessageEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMMessageEvent_tid, + 0 +}; + +dispex_static_data_t DOMMessageEvent_dispex = { + L"MessageEvent", + NULL, + DispDOMMessageEvent_tid, + DOMMessageEvent_iface_tids +}; + static BOOL check_event_iface(nsIDOMEvent *event, REFIID riid) { nsISupports *iface; @@ -2243,6 +2378,16 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev custom_event->event.destroy = DOMCustomEvent_destroy; event = &custom_event->event; dispex_data = &DOMCustomEvent_dispex; + }else if(event_id == EVENTID_MESSAGE) { + DOMMessageEvent *message_event = heap_alloc_zero(sizeof(*message_event)); + if(!message_event) + return NULL; + + message_event->IDOMMessageEvent_iface.lpVtbl = &DOMMessageEventVtbl; + message_event->event.query_interface = DOMMessageEvent_query_interface; + message_event->event.destroy = DOMMessageEvent_destroy; + event = &message_event->event; + dispex_data = &DOMMessageEvent_dispex; }else { event = heap_alloc_zero(sizeof(*event)); if(!event) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7ce97e01053..a94f1be1969 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -87,6 +87,7 @@ typedef struct EventTarget EventTarget; XDIID(DispDOMCustomEvent) \ XDIID(DispDOMEvent) \ XDIID(DispDOMKeyboardEvent) \ + XDIID(DispDOMMessageEvent) \ XDIID(DispDOMMouseEvent) \ XDIID(DispDOMUIEvent) \ XDIID(DispHTMLAnchorElement) \ @@ -147,6 +148,7 @@ typedef struct EventTarget EventTarget; XIID(IDOMCustomEvent) \ XIID(IDOMEvent) \ XIID(IDOMKeyboardEvent) \ + XIID(IDOMMessageEvent) \ XIID(IDOMMouseEvent) \ XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ diff --git a/include/mshtml.idl b/include/mshtml.idl index ef496b840ea..162a9691fb6 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -28462,6 +28462,38 @@ interface IDOMMessageEvent : IDispatch [in] IHTMLWindow2 *source); } +/***************************************************************************** + * DispDOMMessageEvent dispinterface + */ +[ + hidden, + uuid(30590092-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispDOMMessageEvent +{ +properties: +methods: + WINE_IDOMEVENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IDOMMESSAGEEVENT_DATA)] + BSTR data(); + + [propget, id(DISPID_IDOMMESSAGEEVENT_ORIGIN)] + BSTR origin(); + + [propget, id(DISPID_IDOMMESSAGEEVENT_SOURCE)] + IHTMLWindow2 *source(); + + [id(DISPID_IDOMMESSAGEEVENT_INITMESSAGEEVENT)] + void initMessageEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] BSTR data, + [in] BSTR origin, + [in] BSTR lastEventId, + [in] IHTMLWindow2 *source); +} /***************************************************************************** * IHTMLNamespaceCollection interface

1 0

Alexandre Julliard : configure: Check for working -mabi=ms support on x86_64.
by Alexandre Julliard March 1, 2022

March 1, 2022

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 SpeechRecognitionQualityDegradingEventArgs.
by Alexandre Julliard March 1, 2022

March 1, 2022

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

Alexandre Julliard : ntdll/tests: Avoid referencing a global variable from inline asm.
by Alexandre Julliard March 1, 2022

March 1, 2022

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

Eric Pouech : jscript/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

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

Bernhard Kölbl : include/windows.media.speechrecognition.idl: Add SpeechRecognizerUIOptions.
by Alexandre Julliard March 1, 2022

March 1, 2022

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

Rémi Bernon : include: Add Windows.Gaming.Input.HidGameControllerProvider runtimeclass definition.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 78ef8404255124680c12b611244b5c0ad53f963e URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ef8404255124680c12b611… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 09:32:34 2022 +0100 include: Add Windows.Gaming.Input.HidGameControllerProvider runtimeclass definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.custom.idl | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index 637e1d4abcf..acc15955368 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -35,10 +35,12 @@ namespace Windows.Gaming.Input.Custom { interface IGameControllerInputSink; interface IGameControllerProvider; interface IHidGameControllerInputSink; + interface IHidGameControllerProvider; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; interface IGameControllerFactoryManagerStatics2; runtimeclass GameControllerFactoryManager; + runtimeclass HidGameControllerProvider; [contract(Windows.Foundation.UniversalApiContract, 3.0)] enum XusbDeviceSubtype @@ -106,6 +108,24 @@ namespace Windows.Gaming.Input.Custom { [in, size_is(report_len)] BYTE *report_buf); } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Gaming.Input.Custom.HidGameControllerProvider), + uuid(95ce3af4-abf0-4b68-a081-3b7de73ff0e7) + ] + interface IHidGameControllerProvider : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerProvider + { + [propget] HRESULT UsageId([out, retval] UINT16 *value); + [propget] HRESULT UsagePage([out, retval] UINT16 *value); + HRESULT GetFeatureReport([in] BYTE id, [in] UINT32 report_len, + [out, size_is(report_len)] BYTE *report_buf); + HRESULT SendFeatureReport([in] BYTE id, [in] UINT32 report_len, + [in, size_is(report_len)] BYTE *report_buf); + HRESULT SendOutputReport([in] BYTE id, [in] UINT32 report_len, + [in, size_is(report_len)] BYTE *report_buf); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(69a0ae5e-758e-4cbe-ace6-62155fe9126f) @@ -157,4 +177,15 @@ namespace Windows.Gaming.Input.Custom { runtimeclass GameControllerFactoryManager { } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass HidGameControllerProvider + { + [default] interface Windows.Gaming.Input.Custom.IHidGameControllerProvider; + interface Windows.Gaming.Input.Custom.IGameControllerProvider; + } }

1 0

Esme Povirk : mscoree: Add an override option for skipping the AppDomain search path.
by Alexandre Julliard March 1, 2022

March 1, 2022

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

Eric Pouech : mpr/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 93707e9306fc64161ada9beec5bb998b6d60b34e URL: https://source.winehq.org/git/wine.git/?a=commit;h=93707e9306fc64161ada9bee… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:19 2022 +0100 mpr/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/mpr/tests/Makefile.in | 1 - dlls/mpr/tests/mpr.c | 74 +++++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93707e9306fc64161ada…

1 0

Eric Pouech : msado15/tests: Use correct integral type.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 1a4ff1e8237db2d2ecd6a56eceed20d90f2e7409 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a4ff1e8237db2d2ecd6a56e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:31 2022 +0100 msado15/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/tests/msado15.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index f5473c72cfb..9ccba929993 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -676,7 +676,7 @@ static void test_Fields(void) LONG count; ADO_LONGPTR size; DataTypeEnum type; - FieldAttributeEnum attrs; + LONG attrs; HRESULT hr; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset );

1 0