Jacek Caban : mshtml: Pass Gecko element as nsIDOMElement to check_event_attr.
Alexandre Julliard
julliard at winehq.org
Tue Feb 13 13:57:54 CST 2018
Module: wine
Branch: master
Commit: 0666c6c2fd544008171c717ca84f311f3aa12edf
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0666c6c2fd544008171c717ca84f311f3aa12edf
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Feb 12 23:26:52 2018 +0100
mshtml: Pass Gecko element as nsIDOMElement to check_event_attr.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlevent.c | 6 +++---
dlls/mshtml/htmlevent.h | 2 +-
dlls/mshtml/mutation.c | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 69c9444..d91de28 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -2781,7 +2781,7 @@ void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp)
}
}
-void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem)
+void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem)
{
nsIDOMMozNamedAttrMap *attr_map;
const PRUnichar *name, *value;
@@ -2795,11 +2795,11 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem)
nsresult nsres;
HRESULT hres;
- nsres = nsIDOMHTMLElement_HasAttributes(nselem, &has_attrs);
+ nsres = nsIDOMElement_HasAttributes(nselem, &has_attrs);
if(NS_FAILED(nsres) || !has_attrs)
return;
- nsres = nsIDOMHTMLElement_GetAttributes(nselem, &attr_map);
+ nsres = nsIDOMElement_GetAttributes(nselem, &attr_map);
if(NS_FAILED(nsres))
return;
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index ccfa5f8..e78c78c 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -85,7 +85,7 @@ typedef struct {
BOOL no_event_obj;
} DOMEvent;
-void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN;
+void check_event_attr(HTMLDocumentNode*,nsIDOMElement*) DECLSPEC_HIDDEN;
void release_event_target(EventTarget*) DECLSPEC_HIDDEN;
HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN;
HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN;
diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c
index 3c2ca08..6983da6 100644
--- a/dlls/mshtml/mutation.c
+++ b/dlls/mshtml/mutation.c
@@ -742,7 +742,7 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface,
nsIDOMHTMLFrameElement *nsframe;
nsIDOMHTMLScriptElement *nsscript;
nsIDOMHTMLMetaElement *nsmeta;
- nsIDOMHTMLElement *nselem;
+ nsIDOMElement *nselem;
nsIDOMComment *nscomment;
nsresult nsres;
@@ -768,12 +768,12 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface,
}
}
- nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem);
+ nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem);
if(NS_FAILED(nsres))
return;
check_event_attr(This, nselem);
- nsIDOMHTMLElement_Release(nselem);
+ nsIDOMElement_Release(nselem);
nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLIFrameElement, (void**)&nsiframe);
if(NS_SUCCEEDED(nsres)) {
More information about the wine-cvs
mailing list