September 2023 - Wine-commits

Connor McAdams : uiautomationcore/tests: Add support for debug printing Accessible method calls.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: a065e8e9c79a591b4e843505cdfd3c480e1595d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/a065e8e9c79a591b4e843505cdfd3c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Aug 25 12:31:47 2023 -0400 uiautomationcore/tests: Add support for debug printing Accessible method calls. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)

1 0

Connor McAdams : uiautomationcore/tests: Add support for debug printing Provider method calls.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: b88365a0acc32875eb47bb3d43fb3e222d047cf5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b88365a0acc32875eb47bb3d43fb3e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 6 11:00:01 2023 -0400 uiautomationcore/tests: Add support for debug printing Provider method calls. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 308 +++++++++++++++++++++++++++++ 1 file changed, 308 insertions(+)

1 0

Connor McAdams : uiautomationcore: Add stub IRawElementProviderFragmentRoot implementation for MSAA providers.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 32814b87857b995d824b8a4832e1b114889bbb28 URL: https://gitlab.winehq.org/wine/wine/-/commit/32814b87857b995d824b8a4832e1b1… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Aug 29 09:42:55 2023 -0400 uiautomationcore: Add stub IRawElementProviderFragmentRoot implementation for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 25 +++++++++++++ dlls/uiautomationcore/uia_provider.c | 56 ++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 9a13a5bb7a8..408e90c2046 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -431,6 +431,20 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return cmp; } +#define test_implements_interface( unk, iid, exp_implemented ) \ + test_implements_interface_( ((IUnknown *)(unk)), (iid), (exp_implemented), __FILE__, __LINE__) +static void test_implements_interface_(IUnknown *unk, const GUID *iid, BOOL exp_implemented, const char *file, int line) +{ + IUnknown *unk2 = NULL; + HRESULT hr; + + hr = IUnknown_QueryInterface(unk, iid, (void **)&unk2); + ok_(file, line)(hr == (exp_implemented ? S_OK : E_NOINTERFACE), "Unexpected hr %#lx\n", hr); + ok_(file, line)(!!unk2 == exp_implemented, "Unexpected iface %p\n", unk2); + if (unk2) + IUnknown_Release(unk2); +} + #define DEFINE_ACC_METHOD_EXPECT(method) \ int expect_ ## method , called_ ## method @@ -4435,6 +4449,8 @@ static void test_UiaProviderFromIAccessible(void) broken(prov_opt == ProviderOptions_ClientSideProvider), /* Windows < 10 1507 */ "Unexpected provider options %#x\n", prov_opt); + test_implements_interface(elprov, &IID_IRawElementProviderFragmentRoot, TRUE); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_ProviderDescriptionPropertyId, &v); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(V_VT(&v) == VT_BSTR, "V_VT(&v) = %d\n", V_VT(&v)); @@ -4468,6 +4484,9 @@ static void test_UiaProviderFromIAccessible(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); + /* Even simple children implement IRawElementProviderFragmentRoot. */ + test_implements_interface(elprov, &IID_IRawElementProviderFragmentRoot, TRUE); + /* * Simple child element (IAccessible without CHILDID_SELF) cannot be root * IAccessible. No checks against the root HWND IAccessible will be done. @@ -4527,6 +4546,12 @@ static void test_UiaProviderFromIAccessible(void) CHECK_ACC_METHOD_CALLED(&Accessible, accLocation); CHECK_ACC_METHOD_CALLED(&Accessible, get_accName); + /* + * Interface that isn't the HWND root, still implements + * IRawElementProviderFragmentRoot. + */ + test_implements_interface(elprov, &IID_IRawElementProviderFragmentRoot, TRUE); + /* Second call won't send WM_GETOBJECT. */ elprov2 = (void *)0xdeadbeef; hr = IRawElementProviderSimple_get_HostRawElementProvider(elprov, &elprov2); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index b16077b607c..abf97a60f08 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -486,6 +486,7 @@ static LONG msaa_role_to_uia_control_type(LONG role) struct msaa_provider { IRawElementProviderSimple IRawElementProviderSimple_iface; IRawElementProviderFragment IRawElementProviderFragment_iface; + IRawElementProviderFragmentRoot IRawElementProviderFragmentRoot_iface; ILegacyIAccessibleProvider ILegacyIAccessibleProvider_iface; LONG refcount; @@ -539,6 +540,8 @@ HRESULT WINAPI msaa_provider_QueryInterface(IRawElementProviderSimple *iface, RE *ppv = iface; else if (IsEqualIID(riid, &IID_IRawElementProviderFragment)) *ppv = &msaa_prov->IRawElementProviderFragment_iface; + else if (IsEqualIID(riid, &IID_IRawElementProviderFragmentRoot)) + *ppv = &msaa_prov->IRawElementProviderFragmentRoot_iface; else if (IsEqualIID(riid, &IID_ILegacyIAccessibleProvider)) *ppv = &msaa_prov->ILegacyIAccessibleProvider_iface; else @@ -976,6 +979,58 @@ static const IRawElementProviderFragmentVtbl msaa_fragment_vtbl = { msaa_fragment_get_FragmentRoot, }; +/* + * IRawElementProviderFragmentRoot interface for UiaProviderFromIAccessible + * providers. + */ +static inline struct msaa_provider *impl_from_msaa_fragment_root(IRawElementProviderFragmentRoot *iface) +{ + return CONTAINING_RECORD(iface, struct msaa_provider, IRawElementProviderFragmentRoot_iface); +} + +static HRESULT WINAPI msaa_fragment_root_QueryInterface(IRawElementProviderFragmentRoot *iface, REFIID riid, + void **ppv) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_fragment_root(iface); + return IRawElementProviderSimple_QueryInterface(&msaa_prov->IRawElementProviderSimple_iface, riid, ppv); +} + +static ULONG WINAPI msaa_fragment_root_AddRef(IRawElementProviderFragmentRoot *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_fragment_root(iface); + return IRawElementProviderSimple_AddRef(&msaa_prov->IRawElementProviderSimple_iface); +} + +static ULONG WINAPI msaa_fragment_root_Release(IRawElementProviderFragmentRoot *iface) +{ + struct msaa_provider *msaa_prov = impl_from_msaa_fragment_root(iface); + return IRawElementProviderSimple_Release(&msaa_prov->IRawElementProviderSimple_iface); +} + +static HRESULT WINAPI msaa_fragment_root_ElementProviderFromPoint(IRawElementProviderFragmentRoot *iface, + double x, double y, IRawElementProviderFragment **ret_val) +{ + FIXME("%p, %f, %f, %p: stub!\n", iface, x, y, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +static HRESULT WINAPI msaa_fragment_root_GetFocus(IRawElementProviderFragmentRoot *iface, + IRawElementProviderFragment **ret_val) +{ + FIXME("%p, %p: stub!\n", iface, ret_val); + *ret_val = NULL; + return E_NOTIMPL; +} + +static const IRawElementProviderFragmentRootVtbl msaa_fragment_root_vtbl = { + msaa_fragment_root_QueryInterface, + msaa_fragment_root_AddRef, + msaa_fragment_root_Release, + msaa_fragment_root_ElementProviderFromPoint, + msaa_fragment_root_GetFocus, +}; + /* * ILegacyIAccessibleProvider interface for UiaProviderFromIAccessible * providers. @@ -1143,6 +1198,7 @@ HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL kn msaa_prov->IRawElementProviderSimple_iface.lpVtbl = &msaa_provider_vtbl; msaa_prov->IRawElementProviderFragment_iface.lpVtbl = &msaa_fragment_vtbl; + msaa_prov->IRawElementProviderFragmentRoot_iface.lpVtbl = &msaa_fragment_root_vtbl; msaa_prov->ILegacyIAccessibleProvider_iface.lpVtbl = &msaa_acc_provider_vtbl; msaa_prov->refcount = 1; variant_init_i4(&msaa_prov->cid, child_id);

