September 2023 - Wine-commits

Henri Verbeet : Release 1.9.
by Alexandre Julliard 21 Sep '23

21 Sep '23

Module: vkd3d Branch: master Commit: 90d4529f27b477bf54e3a8657db2fa78c3af5eec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/90d4529f27b477bf54e3a8657db2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 20 12:00:00 2023 +0200 Release 1.9. --- ANNOUNCE | 136 +++++++++++++++++++----------------- AUTHORS | 2 + Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 11 files changed, 88 insertions(+), 74 deletions(-)

1 0

Connor McAdams : uiautomationcore/tests: Increase wait timeout for cross-process event with navigation.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 08f3de268a2c91d34da4de94e5ea5b3b54a4e210 URL: https://gitlab.winehq.org/wine/wine/-/commit/08f3de268a2c91d34da4de94e5ea5b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 20 08:56:28 2023 -0400 uiautomationcore/tests: Increase wait timeout for cross-process event with navigation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index ec2e7e31d6b..f396adc1200 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -15312,7 +15312,7 @@ static void test_UiaAddEvent_client_proc(void) SET_EXPECT(uia_event_callback); post_event_message(hwnd, WM_UIA_TEST_RAISE_EVENT, 0, PROVIDER_CHILD_ID, ProviderOptions_ServerSideProvider); - ok(!WaitForSingleObject(EventData.event_handle, 2000), "Wait for event_handle failed.\n"); + ok(!WaitForSingleObject(EventData.event_handle, 5000), "Wait for event_handle failed.\n"); CHECK_CALLED(prov_callback_base_hwnd); CHECK_CALLED_MULTI(prov_callback_nonclient, 2); todo_wine CHECK_CALLED_MULTI(prov_callback_proxy, 2);

1 0

Connor McAdams : uiautomationcore: Pass through failure HRESULTS on MSAA accState based property IDs for MSAA providers.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: ef1d5a0e0a70da93b11f55dd93b64b102f44203c URL: https://gitlab.winehq.org/wine/wine/-/commit/ef1d5a0e0a70da93b11f55dd93b64b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 5 14:40:33 2023 -0400 uiautomationcore: Pass through failure HRESULTS on MSAA accState based property IDs for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 8 ++++++ dlls/uiautomationcore/uia_provider.c | 42 +++++++++++++++++++++--------- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index f396adc1200..dc0048f0c73 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -4476,6 +4476,14 @@ static void test_uia_prov_from_acc_properties(void) ok(check_variant_bool(&v, x), "V_BOOL(&v) = %#x\n", V_BOOL(&v)); CHECK_ACC_METHOD_CALLED(&Accessible, get_accState); } + + /* Failure HRESULTs are passed through. */ + Accessible.state = 0; + SET_ACC_METHOD_EXPECT(&Accessible, get_accState); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, state->prop_id, &v); + ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_EMPTY, "Unexpected V_VT %d\n", V_VT(&v)); + CHECK_ACC_METHOD_CALLED(&Accessible, get_accState); } Accessible.state = 0; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 729dc7ab2c5..c6483ef5349 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -27,17 +27,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76); -static BOOL msaa_check_acc_state(IAccessible *acc, VARIANT cid, ULONG flag) +/* Returns S_OK if flag is set, S_FALSE if it is not. */ +static HRESULT msaa_check_acc_state_hres(IAccessible *acc, VARIANT cid, ULONG flag) { HRESULT hr; VARIANT v; VariantInit(&v); hr = IAccessible_get_accState(acc, cid, &v); - if (SUCCEEDED(hr) && V_VT(&v) == VT_I4 && (V_I4(&v) & flag)) - return TRUE; + if (SUCCEEDED(hr)) + hr = ((V_VT(&v) == VT_I4) && (V_I4(&v) & flag)) ? S_OK : S_FALSE; - return FALSE; + return hr; +} + +static BOOL msaa_check_acc_state(IAccessible *acc, VARIANT cid, ULONG flag) +{ + return msaa_check_acc_state_hres(acc, cid, flag) == S_OK; } static HRESULT msaa_acc_get_service(IAccessible *acc, REFGUID sid, REFIID riid, void **service) @@ -657,23 +663,35 @@ HRESULT WINAPI msaa_provider_GetPropertyValue(IRawElementProviderSimple *iface, break; case UIA_HasKeyboardFocusPropertyId: - variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, - STATE_SYSTEM_FOCUSED)); + hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_FOCUSED); + if (FAILED(hr)) + return hr; + + variant_init_bool(ret_val, hr == S_OK); break; case UIA_IsKeyboardFocusablePropertyId: - variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, - STATE_SYSTEM_FOCUSABLE)); + hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_FOCUSABLE); + if (FAILED(hr)) + return hr; + + variant_init_bool(ret_val, hr == S_OK); break; case UIA_IsEnabledPropertyId: - variant_init_bool(ret_val, !msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, - STATE_SYSTEM_UNAVAILABLE)); + hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_UNAVAILABLE); + if (FAILED(hr)) + return hr; + + variant_init_bool(ret_val, hr == S_FALSE); break; case UIA_IsPasswordPropertyId: - variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, - STATE_SYSTEM_PROTECTED)); + hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_PROTECTED); + if (FAILED(hr)) + return hr; + + variant_init_bool(ret_val, hr == S_OK); break; case UIA_NamePropertyId:

