Jacek Caban : mshtml: Use node event_target for HTMLDocument.
Alexandre Julliard
julliard at winehq.org
Thu Sep 17 13:52:50 CDT 2009
Module: wine
Branch: master
Commit: 522d0bf973b361ac2cb4a3069061cedbdbc33a08
URL: http://source.winehq.org/git/wine.git/?a=commit;h=522d0bf973b361ac2cb4a3069061cedbdbc33a08
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Sep 16 22:14:55 2009 +0200
mshtml: Use node event_target for HTMLDocument.
---
dlls/mshtml/htmldoc.c | 3 ---
dlls/mshtml/htmlevent.c | 3 ++-
dlls/mshtml/htmlevent.h | 4 ++--
dlls/mshtml/mshtml_private.h | 1 -
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index e3fde65..f7c7190 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -1741,9 +1741,6 @@ static void destroy_htmldoc(HTMLDocument *This)
{
remove_doc_tasks(This);
- if(This->event_target)
- release_event_target(This->event_target);
-
ConnectionPointContainer_Destroy(&This->cp_container);
if(This->nsdoc)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index abf4621..8c0104f 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -795,7 +795,8 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, nsIDOMNode *target, nsIDOM
}
}
- call_event_handlers(doc, event_obj, doc->basedoc.event_target, eid, (IDispatch*)HTMLDOC(&doc->basedoc));
+ call_event_handlers(doc, event_obj, doc->basedoc.doc_node->node.event_target, eid,
+ (IDispatch*)HTMLDOC(&doc->basedoc));
break;
default:
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index 2c4bef3..4446aa9 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -63,12 +63,12 @@ static inline HRESULT get_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *
static inline HRESULT set_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var)
{
- return set_event_handler(&doc->event_target, doc, eid, var);
+ return set_node_event(&doc->doc_node->node, eid, var);
}
static inline HRESULT get_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var)
{
- return get_event_handler(&doc->event_target, eid, var);
+ return get_node_event(&doc->doc_node->node, eid, var);
}
static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var)
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 6a93d28..73daf01 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -278,7 +278,6 @@ struct HTMLDocument {
HTMLWindow *window;
nsIDOMHTMLDocument *nsdoc;
- event_target_t *event_target;
ConnectionPointContainer cp_container;
ConnectionPoint cp_htmldocevents;
ConnectionPoint cp_htmldocevents2;
More information about the wine-cvs
mailing list