- Wine-Commits - list.winehq.org

Lorenzo Ferrillo : ole32: Leave the RunningObjectTable Critical Section before umarshalling object.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 7860dd06419e1d124f9f1389b39e3e79f26d551b URL: https://gitlab.winehq.org/wine/wine/-/commit/7860dd06419e1d124f9f1389b39e3e… Author: Lorenzo Ferrillo <lorenzofersteam(a)live.it> Date: Sun Sep 10 18:02:56 2023 +0200 ole32: Leave the RunningObjectTable Critical Section before umarshalling object. Sometimes umarshalling an object from the RunningObjectTable can cause the routine to access the table back inside another thread, causing a deadlock. Visual Studio 2019 is an example of this behaviour. Signed-off-by: Lorenzo Ferrillo <lorenzofersteam(a)live.it> --- dlls/ole32/moniker.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index ec026758b2f..f9f266044e4 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -541,13 +541,14 @@ RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, { IStream *pStream; hr = create_stream_on_mip_ro(rot_entry->object, &pStream); + LeaveCriticalSection(&This->lock); + if (hr == S_OK) { hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)ppunkObject); IStream_Release(pStream); } - LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, moniker_data); return hr;

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLDOMImplementation.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: cff43f8a8d5187d4881698d9477d20852437349b URL: https://gitlab.winehq.org/wine/wine/-/commit/cff43f8a8d5187d4881698d9477d20… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:07 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLDOMImplementation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 85a8cd0e41a..103bbd9b7a6 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -60,22 +60,12 @@ static HRESULT WINAPI HTMLDOMImplementation_QueryInterface(IHTMLDOMImplementatio { HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IHTMLDOMImplementation, riid)) { - *ppv = &This->IHTMLDOMImplementation_iface; - }else if(IsEqualGUID(&IID_IHTMLDOMImplementation2, riid)) { - *ppv = &This->IHTMLDOMImplementation2_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLDOMImplementation_AddRef(IHTMLDOMImplementation *iface) @@ -287,6 +277,18 @@ static inline HTMLDOMImplementation *HTMLDOMImplementation_from_DispatchEx(Dispa return CONTAINING_RECORD(iface, HTMLDOMImplementation, dispex); } +static void *HTMLDOMImplementation_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLDOMImplementation *This = HTMLDOMImplementation_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLDOMImplementation, riid)) + return &This->IHTMLDOMImplementation_iface; + if(IsEqualGUID(&IID_IHTMLDOMImplementation2, riid)) + return &This->IHTMLDOMImplementation2_iface; + + return NULL; +} + static void HTMLDOMImplementation_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLDOMImplementation *This = HTMLDOMImplementation_from_DispatchEx(dispex); @@ -308,6 +310,7 @@ static void HTMLDOMImplementation_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLDOMImplementation_dispex_vtbl = { + .query_interface = HTMLDOMImplementation_query_interface, .destructor = HTMLDOMImplementation_destructor, .traverse = HTMLDOMImplementation_traverse, .unlink = HTMLDOMImplementation_unlink

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLSelectionObject.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: d8200e04741c44034f07f3a37948082a8eb364ed URL: https://gitlab.winehq.org/wine/wine/-/commit/d8200e04741c44034f07f3a3794808… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:07 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLSelectionObject. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/selection.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 97f65a2b22c..76e1b2bc5eb 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -52,26 +52,12 @@ static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *i { HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLSelectionObject_iface; - }else if(IsEqualGUID(&IID_IDispatch, riid)) { - *ppv = &This->IHTMLSelectionObject_iface; - }else if(IsEqualGUID(&IID_IHTMLSelectionObject, riid)) { - *ppv = &This->IHTMLSelectionObject_iface; - }else if(IsEqualGUID(&IID_IHTMLSelectionObject2, riid)) { - *ppv = &This->IHTMLSelectionObject2_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface) @@ -323,6 +309,18 @@ static inline HTMLSelectionObject *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLSelectionObject, dispex); } +static void *HTMLSelectionObject_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLSelectionObject *This = impl_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLSelectionObject, riid)) + return &This->IHTMLSelectionObject_iface; + if(IsEqualGUID(&IID_IHTMLSelectionObject2, riid)) + return &This->IHTMLSelectionObject2_iface; + + return NULL; +} + static void HTMLSelectionObject_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLSelectionObject *This = impl_from_DispatchEx(dispex); @@ -347,6 +345,7 @@ static void HTMLSelectionObject_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLSelectionObject_dispex_vtbl = { + .query_interface = HTMLSelectionObject_query_interface, .destructor = HTMLSelectionObject_destructor, .traverse = HTMLSelectionObject_traverse, .unlink = HTMLSelectionObject_unlink

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLScreen.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 50da8767e79b223945acae7c2cf84c248d6d90a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/50da8767e79b223945acae7c2cf84c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:07 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLScreen. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 103bbd9b7a6..342416e240f 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -384,22 +384,12 @@ static HRESULT WINAPI HTMLScreen_QueryInterface(IHTMLScreen *iface, REFIID riid, { HTMLScreen *This = impl_from_IHTMLScreen(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLScreen_iface; - }else if(IsEqualGUID(&IID_IHTMLScreen, riid)) { - *ppv = &This->IHTMLScreen_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLScreen_AddRef(IHTMLScreen *iface) @@ -572,6 +562,16 @@ static inline HTMLScreen *HTMLScreen_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLScreen, dispex); } +static void *HTMLScreen_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLScreen *This = HTMLScreen_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLScreen, riid)) + return &This->IHTMLScreen_iface; + + return NULL; +} + static void HTMLScreen_destructor(DispatchEx *dispex) { HTMLScreen *This = HTMLScreen_from_DispatchEx(dispex); @@ -579,6 +579,7 @@ static void HTMLScreen_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLScreen_dispex_vtbl = { + .query_interface = HTMLScreen_query_interface, .destructor = HTMLScreen_destructor, };

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for DOM and Text Ranges.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 908cfec32ca888270083bf8b112317d6bafbd463 URL: https://gitlab.winehq.org/wine/wine/-/commit/908cfec32ca888270083bf8b112317… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:07 2023 +0300 mshtml: Use query_interface in the dispex vtbl for DOM and Text Ranges. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/range.c | 64 ++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 71e225a587e..a83ed316345 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -814,24 +814,12 @@ static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID r { HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLTxtRange_iface; - }else if(IsEqualGUID(&IID_IHTMLTxtRange, riid)) { - *ppv = &This->IHTMLTxtRange_iface; - }else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) { - *ppv = &This->IOleCommandTarget_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLTxtRange_AddRef(IHTMLTxtRange *iface) @@ -1710,6 +1698,18 @@ static inline HTMLTxtRange *HTMLTxtRange_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLTxtRange, dispex); } +static void *HTMLTxtRange_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLTxtRange *This = HTMLTxtRange_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLTxtRange, riid)) + return &This->IHTMLTxtRange_iface; + if(IsEqualGUID(&IID_IOleCommandTarget, riid)) + return &This->IOleCommandTarget_iface; + + return NULL; +} + static void HTMLTxtRange_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLTxtRange *This = HTMLTxtRange_from_DispatchEx(dispex); @@ -1734,6 +1734,7 @@ static void HTMLTxtRange_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLTxtRange_dispex_vtbl = { + .query_interface = HTMLTxtRange_query_interface, .destructor = HTMLTxtRange_destructor, .traverse = HTMLTxtRange_traverse, .unlink = HTMLTxtRange_unlink @@ -1784,22 +1785,12 @@ static HRESULT WINAPI HTMLDOMRange_QueryInterface(IHTMLDOMRange *iface, REFIID r { HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLDOMRange_iface; - }else if(IsEqualGUID(&IID_IHTMLDOMRange, riid)) { - *ppv = &This->IHTMLDOMRange_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLDOMRange_AddRef(IHTMLDOMRange *iface) @@ -2081,6 +2072,18 @@ static inline HTMLDOMRange *HTMLDOMRange_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDOMRange, dispex); } +static void *HTMLDOMRange_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLDOMRange *This = HTMLDOMRange_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IUnknown, riid)) + return &This->IHTMLDOMRange_iface; + if(IsEqualGUID(&IID_IHTMLDOMRange, riid)) + return &This->IHTMLDOMRange_iface; + + return NULL; +} + static void HTMLDOMRange_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLDOMRange *This = HTMLDOMRange_from_DispatchEx(dispex); @@ -2101,6 +2104,7 @@ static void HTMLDOMRange_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLDOMRange_dispex_vtbl = { + .query_interface = HTMLDOMRange_query_interface, .destructor = HTMLDOMRange_destructor, .traverse = HTMLDOMRange_traverse, .unlink = HTMLDOMRange_unlink

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for DOMTokenList.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 5cf6c584f8b7df041c45566c381fac4efba10214 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cf6c584f8b7df041c45566c381fac… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:06 2023 +0300 mshtml: Use query_interface in the dispex vtbl for DOMTokenList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4726d22a98b..b1da45cea35 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7383,22 +7383,12 @@ static HRESULT WINAPI token_list_QueryInterface(IWineDOMTokenList *iface, REFIID { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - TRACE("(%p)->(%s %p)\n", token_list, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &token_list->IWineDOMTokenList_iface; - }else if(IsEqualGUID(&IID_IWineDOMTokenList, riid)) { - *ppv = &token_list->IWineDOMTokenList_iface; - }else if(dispex_query_interface(&token_list->dispex, riid, ppv)) { + if(dispex_query_interface(&token_list->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - WARN("(%p)->(%s %p)\n", token_list, debugstr_mshtml_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", token_list, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI token_list_AddRef(IWineDOMTokenList *iface) @@ -7735,6 +7725,16 @@ static inline struct token_list *token_list_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, struct token_list, dispex); } +static void *token_list_query_interface(DispatchEx *dispex, REFIID riid) +{ + struct token_list *token_list = token_list_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IWineDOMTokenList, riid)) + return &token_list->IWineDOMTokenList_iface; + + return NULL; +} + static void token_list_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { struct token_list *token_list = token_list_from_DispatchEx(dispex); @@ -7829,6 +7829,7 @@ static HRESULT token_list_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD } static const dispex_static_data_vtbl_t token_list_dispex_vtbl = { + .query_interface = token_list_query_interface, .destructor = token_list_destructor, .traverse = token_list_traverse, .unlink = token_list_unlink,

1 0

Gabriel Ivăncescu : mshtml: Get rid of the custom query_interface for DOM Events.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 8985cf154f826fc995afc4dca07c173ecc4f05fa URL: https://gitlab.winehq.org/wine/wine/-/commit/8985cf154f826fc995afc4dca07c17… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:06 2023 +0300 mshtml: Get rid of the custom query_interface for DOM Events. Just use the dispex's query_interface. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 112 +++++++++++++++++++++++++----------------------- dlls/mshtml/htmlevent.h | 2 - 2 files changed, 58 insertions(+), 56 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for MutationObserver.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 6192c0501f734a597f8e905391d432b43a72d4cb URL: https://gitlab.winehq.org/wine/wine/-/commit/6192c0501f734a597f8e905391d432… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:06 2023 +0300 mshtml: Use query_interface in the dispex vtbl for MutationObserver. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mutation.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 7c93d27d829..e9656a0e2d2 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1093,20 +1093,12 @@ static HRESULT WINAPI MutationObserver_QueryInterface(IWineMSHTMLMutationObserve { struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IWineMSHTMLMutationObserver, riid)) { - *ppv = &This->IWineMSHTMLMutationObserver_iface; - } else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - } else { - WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI MutationObserver_AddRef(IWineMSHTMLMutationObserver *iface) @@ -1211,6 +1203,16 @@ static inline struct mutation_observer *mutation_observer_from_DispatchEx(Dispat return CONTAINING_RECORD(iface, struct mutation_observer, dispex); } +static void *mutation_observer_query_interface(DispatchEx *dispex, REFIID riid) +{ + struct mutation_observer *This = mutation_observer_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IWineMSHTMLMutationObserver, riid)) + return &This->IWineMSHTMLMutationObserver_iface; + + return NULL; +} + static void mutation_observer_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { struct mutation_observer *This = mutation_observer_from_DispatchEx(dispex); @@ -1231,6 +1233,7 @@ static void mutation_observer_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t mutation_observer_dispex_vtbl = { + .query_interface = mutation_observer_query_interface, .destructor = mutation_observer_destructor, .traverse = mutation_observer_traverse, .unlink = mutation_observer_unlink

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for HTMLRect.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: c4cf5bf748feadec6824caee94999724ca87b724 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4cf5bf748feadec6824caee949997… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:06 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLRect. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b1da45cea35..b2beec5873b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -541,24 +541,12 @@ static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, voi { HTMLRect *This = impl_from_IHTMLRect(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLRect_iface; - }else if(IsEqualGUID(&IID_IHTMLRect, riid)) { - *ppv = &This->IHTMLRect_iface; - }else if (IsEqualGUID(&IID_IHTMLRect2, riid)) { - *ppv = &This->IHTMLRect2_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLRect_AddRef(IHTMLRect *iface) @@ -835,6 +823,18 @@ static inline HTMLRect *HTMLRect_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLRect, dispex); } +static void *HTMLRect_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLRect *This = HTMLRect_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLRect, riid)) + return &This->IHTMLRect_iface; + if(IsEqualGUID(&IID_IHTMLRect2, riid)) + return &This->IHTMLRect2_iface; + + return NULL; +} + static void HTMLRect_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLRect *This = HTMLRect_from_DispatchEx(dispex); @@ -861,6 +861,7 @@ void HTMLRect_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } static const dispex_static_data_vtbl_t HTMLRect_dispex_vtbl = { + .query_interface = HTMLRect_query_interface, .destructor = HTMLRect_destructor, .traverse = HTMLRect_traverse, .unlink = HTMLRect_unlink

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for DOM Events.
by Alexandre Julliard Sept. 11, 2023

Sept. 11, 2023

Module: wine Branch: master Commit: 90f445535034662d4cef556b873cde170508befd URL: https://gitlab.winehq.org/wine/wine/-/commit/90f445535034662d4cef556b873cde… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 11 14:57:06 2023 +0300 mshtml: Use query_interface in the dispex vtbl for DOM Events. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1d79b404eff..024dfa2a2dd 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -970,22 +970,12 @@ static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, voi { DOMEvent *This = impl_from_IDOMEvent(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) - *ppv = &This->IDOMEvent_iface; - else if(IsEqualGUID(&IID_IDOMEvent, riid)) - *ppv = &This->IDOMEvent_iface; - else if(dispex_query_interface(&This->dispex, riid, ppv)) + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - else if(!This->query_interface || !(*ppv = This->query_interface(This, riid))) { - *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI DOMEvent_AddRef(IDOMEvent *iface) @@ -1268,6 +1258,18 @@ static inline DOMEvent *DOMEvent_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, DOMEvent, dispex); } +static void *DOMEvent_query_interface(DispatchEx *dispex, REFIID riid) +{ + DOMEvent *This = DOMEvent_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IDOMEvent, riid)) + return &This->IDOMEvent_iface; + if(This->query_interface) + return This->query_interface(This, riid); + + return NULL; +} + static void DOMEvent_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { DOMEvent *This = DOMEvent_from_DispatchEx(dispex); @@ -3035,6 +3037,7 @@ static void DOMStorageEvent_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t DOMEvent_dispex_vtbl = { + .query_interface = DOMEvent_query_interface, .destructor = DOMEvent_destructor, .traverse = DOMEvent_traverse, .unlink = DOMEvent_unlink @@ -3053,6 +3056,7 @@ static dispex_static_data_t DOMEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMUIEvent_dispex_vtbl = { + .query_interface = DOMEvent_query_interface, .destructor = DOMEvent_destructor, .traverse = DOMUIEvent_traverse, .unlink = DOMUIEvent_unlink @@ -3072,6 +3076,7 @@ static dispex_static_data_t DOMUIEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMMouseEvent_dispex_vtbl = { + .query_interface = DOMEvent_query_interface, .destructor = DOMEvent_destructor, .traverse = DOMMouseEvent_traverse, .unlink = DOMMouseEvent_unlink @@ -3092,6 +3097,7 @@ static dispex_static_data_t DOMMouseEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMKeyboardEvent_dispex_vtbl = { + .query_interface = DOMEvent_query_interface, .destructor = DOMEvent_destructor, .traverse = DOMKeyboardEvent_traverse, .unlink = DOMKeyboardEvent_unlink @@ -3126,6 +3132,7 @@ static dispex_static_data_t DOMPageTransitionEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMCustomEvent_dispex_vtbl = { + .query_interface = DOMEvent_query_interface, .destructor = DOMCustomEvent_destructor, .traverse = DOMCustomEvent_traverse, .unlink = DOMCustomEvent_unlink @@ -3145,6 +3152,7 @@ static dispex_static_data_t DOMCustomEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMMessageEvent_dispex_vtbl = { + .query_interface = DOMEvent_query_interface, .destructor = DOMMessageEvent_destructor, .traverse = DOMMessageEvent_traverse, .unlink = DOMMessageEvent_unlink @@ -3164,6 +3172,7 @@ static dispex_static_data_t DOMMessageEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMProgressEvent_dispex_vtbl = { + .query_interface = DOMEvent_query_interface, .destructor = DOMEvent_destructor, .traverse = DOMProgressEvent_traverse, .unlink = DOMProgressEvent_unlink @@ -3183,6 +3192,7 @@ static dispex_static_data_t DOMProgressEvent_dispex = { }; static const dispex_static_data_vtbl_t DOMStorageEvent_dispex_vtbl = { + .query_interface = DOMEvent_query_interface, .destructor = DOMStorageEvent_destructor, .traverse = DOMEvent_traverse, .unlink = DOMEvent_unlink

1 0