1 0

Connor McAdams : uiautomationcore: Add a common helper function for querying IServiceProvider on IAccessible interfaces.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 008c1c11286ff51c1c0fb2477990311af3ef55ba URL: https://gitlab.winehq.org/wine/wine/-/commit/008c1c11286ff51c1c0fb247799031… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Aug 30 10:30:32 2023 -0400 uiautomationcore: Add a common helper function for querying IServiceProvider on IAccessible interfaces. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_provider.c | 57 ++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index abf97a60f08..b647c545b38 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -40,20 +40,29 @@ static BOOL msaa_check_acc_state(IAccessible *acc, VARIANT cid, ULONG flag) return FALSE; } +static HRESULT msaa_acc_get_service(IAccessible *acc, REFGUID sid, REFIID riid, void **service) +{ + IServiceProvider *sp; + HRESULT hr; + + *service = NULL; + hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&sp); + if (FAILED(hr)) + return hr; + + hr = IServiceProvider_QueryService(sp, sid, riid, (void **)service); + IServiceProvider_Release(sp); + return hr; +} + static IAccessible2 *msaa_acc_get_ia2(IAccessible *acc) { - IServiceProvider *serv_prov; IAccessible2 *ia2 = NULL; HRESULT hr; - hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&serv_prov); - if (SUCCEEDED(hr)) - { - hr = IServiceProvider_QueryService(serv_prov, &IID_IAccessible2, &IID_IAccessible2, (void **)&ia2); - IServiceProvider_Release(serv_prov); - if (SUCCEEDED(hr) && ia2) - return ia2; - } + hr = msaa_acc_get_service(acc, &IID_IAccessible2, &IID_IAccessible2, (void **)&ia2); + if (SUCCEEDED(hr) && ia2) + return ia2; hr = IAccessible_QueryInterface(acc, &IID_IAccessible2, (void **)&ia2); if (SUCCEEDED(hr) && ia2) @@ -64,17 +73,10 @@ static IAccessible2 *msaa_acc_get_ia2(IAccessible *acc) static IAccessible *msaa_acc_da_unwrap(IAccessible *acc) { - IServiceProvider *sp; IAccessible *acc2; HRESULT hr; - hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void**)&sp); - if (SUCCEEDED(hr)) - { - hr = IServiceProvider_QueryService(sp, &SID_AccFromDAWrapper, &IID_IAccessible, (void**)&acc2); - IServiceProvider_Release(sp); - } - + hr = msaa_acc_get_service(acc, &SID_AccFromDAWrapper, &IID_IAccessible, (void **)&acc2); if (SUCCEEDED(hr) && acc2) return acc2; @@ -1231,8 +1233,8 @@ HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL kn HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD flags, IRawElementProviderSimple **elprov) { - IServiceProvider *serv_prov; HWND hwnd = NULL; + IUnknown *unk; HRESULT hr; TRACE("(%p, %ld, %#lx, %p)\n", acc, child_id, flags, elprov); @@ -1251,21 +1253,12 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD return E_NOTIMPL; } - hr = IAccessible_QueryInterface(acc, &IID_IServiceProvider, (void **)&serv_prov); - if (SUCCEEDED(hr)) + hr = msaa_acc_get_service(acc, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); + if (SUCCEEDED(hr) && unk) { - IUnknown *unk; - - hr = IServiceProvider_QueryService(serv_prov, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); - if (SUCCEEDED(hr)) - { - WARN("Cannot wrap an oleacc proxy IAccessible!\n"); - IUnknown_Release(unk); - IServiceProvider_Release(serv_prov); - return E_INVALIDARG; - } - - IServiceProvider_Release(serv_prov); + WARN("Cannot wrap an oleacc proxy IAccessible!\n"); + IUnknown_Release(unk); + return E_INVALIDARG; } hr = WindowFromAccessibleObject(acc, &hwnd);

