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

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

01 Mar '22

Module: wine Branch: master Commit: d86c22ee284c5174b3311ca4f3154288fcf31b4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86c22ee284c5174b3311ca4… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Tue Mar 1 17:42:39 2022 +0100 include/windows.media.speechrecognition.idl: Add SpeechRecognizerStateChangedEventArgs. 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 | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 87e8d4c7bf5..b0c0f864b22 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)

1 0

Hans Leidekker : wusa: Use CRT allocation functions.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: f0f125f5c5e735021ca97d7442f9fa174dd97c3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f125f5c5e735021ca97d74… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 1 11:42:59 2022 +0100 wusa: Use CRT allocation functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/main.c | 72 ++++++++++++++++++++++++------------------------ programs/wusa/manifest.c | 52 +++++++++++++++++----------------- programs/wusa/wusa.h | 35 +++-------------------- 3 files changed, 66 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0f125f5c5e735021ca9…

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.IGameControllerInputSink interface definition.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 436782f587e8563c7c4f8c0dbcb26382f6d8409e URL: https://source.winehq.org/git/wine.git/?a=commit;h=436782f587e8563c7c4f8c0d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 09:32:32 2022 +0100 include: Add Windows.Gaming.Input.IGameControllerInputSink interface 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index a95ec9db482..d059f35dddd 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -32,6 +32,7 @@ namespace Windows.Gaming.Input.Custom { typedef enum XusbDeviceSubtype XusbDeviceSubtype; typedef enum XusbDeviceType XusbDeviceType; typedef struct GameControllerVersionInfo GameControllerVersionInfo; + interface IGameControllerInputSink; interface IGameControllerProvider; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; @@ -70,6 +71,16 @@ namespace Windows.Gaming.Input.Custom { UINT16 Revision; }; + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + uuid(1ff6f922-c640-4c78-a820-9a715c558bcb) + ] + interface IGameControllerInputSink : IInspectable + { + HRESULT OnInputResumed([in] UINT64 timestamp); + HRESULT OnInputSuspended([in] UINT64 timestamp); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(e6d73982-2996-4559-b16c-3e57d46e58d6)

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.IHidGameControllerInputSink interface definition.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: cf47f7121a35de0761e6ddccc68995253caa2da9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf47f7121a35de0761e6ddcc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 09:32:33 2022 +0100 include: Add Windows.Gaming.Input.IHidGameControllerInputSink interface 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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index d059f35dddd..637e1d4abcf 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -34,6 +34,7 @@ namespace Windows.Gaming.Input.Custom { typedef struct GameControllerVersionInfo GameControllerVersionInfo; interface IGameControllerInputSink; interface IGameControllerProvider; + interface IHidGameControllerInputSink; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; interface IGameControllerFactoryManagerStatics2; @@ -94,6 +95,17 @@ namespace Windows.Gaming.Input.Custom { [propget] HRESULT IsConnected([out, retval] boolean *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + uuid(f754c322-182d-40e4-a126-fcee4ffa1e31) + ] + interface IHidGameControllerInputSink : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerInputSink + { + HRESULT OnInputReportReceived([in] UINT64 timestamp, [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)

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.HidGameControllerProvider runtimeclass definition.
by Alexandre Julliard 01 Mar '22

01 Mar '22

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

Rémi Bernon : include: Add Windows.Gaming.Input.IXusbGameControllerInputSink interface definition.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: e762b5c45091172700d1b0f2fa152dbb2029ab8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e762b5c45091172700d1b0f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 09:32:35 2022 +0100 include: Add Windows.Gaming.Input.IXusbGameControllerInputSink interface 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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index acc15955368..3d188ed5cf0 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -36,6 +36,7 @@ namespace Windows.Gaming.Input.Custom { interface IGameControllerProvider; interface IHidGameControllerInputSink; interface IHidGameControllerProvider; + interface IXusbGameControllerInputSink; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; interface IGameControllerFactoryManagerStatics2; @@ -126,6 +127,17 @@ namespace Windows.Gaming.Input.Custom { [in, size_is(report_len)] BYTE *report_buf); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + uuid(b2ac1d95-6ecb-42b3-8aab-025401ca4712) + ] + interface IXusbGameControllerInputSink : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerInputSink + { + HRESULT OnInputReceived([in] UINT64 timestamp, [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)

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.XusbGameControllerProvider runtimeclass definition.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 189a2eadcb649ed8ec40d03ade648dabf6b618a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=189a2eadcb649ed8ec40d03a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 1 09:32:36 2022 +0100 include: Add Windows.Gaming.Input.XusbGameControllerProvider 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/windows.gaming.input.custom.idl b/include/windows.gaming.input.custom.idl index 3d188ed5cf0..0811b991091 100644 --- a/include/windows.gaming.input.custom.idl +++ b/include/windows.gaming.input.custom.idl @@ -37,11 +37,13 @@ namespace Windows.Gaming.Input.Custom { interface IHidGameControllerInputSink; interface IHidGameControllerProvider; interface IXusbGameControllerInputSink; + interface IXusbGameControllerProvider; interface ICustomGameControllerFactory; interface IGameControllerFactoryManagerStatics; interface IGameControllerFactoryManagerStatics2; runtimeclass GameControllerFactoryManager; runtimeclass HidGameControllerProvider; + runtimeclass XusbGameControllerProvider; [contract(Windows.Foundation.UniversalApiContract, 3.0)] enum XusbDeviceSubtype @@ -138,6 +140,17 @@ namespace Windows.Gaming.Input.Custom { [in, size_is(report_len)] BYTE *report_buf); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.Custom.XusbGameControllerProvider), + uuid(6e2971eb-0efb-48b4-808b-837643b2f216) + ] + interface IXusbGameControllerProvider : IInspectable + requires Windows.Gaming.Input.Custom.IGameControllerProvider + { + HRESULT SetVibration([in] DOUBLE rumble_intensity, [in] DOUBLE buzz_intensity); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), uuid(69a0ae5e-758e-4cbe-ace6-62155fe9126f) @@ -200,4 +213,15 @@ namespace Windows.Gaming.Input.Custom { [default] interface Windows.Gaming.Input.Custom.IHidGameControllerProvider; interface Windows.Gaming.Input.Custom.IGameControllerProvider; } + + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass XusbGameControllerProvider + { + [default] interface Windows.Gaming.Input.Custom.IXusbGameControllerProvider; + interface Windows.Gaming.Input.Custom.IGameControllerProvider; + } }

1 0

Jacek Caban : mshtml: Add IDOMMessageEvent stub implementation.
by Alexandre Julliard 01 Mar '22

01 Mar '22

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

Zhiyi Zhang : light.msstyles: Remove Classic Blue variant.
by Alexandre Julliard 01 Mar '22

01 Mar '22

1 0

Zhiyi Zhang : uxtheme/tests: Add IsThemePartDefined() tests.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 6d1ad7d5e35ff526957e2ff6a98a062eab786610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d1ad7d5e35ff526957e2ff6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 1 15:06:27 2022 +0800 uxtheme/tests: Add IsThemePartDefined() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 75 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c70e6c27361..59631f01fe9 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -277,20 +277,80 @@ static void test_IsThemed(void) { BOOL bThemeActive; BOOL bAppThemed; - BOOL bTPDefined; bThemeActive = IsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); bAppThemed = IsAppThemed(); trace("Test executable is %s\n", (bAppThemed) ? "themed" : "not themed"); +} - SetLastError(0xdeadbeef); - bTPDefined = IsThemePartDefined(NULL, 0 , 0); - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == E_HANDLE, - "Expected E_HANDLE, got 0x%08x\n", - GetLastError()); +static void test_IsThemePartDefined(void) +{ + BOOL is_theme_active, ret; + HTHEME theme = NULL; + DWORD error; + HWND hwnd; + int i; + + static const struct + { + const WCHAR *class_name; + int part; + int state; + BOOL defined; + DWORD error; + BOOL todo; + } + tests[] = + { + {NULL, 0, 0, FALSE, E_HANDLE}, + {NULL, 0xdeadbeef, 0, FALSE, E_HANDLE}, + {L"Button", 0xdeadbeef, 0, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, 0, TRUE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, + }; + + is_theme_active = IsThemeActive(); + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %#x.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (!is_theme_active && tests[i].class_name) + continue; + + winetest_push_context("class %s part %d state %d", wine_dbgstr_w(tests[i].class_name), + tests[i].part, tests[i].state); + + if (tests[i].class_name) + { + theme = OpenThemeData(hwnd, tests[i].class_name); + ok(theme != NULL, "OpenThemeData failed, error %#x.\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); + error = GetLastError(); + todo_wine_if(tests[i].todo) + ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); + todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) + ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); + + if (theme) + { + CloseThemeData(theme); + theme = NULL; + } + winetest_pop_context(); + } + + DestroyWindow(hwnd); } static void test_GetWindowTheme(void) @@ -2205,6 +2265,7 @@ START_TEST(system) */ test_IsThemed(); + test_IsThemePartDefined(); test_GetWindowTheme(); test_SetWindowTheme(); test_OpenThemeData();

1 0