1 0

Connor McAdams : uiautomationcore: Implement IRawElementProviderFragmentRoot::GetFocus for MSAA providers.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: c7e976f81989d7c301c3746a74c216cda07cc8b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7e976f81989d7c301c3746a74c216… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 6 08:54:11 2023 -0400 uiautomationcore: Implement IRawElementProviderFragmentRoot::GetFocus for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 291 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_provider.c | 131 ++++++++++++- 2 files changed, 419 insertions(+), 3 deletions(-)

1 0

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

20 Sep '23

Module: wine Branch: master Commit: c22bd318b3bd4054a092cf74f7f63837d7bff7fc URL: https://gitlab.winehq.org/wine/wine/-/commit/c22bd318b3bd4054a092cf74f7f638… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jul 13 12:03:05 2023 -0400 uiautomationcore: Add stub IProxyProviderWinEventHandler implementation for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 208 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_provider.c | 46 +++++++ 2 files changed, 251 insertions(+), 3 deletions(-)

1 0

Connor McAdams : uiautomationcore: Handle EVENT_SYSTEM_ALERT in IProxyProviderWinEventHandler::RespondToWinEvent() for MSAA providers.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 05b4619d88dc63d745309d23b86615b249ef2c73 URL: https://gitlab.winehq.org/wine/wine/-/commit/05b4619d88dc63d745309d23b86615… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jul 13 12:39:18 2023 -0400 uiautomationcore: Handle EVENT_SYSTEM_ALERT in IProxyProviderWinEventHandler::RespondToWinEvent() for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 +++++----- dlls/uiautomationcore/uia_provider.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 7df2c9bb792..842525b78fa 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3543,16 +3543,16 @@ static void test_uia_prov_from_acc_winevent_handler(HWND hwnd) SET_EXPECT(ProxyEventSink_AddAutomationEvent); hr = IProxyProviderWinEventHandler_RespondToWinEvent(handler, EVENT_SYSTEM_ALERT, hwnd, OBJID_CLIENT, CHILDID_SELF, &ProxyEventSink.IProxyProviderWinEventSink_iface); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine CHECK_CALLED(ProxyEventSink_AddAutomationEvent); - todo_wine ok(ProxyEventSink.event_id == UIA_SystemAlertEventId, "Unexpected event_id %d\n", ProxyEventSink.event_id); - todo_wine ok(ProxyEventSink.event_elprov == elprov, "Unexpected event_elprov %p\n", ProxyEventSink.event_elprov); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + CHECK_CALLED(ProxyEventSink_AddAutomationEvent); + ok(ProxyEventSink.event_id == UIA_SystemAlertEventId, "Unexpected event_id %d\n", ProxyEventSink.event_id); + ok(ProxyEventSink.event_elprov == elprov, "Unexpected event_elprov %p\n", ProxyEventSink.event_elprov); proxy_event_sink_clear(); /* EVENT_OBJECT_FOCUS is not handled. */ hr = IProxyProviderWinEventHandler_RespondToWinEvent(handler, EVENT_OBJECT_FOCUS, hwnd, OBJID_CLIENT, CHILDID_SELF, &ProxyEventSink.IProxyProviderWinEventSink_iface); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* EVENT_OBJECT_NAMECHANGE. */ SET_EXPECT(ProxyEventSink_AddAutomationPropertyChangedEvent); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 6360430f403..269ce63a2fd 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1403,8 +1403,34 @@ static ULONG WINAPI msaa_winevent_handler_Release(IProxyProviderWinEventHandler static HRESULT WINAPI msaa_winevent_handler_RespondToWinEvent(IProxyProviderWinEventHandler *iface, DWORD event_id, HWND hwnd, LONG objid, LONG cid, IProxyProviderWinEventSink *event_sink) { - FIXME("%p, %ld, %p, %ld, %ld, %p: stub\n", iface, event_id, hwnd, objid, cid, event_sink); - return E_NOTIMPL; + struct msaa_provider *msaa_prov = impl_from_msaa_winevent_handler(iface); + HRESULT hr; + + TRACE("%p, %ld, %p, %ld, %ld, %p\n", iface, event_id, hwnd, objid, cid, event_sink); + + switch (event_id) + { + case EVENT_SYSTEM_ALERT: + hr = IProxyProviderWinEventSink_AddAutomationEvent(event_sink, &msaa_prov->IRawElementProviderSimple_iface, + UIA_SystemAlertEventId); + if (FAILED(hr)) + WARN("AddAutomationEvent failed with hr %#lx\n", hr); + break; + + case EVENT_OBJECT_REORDER: + case EVENT_OBJECT_SELECTION: + case EVENT_OBJECT_NAMECHANGE: + case EVENT_OBJECT_VALUECHANGE: + case EVENT_OBJECT_HELPCHANGE: + case EVENT_OBJECT_INVOKED: + FIXME("WinEvent %ld currently unimplemented\n", event_id); + return E_NOTIMPL; + + default: + break; + } + + return S_OK; } static const IProxyProviderWinEventHandlerVtbl msaa_winevent_handler_vtbl = {