1 0

Connor McAdams : uiautomationcore: Implement IRawElementProviderFragment::get_FragmentRoot for MSAA providers.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 00799933bc277d0b4d8482f81825099e33690d35 URL: https://gitlab.winehq.org/wine/wine/-/commit/00799933bc277d0b4d8482f8182509… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Aug 30 11:30:10 2023 -0400 uiautomationcore: Implement IRawElementProviderFragment::get_FragmentRoot for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 247 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 22 ++- 2 files changed, 267 insertions(+), 2 deletions(-)

1 0

Connor McAdams : uiautomationcore: Don't return oleacc proxy IAccessibles from GetIAccessible for MSAA providers.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 46b78c5d6dd0acdca8361815bc45d6e57849f169 URL: https://gitlab.winehq.org/wine/wine/-/commit/46b78c5d6dd0acdca8361815bc45d6… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Aug 30 10:56:52 2023 -0400 uiautomationcore: Don't return oleacc proxy IAccessibles from GetIAccessible for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 7 +++++++ dlls/uiautomationcore/uia_provider.c | 27 ++++++++++++++++++++------- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index d4da880c038..ec2e7e31d6b 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3473,6 +3473,12 @@ static void test_uia_prov_from_acc_fragment_root(HWND hwnd) ok(!!elroot, "elroot == NULL\n"); CHECK_CALLED(winproc_GETOBJECT_CLIENT); + /* + * ILegacyIAccessibleProvider::GetIAccessible returns a NULL + * IAccessible if the provider represents an oleacc proxy. + */ + check_msaa_prov_acc(elroot, NULL, CHILDID_SELF); + /* * Returns a provider from get_HostRawElementProvider without having * to query the HWND. @@ -3494,6 +3500,7 @@ static void test_uia_prov_from_acc_fragment_root(HWND hwnd) IRawElementProviderFragment_Release(elfrag2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!elroot2, "elroot2 == NULL\n"); + check_msaa_prov_acc(elroot2, NULL, CHILDID_SELF); CHECK_CALLED(winproc_GETOBJECT_CLIENT); ok(!iface_cmp((IUnknown *)elroot, (IUnknown *)elroot2), "elroot2 == elroot\n"); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index cb945796f50..729dc7ab2c5 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -84,6 +84,21 @@ static IAccessible *msaa_acc_da_unwrap(IAccessible *acc) return acc; } +static BOOL msaa_acc_is_oleacc_proxy(IAccessible *acc) +{ + IUnknown *unk; + HRESULT hr; + + hr = msaa_acc_get_service(acc, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); + if (SUCCEEDED(hr) && unk) + { + IUnknown_Release(unk); + return TRUE; + } + + return FALSE; +} + /* * Compare role, state, child count, and location properties of the two * IAccessibles. If all four are successfully retrieved and are equal, this is @@ -1103,10 +1118,11 @@ static HRESULT WINAPI msaa_acc_provider_GetIAccessible(ILegacyIAccessibleProvide TRACE("%p, %p\n", iface, out_acc); - IAccessible_AddRef(msaa_prov->acc); - *out_acc = msaa_prov->acc; + *out_acc = NULL; + if (msaa_acc_is_oleacc_proxy(msaa_prov->acc)) + return S_OK; - return S_OK; + return IAccessible_QueryInterface(msaa_prov->acc, &IID_IAccessible, (void **)out_acc); } static HRESULT WINAPI msaa_acc_provider_get_ChildId(ILegacyIAccessibleProvider *iface, int *out_cid) @@ -1252,7 +1268,6 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD IRawElementProviderSimple **elprov) { HWND hwnd = NULL; - IUnknown *unk; HRESULT hr; TRACE("(%p, %ld, %#lx, %p)\n", acc, child_id, flags, elprov); @@ -1271,11 +1286,9 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD return E_NOTIMPL; } - hr = msaa_acc_get_service(acc, &IIS_IsOleaccProxy, &IID_IUnknown, (void **)&unk); - if (SUCCEEDED(hr) && unk) + if (msaa_acc_is_oleacc_proxy(acc)) { WARN("Cannot wrap an oleacc proxy IAccessible!\n"); - IUnknown_Release(unk); return E_INVALIDARG; }

1 0

Gabriel Ivăncescu : mshtml: Use specific dispex vtbls for remaining HTML elements.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: d31e95a7a7a07398f7424aa593f6429babc2eb39 URL: https://gitlab.winehq.org/wine/wine/-/commit/d31e95a7a7a07398f7424aa593f642… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use specific dispex vtbls for remaining HTML elements. Will be needed when we move the query_interface to the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlcomment.c | 11 ++++++++++- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlgeneric.c | 11 ++++++++++- dlls/mshtml/htmlhead.c | 44 ++++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/htmlinput.c | 11 ++++++++++- dlls/mshtml/htmlobject.c | 11 ++++++++++- 7 files changed, 81 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 9c720d9468e..7fd611c727c 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -180,6 +180,15 @@ static const NodeImplVtbl HTMLCommentElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLCommentElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLCommentElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLCommentElement_tid, @@ -187,7 +196,7 @@ static const tid_t HTMLCommentElement_iface_tids[] = { }; static dispex_static_data_t HTMLCommentElement_dispex = { "Comment", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLCommentElement_event_target_vtbl.dispex_vtbl, DispHTMLCommentElement_tid, HTMLCommentElement_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 314b85b8a72..e10c5067d33 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7319,7 +7319,7 @@ static const tid_t HTMLElement_iface_tids[] = { 0 }; -const event_target_vtbl_t HTMLElement_event_target_vtbl = { +static const event_target_vtbl_t HTMLElement_event_target_vtbl = { { HTMLELEMENT_DISPEX_VTBL_ENTRIES, .traverse = HTMLDOMNode_traverse, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index d8ff8db2d74..083d1ec46cf 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -135,7 +135,6 @@ typedef struct { IHTMLEventObj *(*set_current_event)(DispatchEx*,IHTMLEventObj*); } event_target_vtbl_t; -extern const event_target_vtbl_t HTMLElement_event_target_vtbl; IHTMLEventObj *default_set_current_event(HTMLInnerWindow*,IHTMLEventObj*); nsISupports *HTMLElement_get_gecko_target(DispatchEx*); diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 5f069e05f67..2aefcc02af5 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -148,6 +148,15 @@ static const NodeImplVtbl HTMLGenericElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLGenericElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLGenericElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLGenericElement_tid, @@ -156,7 +165,7 @@ static const tid_t HTMLGenericElement_iface_tids[] = { static dispex_static_data_t HTMLGenericElement_dispex = { "HTMLUnknownElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLGenericElement_event_target_vtbl.dispex_vtbl, DispHTMLGenericElement_tid, HTMLGenericElement_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index af17a35dbb7..897a58edc3c 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -166,6 +166,15 @@ static const NodeImplVtbl HTMLTitleElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLTitleElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLTitleElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLTitleElement_tid, @@ -173,7 +182,7 @@ static const tid_t HTMLTitleElement_iface_tids[] = { }; static dispex_static_data_t HTMLTitleElement_dispex = { "HTMLTitleElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLTitleElement_event_target_vtbl.dispex_vtbl, DispHTMLTitleElement_tid, HTMLTitleElement_iface_tids, HTMLElement_init_dispex_info @@ -327,6 +336,15 @@ static const NodeImplVtbl HTMLHtmlElementImplVtbl = { .is_settable = HTMLHtmlElement_is_settable }; +static const event_target_vtbl_t HTMLHtmlElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLHtmlElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLHtmlElement_tid, @@ -334,7 +352,7 @@ static const tid_t HTMLHtmlElement_iface_tids[] = { }; static dispex_static_data_t HTMLHtmlElement_dispex = { "HTMLHtmlElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLHtmlElement_event_target_vtbl.dispex_vtbl, DispHTMLHtmlElement_tid, HTMLHtmlElement_iface_tids, HTMLElement_init_dispex_info @@ -549,6 +567,15 @@ static const NodeImplVtbl HTMLMetaElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLMetaElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLMetaElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLMetaElement_tid, @@ -557,7 +584,7 @@ static const tid_t HTMLMetaElement_iface_tids[] = { static dispex_static_data_t HTMLMetaElement_dispex = { "HTMLMetaElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLMetaElement_event_target_vtbl.dispex_vtbl, DispHTMLMetaElement_tid, HTMLMetaElement_iface_tids, HTMLElement_init_dispex_info @@ -702,6 +729,15 @@ static const NodeImplVtbl HTMLHeadElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLHeadElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLHeadElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLHeadElement_tid, @@ -709,7 +745,7 @@ static const tid_t HTMLHeadElement_iface_tids[] = { }; static dispex_static_data_t HTMLHeadElement_dispex = { "HTMLHeadElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLHeadElement_event_target_vtbl.dispex_vtbl, DispHTMLHeadElement_tid, HTMLHeadElement_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index c6527309b8c..b952e52ca13 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1625,6 +1625,15 @@ static const NodeImplVtbl HTMLLabelElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; +static const event_target_vtbl_t HTMLLabelElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLLabelElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLLabelElement_tid, @@ -1633,7 +1642,7 @@ static const tid_t HTMLLabelElement_iface_tids[] = { static dispex_static_data_t HTMLLabelElement_dispex = { "HTMLLabelElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLLabelElement_event_target_vtbl.dispex_vtbl, DispHTMLLabelElement_tid, HTMLLabelElement_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6e903a0e97e..0e5c876538c 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -1016,6 +1016,15 @@ static const NodeImplVtbl HTMLEmbedElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLEmbedElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLEmbedElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLEmbedElement_tid, @@ -1023,7 +1032,7 @@ static const tid_t HTMLEmbedElement_iface_tids[] = { }; static dispex_static_data_t HTMLEmbedElement_dispex = { "HTMLEmbedElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLEmbedElement_event_target_vtbl.dispex_vtbl, DispHTMLEmbed_tid, HTMLEmbedElement_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Use specific dispex for each SVG element.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: bbd9c41a0eca07febf010313b63c9bd7b91932e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbd9c41a0eca07febf010313b63c9b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use specific dispex for each SVG element. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 4 +-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/svg.c | 84 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 79 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e10c5067d33..af1fef47026 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7314,7 +7314,7 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } } -static const tid_t HTMLElement_iface_tids[] = { +const tid_t HTMLElement_iface_tids[] = { HTMLELEMENT_TIDS, 0 }; @@ -7933,7 +7933,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n nsIDOMHTMLElement *html_element; nsresult nsres; - HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem, dispex_data ? dispex_data : &HTMLUnknownElement_dispex); + HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem, dispex_data); /* No AddRef, share reference with HTMLDOMNode */ assert((nsIDOMNode*)nselem == This->node.nsnode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 41034f42636..86939b1874e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -888,6 +888,7 @@ typedef struct { IHTMLElement4_tid, \ IHTMLUniqueName_tid +extern const tid_t HTMLElement_iface_tids[]; extern cp_static_data_t HTMLElementEvents2_data; #define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data} extern const cpc_entry_t HTMLElement_cpc[]; diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index 84324cacf2d..3ebf38fd7bd 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -31,6 +31,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -196,12 +197,27 @@ static const NodeImplVtbl SVGElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; -static void init_svg_element(SVGElement *svg_element, HTMLDocumentNode *doc, nsIDOMSVGElement *nselem) +static const event_target_vtbl_t SVGElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + +static dispex_static_data_t SVGElement_dispex = { + "HTMLUnknownElement", + &SVGElement_event_target_vtbl.dispex_vtbl, + DispHTMLUnknownElement_tid, + HTMLElement_iface_tids, + HTMLElement_init_dispex_info +}; + +static void init_svg_element(SVGElement *svg_element, HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, dispex_static_data_t *dispex_data) { - if(!svg_element->element.node.vtbl) - svg_element->element.node.vtbl = &SVGElementImplVtbl; svg_element->ISVGElement_iface.lpVtbl = &SVGElementVtbl; - HTMLElement_Init(&svg_element->element, doc, (nsIDOMElement*)nselem, NULL); + HTMLElement_Init(&svg_element->element, doc, (nsIDOMElement*)nselem, dispex_data); } struct SVGSVGElement { @@ -731,6 +747,23 @@ static const NodeImplVtbl SVGSVGElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; +static const event_target_vtbl_t SVGSVGElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + +static dispex_static_data_t SVGSVGElement_dispex = { + "HTMLUnknownElement", + &SVGSVGElement_event_target_vtbl.dispex_vtbl, + DispHTMLUnknownElement_tid, + HTMLElement_iface_tids, + HTMLElement_init_dispex_info +}; + static HRESULT create_viewport_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) { SVGSVGElement *ret; @@ -742,7 +775,7 @@ static HRESULT create_viewport_element(HTMLDocumentNode *doc, nsIDOMSVGElement * ret->ISVGSVGElement_iface.lpVtbl = &SVGSVGElementVtbl; ret->svg_element.element.node.vtbl = &SVGSVGElementImplVtbl; - init_svg_element(&ret->svg_element, doc, nselem); + init_svg_element(&ret->svg_element, doc, nselem, &SVGSVGElement_dispex); *elem = &ret->svg_element.element; return S_OK; @@ -894,6 +927,23 @@ static const NodeImplVtbl SVGCircleElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; +static const event_target_vtbl_t SVGCircleElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + +static dispex_static_data_t SVGCircleElement_dispex = { + "HTMLUnknownElement", + &SVGCircleElement_event_target_vtbl.dispex_vtbl, + DispHTMLUnknownElement_tid, + HTMLElement_iface_tids, + HTMLElement_init_dispex_info +}; + static HRESULT create_circle_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) { SVGCircleElement *ret; @@ -905,7 +955,7 @@ static HRESULT create_circle_element(HTMLDocumentNode *doc, nsIDOMSVGElement *ns ret->ISVGCircleElement_iface.lpVtbl = &SVGCircleElementVtbl; ret->svg_element.element.node.vtbl = &SVGCircleElementImplVtbl; - init_svg_element(&ret->svg_element, doc, nselem); + init_svg_element(&ret->svg_element, doc, nselem, &SVGCircleElement_dispex); *elem = &ret->svg_element.element; return S_OK; @@ -1132,6 +1182,23 @@ static const NodeImplVtbl SVGTSpanElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; +static const event_target_vtbl_t SVGTSpanElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + +static dispex_static_data_t SVGTSpanElement_dispex = { + "HTMLUnknownElement", + &SVGTSpanElement_event_target_vtbl.dispex_vtbl, + DispHTMLUnknownElement_tid, + HTMLElement_iface_tids, + HTMLElement_init_dispex_info +}; + static HRESULT create_tspan_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) { SVGTSpanElement *ret; @@ -1142,7 +1209,7 @@ static HRESULT create_tspan_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nse ret->svg_element.element.node.vtbl = &SVGTSpanElementImplVtbl; init_text_content_element(&ret->text_content, &ret->svg_element); - init_svg_element(&ret->svg_element, doc, nselem); + init_svg_element(&ret->svg_element, doc, nselem, &SVGTSpanElement_dispex); *elem = &ret->svg_element.element; return S_OK; @@ -1165,7 +1232,8 @@ HRESULT create_svg_element(HTMLDocumentNode *doc, nsIDOMSVGElement *dom_element, if(!svg_element) return E_OUTOFMEMORY; - init_svg_element(svg_element, doc, dom_element); + svg_element->element.node.vtbl = &SVGElementImplVtbl; + init_svg_element(svg_element, doc, dom_element, &SVGElement_dispex); *elem = &svg_element->element; return S_OK; }

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's query_interface for DocumentType nodes.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 1b2eb0d87931de967fbb9b265f3d6fb4daca46ee URL: https://gitlab.winehq.org/wine/wine/-/commit/1b2eb0d87931de967fbb9b265f3d6f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use the dispex's query_interface for DocumentType nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f5c9bf8ed1a..96faa3c6efc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -295,16 +295,6 @@ static inline DocumentType *DocumentType_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, DocumentType, node.event_target.dispex); } -static void *DocumentType_QI(HTMLDOMNode *iface, REFIID riid) -{ - DocumentType *This = DocumentType_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IDOMDocumentType, riid)) - return &This->IDOMDocumentType_iface; - - return HTMLDOMNode_QI(&This->node, riid); -} - static HRESULT DocumentType_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { DocumentType *This = DocumentType_from_HTMLDOMNode(iface); @@ -315,11 +305,20 @@ static HRESULT DocumentType_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDO static const cpc_entry_t DocumentType_cpc[] = {{NULL}}; static const NodeImplVtbl DocumentTypeImplVtbl = { - .qi = DocumentType_QI, .cpc_entries = DocumentType_cpc, .clone = DocumentType_clone }; +static void *DocumentType_query_interface(DispatchEx *dispex, REFIID riid) +{ + DocumentType *This = DocumentType_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IDOMDocumentType, riid)) + return &This->IDOMDocumentType_iface; + + return HTMLDOMNode_QI(&This->node, riid); +} + static nsISupports *DocumentType_get_gecko_target(DispatchEx *dispex) { DocumentType *This = DocumentType_from_DispatchEx(dispex); @@ -355,7 +354,7 @@ static IHTMLEventObj *DocumentType_set_current_event(DispatchEx *dispex, IHTMLEv static const event_target_vtbl_t DocumentType_event_target_vtbl = { { - .query_interface = HTMLDOMNode_query_interface, + .query_interface = DocumentType_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDOMNode_unlink

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's query_interface for Document nodes and fragments.
by Alexandre Julliard 19 Sep '23

19 Sep '23

Module: wine Branch: master Commit: 57f7159a21dac402b73dade0c7905efc5da3bf1e URL: https://gitlab.winehq.org/wine/wine/-/commit/57f7159a21dac402b73dade0c7905e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use the dispex's query_interface for Document nodes and fragments. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 152 ++++++++++++++++++++++++-------------------------- 1 file changed, 74 insertions(+), 78 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 96faa3c6efc..30a337c3761 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5696,12 +5696,82 @@ static inline HTMLDocumentNode *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLDocumentNode, node); } -static void *HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid) +void detach_document_node(HTMLDocumentNode *doc) +{ + unsigned i; + + while(!list_empty(&doc->plugin_hosts)) + detach_plugin_host(LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry)); + + if(doc->dom_implementation) + detach_dom_implementation(doc->dom_implementation); + + unlink_ref(&doc->dom_implementation); + unlink_ref(&doc->namespaces); + detach_events(doc); + detach_selection(doc); + detach_ranges(doc); + + for(i=0; i < doc->elem_vars_cnt; i++) + free(doc->elem_vars[i]); + free(doc->elem_vars); + doc->elem_vars_cnt = doc->elem_vars_size = 0; + doc->elem_vars = NULL; + + unlink_ref(&doc->catmgr); + if(doc->browser) { + list_remove(&doc->browser_entry); + doc->browser = NULL; + } +} + +static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - if(IsEqualGUID(&IID_IUnknown, riid)) - return &This->IHTMLDocument2_iface; + TRACE("(%p)\n", This); + + free(This->event_vector); + ConnectionPointContainer_Destroy(&This->cp_container); +} + +static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { + .clsid = &CLSID_HTMLDocument, + .destructor = HTMLDocumentNode_destructor, + .cpc_entries = HTMLDocumentNode_cpc, + .clone = HTMLDocumentNode_clone, +}; + +static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + HTMLDocumentNode *new_node; + HRESULT hres; + + hres = create_document_fragment(nsnode, This->node.doc, &new_node); + if(FAILED(hres)) + return hres; + + *ret = &new_node->node; + return S_OK; +} + +static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocumentNode, node.event_target.dispex); +} + +static void *HTMLDocumentNode_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + if(IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IDispatchEx, riid)) return &This->IDispatchEx_iface; if(IsEqualGUID(&IID_IHTMLDocument, riid) || IsEqualGUID(&IID_IHTMLDocument2, riid)) @@ -5796,79 +5866,6 @@ static void *HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid) return HTMLDOMNode_QI(&This->node, riid); } -void detach_document_node(HTMLDocumentNode *doc) -{ - unsigned i; - - while(!list_empty(&doc->plugin_hosts)) - detach_plugin_host(LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry)); - - if(doc->dom_implementation) - detach_dom_implementation(doc->dom_implementation); - - unlink_ref(&doc->dom_implementation); - unlink_ref(&doc->namespaces); - detach_events(doc); - detach_selection(doc); - detach_ranges(doc); - - for(i=0; i < doc->elem_vars_cnt; i++) - free(doc->elem_vars[i]); - free(doc->elem_vars); - doc->elem_vars_cnt = doc->elem_vars_size = 0; - doc->elem_vars = NULL; - - unlink_ref(&doc->catmgr); - if(doc->browser) { - list_remove(&doc->browser_entry); - doc->browser = NULL; - } -} - -static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) -{ - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - - TRACE("(%p)\n", This); - - free(This->event_vector); - ConnectionPointContainer_Destroy(&This->cp_container); -} - -static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) -{ - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { - .clsid = &CLSID_HTMLDocument, - .qi = HTMLDocumentNode_QI, - .destructor = HTMLDocumentNode_destructor, - .cpc_entries = HTMLDocumentNode_cpc, - .clone = HTMLDocumentNode_clone, -}; - -static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) -{ - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - HTMLDocumentNode *new_node; - HRESULT hres; - - hres = create_document_fragment(nsnode, This->node.doc, &new_node); - if(FAILED(hres)) - return hres; - - *ret = &new_node->node; - return S_OK; -} - -static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLDocumentNode, node.event_target.dispex); -} - static void HTMLDocumentNode_unlink(DispatchEx *dispex) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); @@ -6060,7 +6057,7 @@ static HRESULT HTMLDocumentNode_location_hook(DispatchEx *dispex, WORD flags, DI static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { - .query_interface = HTMLDOMNode_query_interface, + .query_interface = HTMLDocumentNode_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDocumentNode_unlink, @@ -6078,7 +6075,6 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { .clsid = &CLSID_HTMLDocument, - .qi = HTMLDocumentNode_QI, .destructor = HTMLDocumentNode_destructor, .cpc_entries = HTMLDocumentNode_cpc, .clone = HTMLDocumentFragment_clone,

1 0