Jacek Caban : mshtml: Use IDOMEvent for IHTMLEventObj:: get_type implementation.
Alexandre Julliard
julliard at winehq.org
Fri Dec 1 14:08:19 CST 2017
Module: wine
Branch: master
Commit: 1508eb484fc7acfc8d0c095ea9d8da272a7c13b8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1508eb484fc7acfc8d0c095ea9d8da272a7c13b8
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Dec 1 17:02:13 2017 +0100
mshtml: Use IDOMEvent for IHTMLEventObj::get_type implementation.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlevent.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 4278d22..940fccc 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -296,7 +296,6 @@ typedef struct {
LONG ref;
- const event_info_t *type;
DOMEvent *event;
VARIANT return_value;
} HTMLEventObj;
@@ -613,13 +612,12 @@ static HRESULT WINAPI HTMLEventObj_get_type(IHTMLEventObj *iface, BSTR *p)
TRACE("(%p)->(%p)\n", This, p);
- if(!This->type) {
+ if(!This->event) {
*p = NULL;
return S_OK;
}
- *p = SysAllocString(This->type->name);
- return *p ? S_OK : E_OUTOFMEMORY;
+ return IDOMEvent_get_type(&This->event->IDOMEvent_iface, p);
}
static HRESULT WINAPI HTMLEventObj_get_qualifier(IHTMLEventObj *iface, BSTR *p)
@@ -1568,10 +1566,8 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event)
if(!event->event_obj && !event->no_event_obj) {
event_obj_ref = alloc_event_obj(event);
- if(event_obj_ref) {
- event_obj_ref->type = event_info + event->event_id;
+ if(event_obj_ref)
event->event_obj = &event_obj_ref->IHTMLEventObj_iface;
- }
}
target_vtbl = dispex_get_vtbl(&event_target->dispex);
@@ -1671,7 +1667,6 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va
return E_OUTOFMEMORY;
}
- event_obj->type = event_info + eid;
if(!event_obj->event)
hres = create_document_event(node->doc, eid, &event_obj->event);
More information about the wine-cvs
mailing list