1 0

Esme Povirk : user32/tests: Fix WM_WINDOWPOSCHANGED entries.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: ee17400c05d88fa29d0b895fa01902adfc91ba7f URL: https://gitlab.winehq.org/wine/wine/-/commit/ee17400c05d88fa29d0b895fa01902… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 20 14:48:21 2023 -0500 user32/tests: Fix WM_WINDOWPOSCHANGED entries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54031 --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90bbe6146cd..7bf3c14d9f0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19561,9 +19561,9 @@ static const struct message send_message_3[] = { { 0 } }; static const struct message send_message_5[] = { - { WM_WINDOWPOSCHANGING, sent|wparam|lparam|optional, 0, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ { WM_GETMINMAXINFO, sent|defwinproc|optional }, /* win7+ dual monitor */ - { WM_WINDOWPOSCHANGING, sent|wparam|lparam|optional, 0, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOZORDER }, /* win7+ dual monitor */ { WM_GETMINMAXINFO, sent|defwinproc|optional }, /* win7+ dual monitor */ { 0 } };

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's destructor for all nodes.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 70dcbe73acb6357cf60aca21d6442459ebf91db0 URL: https://gitlab.winehq.org/wine/wine/-/commit/70dcbe73acb6357cf60aca21d64424… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:30 2023 +0300 mshtml: Use the dispex's destructor for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlarea.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmldoc.c | 23 ++++++++++------------- dlls/mshtml/htmlelem.c | 7 ++++--- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlframe.c | 14 +++++++------- dlls/mshtml/htmlgeneric.c | 2 +- dlls/mshtml/htmlhead.c | 8 ++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmlnode.c | 2 -- dlls/mshtml/htmlobject.c | 10 +++++----- dlls/mshtml/htmlscript.c | 8 ++++---- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 13 ++++--------- dlls/mshtml/htmltable.c | 6 +++--- dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/svg.c | 8 ++++---- 23 files changed, 60 insertions(+), 71 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's get_dispid for all nodes.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: a5ab4baed7042f772f1e8931c2c39c4ef44f167d URL: https://gitlab.winehq.org/wine/wine/-/commit/a5ab4baed7042f772f1e8931c2c39c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:30 2023 +0300 mshtml: Use the dispex's get_dispid for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 10 ---------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 8 ++++---- dlls/mshtml/htmlframe.c | 16 ++++++++-------- dlls/mshtml/htmlobject.c | 8 ++++---- dlls/mshtml/htmlselect.c | 6 +++--- dlls/mshtml/mshtml_private.h | 2 -- 7 files changed, 19 insertions(+), 32 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's get_name for all nodes.
by Alexandre Julliard 20 Sep '23

