From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/htmlevent.c | 7 ------- dlls/mshtml/htmlnode.c | 6 +----- dlls/mshtml/htmlselect.c | 15 +-------------- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/tests/documentmode.js | 2 +- 5 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8125a3eebc8..ba30eb41f53 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -5140,13 +5140,6 @@ static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) return wcscmp(key, WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry)->type); }
-void EventTarget_Init(EventTarget *event_target, dispex_static_data_t *dispex_data, compat_mode_t compat_mode) -{ - init_dispatch(&event_target->dispex, dispex_data, NULL, compat_mode); - event_target->IEventTarget_iface.lpVtbl = &EventTargetVtbl; - wine_rb_init(&event_target->handler_map, event_id_cmp); -} - void init_event_target(EventTarget *event_target, dispex_static_data_t *dispex_data, HTMLInnerWindow *script_global) { compat_mode_t compat_mode = script_global && script_global->doc ? script_global->doc->document_mode : COMPAT_MODE_NONE; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index f752d2595d0..3123e9dd72e 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1288,11 +1288,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; node->IHTMLDOMNode3_iface.lpVtbl = &HTMLDOMNode3Vtbl;
- /* FIXME: We can't use new bindings for nodes with custom properties yet */ - if(dispex_data->vtbl->get_name) - EventTarget_Init(&node->event_target, dispex_data, doc->document_mode); - else - init_event_target(&node->event_target, dispex_data, doc->script_global); + init_event_target(&node->event_target, dispex_data, doc->script_global);
if(&doc->node != node) IHTMLDOMNode_AddRef(&doc->node.IHTMLDOMNode_iface); diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 8cfbbe58c45..4fb0b05f85f 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -1234,19 +1234,6 @@ static HRESULT HTMLSelectElement_get_dispid(DispatchEx *dispex, const WCHAR *nam return S_OK; }
-static HRESULT HTMLSelectElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) -{ - DWORD idx = id - DISPID_OPTIONCOL_0; - WCHAR buf[11]; - UINT len; - - if(idx > MSHTML_CUSTOM_DISPID_CNT) - return DISP_E_MEMBERNOTFOUND; - - len = swprintf(buf, ARRAY_SIZE(buf), L"%u", idx); - return (*name = SysAllocStringLen(buf, len)) ? S_OK : E_OUTOFMEMORY; -} - static HRESULT HTMLSelectElement_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -1297,7 +1284,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, + .get_prop_desc = dispex_index_prop_desc, .invoke = HTMLSelectElement_invoke }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 35cb705d0a5..d48ba2f32ac 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1263,7 +1263,6 @@ HRESULT create_svg_element(HTMLDocumentNode*,nsIDOMSVGElement*,const WCHAR*,HTML void HTMLDOMNode_Init(HTMLDocumentNode*,HTMLDOMNode*,nsIDOMNode*,dispex_static_data_t*); void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMElement*,dispex_static_data_t*);
-void EventTarget_Init(EventTarget*,dispex_static_data_t*,compat_mode_t); void init_event_target(EventTarget*,dispex_static_data_t*,HTMLInnerWindow*); void *EventTarget_query_interface(EventTarget*,REFIID); void EventTarget_init_dispex_info(dispex_data_t*,compat_mode_t); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 0a9be1204e4..6be48816645 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -199,7 +199,7 @@ sync_test("builtin_toString", function() { [ "samp", "Phrase", -1 ], [ "script", "Script" ], [ "section", "" ], - [ "select", "Select", -1 ], + [ "select", "Select" ], [ "small", "Phrase", -1 ], [ "source", "Source", -1 ], [ "span", "Span", -1 ],