September 2023 - Wine-Commits

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

Sept. 8, 2023

Module: wine Branch: master Commit: 33dbc3c80a0d12935b2973b09ad3b01db95bc0f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/33dbc3c80a0d12935b2973b09ad3b0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLPluginsCollection. 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 0a5d82e8f7a..85a8cd0e41a 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -798,22 +798,12 @@ static HRESULT WINAPI HTMLPluginsCollection_QueryInterface(IHTMLPluginsCollectio { HTMLPluginsCollection *This = impl_from_IHTMLPluginsCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLPluginsCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLPluginsCollection, riid)) { - *ppv = &This->IHTMLPluginsCollection_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("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); - 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 HTMLPluginsCollection_AddRef(IHTMLPluginsCollection *iface) @@ -904,6 +894,16 @@ static inline HTMLPluginsCollection *HTMLPluginsCollection_from_DispatchEx(Dispa return CONTAINING_RECORD(iface, HTMLPluginsCollection, dispex); } +static void *HTMLPluginsCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLPluginsCollection *This = HTMLPluginsCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLPluginsCollection, riid)) + return &This->IHTMLPluginsCollection_iface; + + return NULL; +} + static void HTMLPluginsCollection_unlink(DispatchEx *dispex) { HTMLPluginsCollection *This = HTMLPluginsCollection_from_DispatchEx(dispex); @@ -920,6 +920,7 @@ static void HTMLPluginsCollection_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLPluginsCollection_dispex_vtbl = { + .query_interface = HTMLPluginsCollection_query_interface, .destructor = HTMLPluginsCollection_destructor, .unlink = HTMLPluginsCollection_unlink };

1 0

Tim Clem : win32u: Correct the packed size of WM_GETDLGCODE when lparam is NULL.
by Alexandre Julliard Sept. 8, 2023

Sept. 8, 2023

Module: wine Branch: master Commit: c8bc841405e89b88659c6954e81cb244650c40c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8bc841405e89b88659c6954e81cb2… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Sep 7 09:55:44 2023 -0700 win32u: Correct the packed size of WM_GETDLGCODE when lparam is NULL. --- dlls/win32u/message.c | 2 +- dlls/win32u/tests/win32u.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d15f9af3f9f..d2909339983 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1691,7 +1691,7 @@ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, size = sizeof(STYLESTRUCT); break; case WM_GETDLGCODE: - size = sizeof(MSG); + if (lparam) size = sizeof(MSG); break; case SBM_SETSCROLLINFO: case SBM_GETSCROLLINFO: diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index efc7249eca7..e118d081ead 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1063,7 +1063,6 @@ static void test_inter_process_child( HWND hwnd ) ok( res == 4, "res = %d\n", res ); res = NtUserMessageCall( hwnd, WM_GETDLGCODE, 0, 0, NULL, NtUserSendMessage, TRUE ); - todo_wine ok( res == 1, "res = %d\n", res ); mdi.szClass = "TestClass";

1 0

Tim Clem : win32u/tests: Add a test for cross-process WM_GETDLGCODE with a NULL lparam.
by Alexandre Julliard Sept. 8, 2023

Sept. 8, 2023

Module: wine Branch: master Commit: 90f9b92762037c323284811e74fb3aedf57b5b65 URL: https://gitlab.winehq.org/wine/wine/-/commit/90f9b92762037c323284811e74fb3a… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri Sep 8 09:09:56 2023 -0700 win32u/tests: Add a test for cross-process WM_GETDLGCODE with a NULL lparam. Co-authored-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/tests/win32u.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 25358c5d0d8..efc7249eca7 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -964,6 +964,9 @@ static LRESULT WINAPI test_ipc_message_proc( HWND hwnd, UINT msg, WPARAM wparam, ok( !wcscmp( mdi->szTitle, L"TestTitle" ), "szTitle = %s\n", wine_dbgstr_w( mdi->szTitle )); return 0xdeadbeef; } + + case WM_GETDLGCODE: + return !lparam; } return DefWindowProcW( hwnd, msg, wparam, lparam ); @@ -1059,6 +1062,10 @@ static void test_inter_process_child( HWND hwnd ) res = NtUserMessageCall( hwnd, WM_GETTEXTLENGTH, 0, 0, NULL, NtUserSendMessage, TRUE ); ok( res == 4, "res = %d\n", res ); + res = NtUserMessageCall( hwnd, WM_GETDLGCODE, 0, 0, NULL, NtUserSendMessage, TRUE ); + todo_wine + ok( res == 1, "res = %d\n", res ); + mdi.szClass = "TestClass"; mdi.szTitle = "TestTitle"; mdi.hOwner = 0;

1 0

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

Sept. 8, 2023

Module: wine Branch: master Commit: 947e8b01354f85b48540ecda3f2ce19edad8a103 URL: https://gitlab.winehq.org/wine/wine/-/commit/947e8b01354f85b48540ecda3f2ce1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLNamespaceCollection. 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 84087f9a149..0a5d82e8f7a 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2424,22 +2424,12 @@ static HRESULT WINAPI HTMLNamespaceCollection_QueryInterface(IHTMLNamespaceColle { HTMLNamespaceCollection *This = impl_from_IHTMLNamespaceCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLNamespaceCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLNamespaceCollection, riid)) { - *ppv = &This->IHTMLNamespaceCollection_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 HTMLNamespaceCollection_AddRef(IHTMLNamespaceCollection *iface) @@ -2538,6 +2528,16 @@ static inline HTMLNamespaceCollection *HTMLNamespaceCollection_from_DispatchEx(D return CONTAINING_RECORD(iface, HTMLNamespaceCollection, dispex); } +static void *HTMLNamespaceCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLNamespaceCollection *This = HTMLNamespaceCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLNamespaceCollection, riid)) + return &This->IHTMLNamespaceCollection_iface; + + return NULL; +} + static void HTMLNamespaceCollection_destructor(DispatchEx *dispex) { HTMLNamespaceCollection *This = HTMLNamespaceCollection_from_DispatchEx(dispex); @@ -2545,6 +2545,7 @@ static void HTMLNamespaceCollection_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLNamespaceCollection_dispex_vtbl = { + .query_interface = HTMLNamespaceCollection_query_interface, .destructor = HTMLNamespaceCollection_destructor, };

1 0

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

Sept. 8, 2023

Module: wine Branch: master Commit: 2e02337146b327c25f90ac0b51488136eed6666d URL: https://gitlab.winehq.org/wine/wine/-/commit/2e02337146b327c25f90ac0b514881… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLMimeTypesCollection. 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 e851debd128..84087f9a149 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -969,22 +969,12 @@ static HRESULT WINAPI HTMLMimeTypesCollection_QueryInterface(IHTMLMimeTypesColle { HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLMimeTypesCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLMimeTypesCollection, riid)) { - *ppv = &This->IHTMLMimeTypesCollection_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 HTMLMimeTypesCollection_AddRef(IHTMLMimeTypesCollection *iface) @@ -1064,6 +1054,16 @@ static inline HTMLMimeTypesCollection *HTMLMimeTypesCollection_from_DispatchEx(D return CONTAINING_RECORD(iface, HTMLMimeTypesCollection, dispex); } +static void *HTMLMimeTypesCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLMimeTypesCollection *This = HTMLMimeTypesCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLMimeTypesCollection, riid)) + return &This->IHTMLMimeTypesCollection_iface; + + return NULL; +} + static void HTMLMimeTypesCollection_unlink(DispatchEx *dispex) { HTMLMimeTypesCollection *This = HTMLMimeTypesCollection_from_DispatchEx(dispex); @@ -1080,6 +1080,7 @@ static void HTMLMimeTypesCollection_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t HTMLMimeTypesCollection_dispex_vtbl = { + .query_interface = HTMLMimeTypesCollection_query_interface, .destructor = HTMLMimeTypesCollection_destructor, .unlink = HTMLMimeTypesCollection_unlink };

1 0

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

Sept. 8, 2023

Module: wine Branch: master Commit: 6be26997bff68264651ac25abdcbcbf9b30c6d3d URL: https://gitlab.winehq.org/wine/wine/-/commit/6be26997bff68264651ac25abdcbcb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLAttributeCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e9badecfa65..4726d22a98b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -8543,26 +8543,12 @@ static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeColle { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLAttributeCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLAttributeCollection, riid)) { - *ppv = &This->IHTMLAttributeCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLAttributeCollection2, riid)) { - *ppv = &This->IHTMLAttributeCollection2_iface; - }else if(IsEqualGUID(&IID_IHTMLAttributeCollection3, riid)) { - *ppv = &This->IHTMLAttributeCollection3_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 HTMLAttributeCollection_AddRef(IHTMLAttributeCollection *iface) @@ -8929,6 +8915,20 @@ static inline HTMLAttributeCollection *HTMLAttributeCollection_from_DispatchEx(D return CONTAINING_RECORD(iface, HTMLAttributeCollection, dispex); } +static void *HTMLAttributeCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLAttributeCollection, riid)) + return &This->IHTMLAttributeCollection_iface; + if(IsEqualGUID(&IID_IHTMLAttributeCollection2, riid)) + return &This->IHTMLAttributeCollection2_iface; + if(IsEqualGUID(&IID_IHTMLAttributeCollection3, riid)) + return &This->IHTMLAttributeCollection3_iface; + + return NULL; +} + static void HTMLAttributeCollection_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); @@ -9022,6 +9022,7 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI } static const dispex_static_data_vtbl_t HTMLAttributeCollection_dispex_vtbl = { + .query_interface = HTMLAttributeCollection_query_interface, .destructor = HTMLAttributeCollection_destructor, .traverse = HTMLAttributeCollection_traverse, .unlink = HTMLAttributeCollection_unlink,

1 0

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

Sept. 8, 2023

Module: wine Branch: master Commit: f57dd5ff6c19bd4258c4d838a97c713c4b9cfa06 URL: https://gitlab.winehq.org/wine/wine/-/commit/f57dd5ff6c19bd4258c4d838a97c71… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLRectCollection. 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 ad71d128266..694469c3688 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1047,22 +1047,12 @@ static HRESULT WINAPI HTMLRectCollection_QueryInterface(IHTMLRectCollection *ifa { HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLRectCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLRectCollection, riid)) { - *ppv = &This->IHTMLRectCollection_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 HTMLRectCollection_AddRef(IHTMLRectCollection *iface) @@ -1203,6 +1193,16 @@ static inline HTMLRectCollection *HTMLRectCollection_from_DispatchEx(DispatchEx return CONTAINING_RECORD(iface, HTMLRectCollection, dispex); } +static void *HTMLRectCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLRectCollection, riid)) + return &This->IHTMLRectCollection_iface; + + return NULL; +} + static void HTMLRectCollection_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLRectCollection *This = HTMLRectCollection_from_DispatchEx(dispex); @@ -1297,6 +1297,7 @@ static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lci } static const dispex_static_data_vtbl_t HTMLRectCollection_dispex_vtbl = { + .query_interface = HTMLRectCollection_query_interface, .destructor = HTMLRectCollection_destructor, .traverse = HTMLRectCollection_traverse, .unlink = HTMLRectCollection_unlink,

1 0

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

Sept. 8, 2023

Module: wine Branch: master Commit: 5a53915532b72c6081b6db499c4187f7a111ba5c URL: https://gitlab.winehq.org/wine/wine/-/commit/5a53915532b72c6081b6db499c4187… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLFiltersCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 694469c3688..e9badecfa65 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -8093,23 +8093,12 @@ static HRESULT WINAPI HTMLFiltersCollection_QueryInterface(IHTMLFiltersCollectio { HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); - TRACE("%p %s %p\n", This, debugstr_mshtml_guid(riid), ppv ); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLFiltersCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLFiltersCollection, riid)) { - TRACE("(%p)->(IID_IHTMLFiltersCollection %p)\n", This, ppv); - *ppv = &This->IHTMLFiltersCollection_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; - FIXME("(%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 HTMLFiltersCollection_AddRef(IHTMLFiltersCollection *iface) @@ -8208,6 +8197,16 @@ static inline HTMLFiltersCollection *HTMLFiltersCollection_from_DispatchEx(Dispa return CONTAINING_RECORD(iface, HTMLFiltersCollection, dispex); } +static void *HTMLFiltersCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLFiltersCollection *This = HTMLFiltersCollection_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLFiltersCollection, riid)) + return &This->IHTMLFiltersCollection_iface; + + return NULL; +} + static void HTMLFiltersCollection_destructor(DispatchEx *dispex) { HTMLFiltersCollection *This = HTMLFiltersCollection_from_DispatchEx(dispex); @@ -8253,6 +8252,7 @@ static HRESULT HTMLFiltersCollection_invoke(DispatchEx *dispex, DISPID id, LCID } static const dispex_static_data_vtbl_t HTMLFiltersCollection_dispex_vtbl = { + .query_interface = HTMLFiltersCollection_query_interface, .destructor = HTMLFiltersCollection_destructor, .get_dispid = HTMLFiltersCollection_get_dispid, .get_name = HTMLFiltersCollection_get_name,

1 0

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

Sept. 8, 2023

Module: wine Branch: master Commit: c539fb70c6ed84e58e7c96fc0d8a21e99bc44a1d URL: https://gitlab.winehq.org/wine/wine/-/commit/c539fb70c6ed84e58e7c96fc0d8a21… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:28 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLElementCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelemcol.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 51c498cb9e9..6a6d549799e 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -215,22 +215,12 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio { HTMLElementCollection *This = impl_from_IHTMLElementCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLElementCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { - *ppv = &This->IHTMLElementCollection_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; - FIXME("Unsupported iface %s\n", debugstr_mshtml_guid(riid)); - return E_NOINTERFACE; - } - IHTMLElementCollection_AddRef(&This->IHTMLElementCollection_iface); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI HTMLElementCollection_AddRef(IHTMLElementCollection *iface) @@ -537,6 +527,16 @@ static inline HTMLElementCollection *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLElementCollection, dispex); } +static void *HTMLElementCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLElementCollection *This = impl_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) + return &This->IHTMLElementCollection_iface; + + return NULL; +} + static void HTMLElementCollection_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLElementCollection *This = impl_from_DispatchEx(dispex); @@ -637,6 +637,7 @@ static HRESULT HTMLElementCollection_invoke(DispatchEx *dispex, DISPID id, LCID } static const dispex_static_data_vtbl_t HTMLElementColection_dispex_vtbl = { + .query_interface = HTMLElementCollection_query_interface, .destructor = HTMLElementCollection_destructor, .traverse = HTMLElementCollection_traverse, .unlink = HTMLElementCollection_unlink,

1 0

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

Sept. 8, 2023

Module: wine Branch: master Commit: 9efd46b497cf168baf707fc3c5f72d013bf57d16 URL: https://gitlab.winehq.org/wine/wine/-/commit/9efd46b497cf168baf707fc3c5f72d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 8 18:24:27 2023 +0300 mshtml: Use query_interface in the dispex vtbl for HTMLDOMChildrenCollection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlnode.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f0dc460d596..a4f1046cc2b 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -200,22 +200,12 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_QueryInterface(IHTMLDOMChildrenC { HTMLDOMChildrenCollection *This = impl_from_IHTMLDOMChildrenCollection(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IHTMLDOMChildrenCollection_iface; - }else if(IsEqualGUID(&IID_IHTMLDOMChildrenCollection, riid)) { - *ppv = &This->IHTMLDOMChildrenCollection_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 HTMLDOMChildrenCollection_AddRef(IHTMLDOMChildrenCollection *iface) @@ -355,6 +345,16 @@ static inline HTMLDOMChildrenCollection *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDOMChildrenCollection, dispex); } +static void *HTMLDOMChildrenCollection_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLDOMChildrenCollection *This = impl_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IHTMLDOMChildrenCollection, riid)) + return &This->IHTMLDOMChildrenCollection_iface; + + return NULL; +} + static void HTMLDOMChildrenCollection_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLDOMChildrenCollection *This = impl_from_DispatchEx(dispex); @@ -443,6 +443,7 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L } static const dispex_static_data_vtbl_t HTMLDOMChildrenCollection_dispex_vtbl = { + .query_interface = HTMLDOMChildrenCollection_query_interface, .destructor = HTMLDOMChildrenCollection_destructor, .traverse = HTMLDOMChildrenCollection_traverse, .unlink = HTMLDOMChildrenCollection_unlink,

1 0