Jacek Caban : mshtml: Added IHTMLEventObj::get_srcElement implementation.
Alexandre Julliard
julliard at winehq.org
Mon Oct 13 06:37:30 CDT 2008
Module: wine
Branch: master
Commit: 8db98e9eb6731c5cd27709fbeb4fec35b89d131b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db98e9eb6731c5cd27709fbeb4fec35b89d131b
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Oct 10 15:47:38 2008 -0500
mshtml: Added IHTMLEventObj::get_srcElement implementation.
---
dlls/mshtml/htmlevent.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index d6d5fa8..9995544 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -84,7 +84,10 @@ eventid_t str_to_eid(LPCWSTR str)
typedef struct {
DispatchEx dispex;
const IHTMLEventObjVtbl *lpIHTMLEventObjVtbl;
+
LONG ref;
+
+ HTMLDOMNode *target;
} HTMLEventObj;
#define HTMLEVENTOBJ(x) ((IHTMLEventObj*) &(x)->lpIHTMLEventObjVtbl)
@@ -177,8 +180,10 @@ static HRESULT WINAPI HTMLEventObj_Invoke(IHTMLEventObj *iface, DISPID dispIdMem
static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLElement **p)
{
HTMLEventObj *This = HTMLEVENTOBJ_THIS(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(This->target), &IID_IHTMLElement, (void**)p);
}
static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL *p)
@@ -398,13 +403,15 @@ static dispex_static_data_t HTMLEventObj_dispex = {
HTMLEventObj_iface_tids
};
-static IHTMLEventObj *create_event(void)
+static IHTMLEventObj *create_event(HTMLDOMNode *target)
{
HTMLEventObj *ret;
ret = heap_alloc(sizeof(*ret));
ret->lpIHTMLEventObjVtbl = &HTMLEventObjVtbl;
ret->ref = 1;
+ ret->target = target;
+ IHTMLDOMNode_AddRef(HTMLDOMNODE(target));
init_dispex(&ret->dispex, (IUnknown*)HTMLEVENTOBJ(ret), &HTMLEventObj_dispex);
@@ -433,7 +440,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target)
if(node && node->event_target && node->event_target->event_table[eid]) {
if(!event_obj)
- event_obj = doc->window->event = create_event();
+ event_obj = doc->window->event = create_event(get_node(doc, target, TRUE));
TRACE("%s >>>\n", debugstr_w(event_info[eid].name));
call_disp_func(doc, node->event_target->event_table[eid], (IDispatch*)HTMLDOMNODE(node));
@@ -459,7 +466,7 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target)
if((event_info[eid].flags & EVENT_BUBBLE) && doc->event_target && doc->event_target->event_table[eid]) {
if(!event_obj)
- event_obj = doc->window->event = create_event();
+ event_obj = doc->window->event = create_event(get_node(doc, target, TRUE));
TRACE("doc %s >>>\n", debugstr_w(event_info[eid].name));
call_disp_func(doc, doc->event_target->event_table[eid], (IDispatch*)HTMLDOC(doc));
More information about the wine-cvs
mailing list