Jacek Caban : mshtml: Use create_event_from_nsevent in handle_htmlevent.
Alexandre Julliard
julliard at winehq.org
Fri Oct 20 15:09:36 CDT 2017
Module: wine
Branch: master
Commit: b271b48d5bfb5498007e9986c01f9ea60fb51911
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b271b48d5bfb5498007e9986c01f9ea60fb51911
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Oct 20 15:09:55 2017 +0200
mshtml: Use create_event_from_nsevent in handle_htmlevent.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlevent.c | 2 +-
dlls/mshtml/htmlevent.h | 1 -
dlls/mshtml/nsevents.c | 25 ++++++++++++-------------
3 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 352121b..8167694 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -195,7 +195,7 @@ static const event_info_t event_info[] = {
static BOOL use_event_quirks(EventTarget*);
-eventid_t str_to_eid(LPCWSTR str)
+static eventid_t str_to_eid(const WCHAR *str)
{
int i;
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index 8c26c38..1d99604 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -71,7 +71,6 @@ typedef struct {
BOOL no_event_obj;
} DOMEvent;
-eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN;
void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN;
void release_event_target(EventTarget*) DECLSPEC_HIDDEN;
void fire_event(HTMLDocumentNode*,eventid_t,BOOL,EventTarget*,nsIDOMEvent*) DECLSPEC_HIDDEN;
diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c
index b5dc0bf..4e79f63 100644
--- a/dlls/mshtml/nsevents.c
+++ b/dlls/mshtml/nsevents.c
@@ -288,16 +288,14 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event
return nsres;
}
-static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event)
+static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *nsevent)
{
nsEventListener *This = impl_from_nsIDOMEventListener(iface);
HTMLDocumentNode *doc = This->This->doc;
- const PRUnichar *type;
nsIDOMEventTarget *event_target;
nsIDOMNode *nsnode;
- nsAString type_str;
HTMLDOMNode *node;
- eventid_t eid;
+ DOMEvent *event;
nsresult nsres;
HRESULT hres;
@@ -308,13 +306,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *
return NS_OK;
}
- nsAString_Init(&type_str, NULL);
- nsIDOMEvent_GetType(event, &type_str);
- nsAString_GetData(&type_str, &type);
- eid = str_to_eid(type);
- nsAString_Finish(&type_str);
-
- nsres = nsIDOMEvent_GetTarget(event, &event_target);
+ nsres = nsIDOMEvent_GetTarget(nsevent, &event_target);
if(NS_FAILED(nsres) || !event_target) {
ERR("GetEventTarget failed: %08x\n", nsres);
return NS_OK;
@@ -332,8 +324,14 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *
if(FAILED(hres))
return NS_OK;
+ hres = create_event_from_nsevent(nsevent, &event);
+ if(FAILED(hres)) {
+ node_release(node);
+ return NS_OK;
+ }
+
/* If we fine need for more special cases here, we may consider handling it in a more generic way. */
- switch(eid) {
+ switch(event->event_id) {
case EVENTID_FOCUS:
if(doc->event_vector[EVENTID_FOCUSIN])
fire_event(doc, EVENTID_FOCUSIN, TRUE, &node->event_target, NULL);
@@ -346,8 +344,9 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *
break;
}
- fire_event(doc, eid, TRUE, &node->event_target, event);
+ fire_event_obj(&node->event_target, event);
+ IDOMEvent_Release(&event->IDOMEvent_iface);
node_release(node);
return NS_OK;
}
More information about the wine-cvs
mailing list