20 Sep '23

Module: wine Branch: master Commit: 85750f0963548bbd0e2671045c7e747288206f21 URL: https://gitlab.winehq.org/wine/wine/-/commit/85750f0963548bbd0e2671045c7e74… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 20 16:14:30 2023 +0300 mshtml: Use the dispex's get_name for all nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 11 ----------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 6 +++--- dlls/mshtml/htmlframe.c | 12 ++++++------ dlls/mshtml/htmlobject.c | 6 +++--- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 -- 7 files changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ed8d3923854..8fdce41df99 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6886,17 +6886,6 @@ void HTMLElement_destructor(DispatchEx *dispex) HTMLDOMNode_destructor(&This->node.event_target.dispex); } -HRESULT HTMLElement_get_name(DispatchEx *dispex, DISPID id, BSTR *name) -{ - HTMLElement *This = impl_from_DispatchEx(dispex); - - if(This->node.vtbl->get_name) - return This->node.vtbl->get_name(&This->node, id, name); - - ERR("(%p): element has no get_name method\n", This); - return DISP_E_MEMBERNOTFOUND; -} - HRESULT HTMLElement_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e6031168ac8..cf17dc9943c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -145,7 +145,6 @@ ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx*); IHTMLEventObj *HTMLElement_set_current_event(DispatchEx*,IHTMLEventObj*); #define HTMLELEMENT_DISPEX_VTBL_ENTRIES \ - .get_name = HTMLElement_get_name, \ .invoke = HTMLElement_invoke, \ .populate_props = HTMLElement_populate_props diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index b5159ef4888..7f1986b839f 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -902,9 +902,9 @@ static HRESULT HTMLFormElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD g return hres; } -static HRESULT HTMLFormElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLFormElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLFormElement *This = impl_from_HTMLDOMNode(iface); + HTMLFormElement *This = impl_from_DispatchEx(dispex); DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; nsIDOMHTMLCollection *elements; nsresult nsres; @@ -967,7 +967,6 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = { .clone = HTMLElement_clone, .handle_event = HTMLFormElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, - .get_name = HTMLFormElement_dispex_get_name, .invoke = HTMLFormElement_invoke, }; @@ -979,6 +978,7 @@ static const event_target_vtbl_t HTMLFormElement_event_target_vtbl = { .traverse = HTMLFormElement_traverse, .unlink = HTMLFormElement_unlink, .get_dispid = HTMLFormElement_get_dispid, + .get_name = HTMLFormElement_dispex_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 77185dea6ef..f122066af9c 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -974,9 +974,9 @@ static HRESULT HTMLFrameElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, dispid); } -static HRESULT HTMLFrameElement_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLFrameElement_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + HTMLFrameElement *This = frame_from_DispatchEx(dispex); DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; if(!This->framebase.content_window || @@ -1009,7 +1009,6 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .get_document = HTMLFrameElement_get_document, .get_readystate = HTMLFrameElement_get_readystate, - .get_name = HTMLFrameElement_get_name, .invoke = HTMLFrameElement_invoke, .bind_to_tree = HTMLFrameElement_bind_to_tree, }; @@ -1022,6 +1021,7 @@ static const event_target_vtbl_t HTMLFrameElement_event_target_vtbl = { .traverse = HTMLFrameElement_traverse, .unlink = HTMLFrameElement_unlink, .get_dispid = HTMLFrameElement_get_dispid, + .get_name = HTMLFrameElement_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; @@ -1564,9 +1564,9 @@ static HRESULT HTMLIFrame_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, dispid); } -static HRESULT HTMLIFrame_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLIFrame_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + HTMLIFrame *This = iframe_from_DispatchEx(dispex); DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; if(!This->framebase.content_window || @@ -1599,7 +1599,6 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .get_document = HTMLIFrame_get_document, .get_readystate = HTMLIFrame_get_readystate, - .get_name = HTMLIFrame_get_name, .invoke = HTMLIFrame_invoke, .bind_to_tree = HTMLIFrame_bind_to_tree, }; @@ -1612,6 +1611,7 @@ static const event_target_vtbl_t HTMLIFrame_event_target_vtbl = { .traverse = HTMLIFrame_traverse, .unlink = HTMLIFrame_unlink, .get_dispid = HTMLIFrame_get_dispid, + .get_name = HTMLIFrame_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 3a8dbdb1f02..bff2fc64bb8 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -719,9 +719,9 @@ static HRESULT HTMLObjectElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD return get_plugin_dispid(&This->plugin_container, name, dispid); } -static HRESULT HTMLObjectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLObjectElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + HTMLObjectElement *This = impl_from_DispatchEx(dispex); FIXME("(%p)->(%lx %p)\n", This, id, name); @@ -745,7 +745,6 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, .get_readystate = HTMLObjectElement_get_readystate, - .get_name = HTMLObjectElement_dispex_get_name, .invoke = HTMLObjectElement_invoke, }; @@ -757,6 +756,7 @@ static const event_target_vtbl_t HTMLObjectElement_event_target_vtbl = { .traverse = HTMLObjectElement_traverse, .unlink = HTMLObjectElement_unlink, .get_dispid = HTMLObjectElement_get_dispid, + .get_name = HTMLObjectElement_dispex_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index a9b53dfacee..20906c86037 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -1373,7 +1373,7 @@ static HRESULT HTMLSelectElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD return S_OK; } -static HRESULT HTMLSelectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLSelectElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { DWORD idx = id - DISPID_OPTIONCOL_0; WCHAR buf[11]; @@ -1427,7 +1427,6 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .put_disabled = HTMLSelectElementImpl_put_disabled, .get_disabled = HTMLSelectElementImpl_get_disabled, - .get_name = HTMLSelectElement_dispex_get_name, .invoke = HTMLSelectElement_invoke, }; @@ -1439,6 +1438,7 @@ static const event_target_vtbl_t HTMLSelectElement_event_target_vtbl = { .traverse = HTMLSelectElement_traverse, .unlink = HTMLSelectElement_unlink, .get_dispid = HTMLSelectElement_get_dispid, + .get_name = HTMLSelectElement_dispex_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d08768fa012..0779db88dd8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -822,7 +822,6 @@ typedef struct { HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**); HRESULT (*get_readystate)(HTMLDOMNode*,BSTR*); - HRESULT (*get_name)(HTMLDOMNode*,DISPID,BSTR*); HRESULT (*invoke)(HTMLDOMNode*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*bind_to_tree)(HTMLDOMNode*); BOOL (*is_text_edit)(HTMLDOMNode*); @@ -1209,7 +1208,6 @@ void HTMLDOMNode_init_dispex_info(dispex_data_t*,compat_mode_t); void *HTMLElement_query_interface(DispatchEx*,REFIID); void HTMLElement_destructor(DispatchEx*); -HRESULT HTMLElement_get_name(DispatchEx*,DISPID,BSTR*); HRESULT HTMLElement_invoke(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT HTMLElement_populate_props(DispatchEx*); HRESULT HTMLElement_clone(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**);

1 0