From 90bccb498af821597e52f49e244eb565e68b808e Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 6 Feb 2018 00:09:01 +0100 Subject: [PATCH] mshtml: Use nsIDOMUIEvent stored in DOMEvent in IHTMLEventObj::get_[xy] implementation. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/mshtml/htmlevent.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6c51819389a..88b9e85f282 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -635,17 +635,12 @@ static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMUIEvent *ui_event; + if(This->event && This->event->ui_event) { nsresult nsres; - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); - if(NS_SUCCEEDED(nsres)) { - /* NOTE: pageX is not exactly right here. */ - nsres = nsIDOMUIEvent_GetPageX(ui_event, &x); - assert(nsres == NS_OK); - nsIDOMUIEvent_Release(ui_event); - } + /* NOTE: pageX is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageX(This->event->ui_event, &x); + assert(nsres == NS_OK); } *p = x; @@ -659,17 +654,12 @@ static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMUIEvent *ui_event; + if(This->event && This->event->ui_event) { nsresult nsres; - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); - if(NS_SUCCEEDED(nsres)) { - /* NOTE: pageY is not exactly right here. */ - nsres = nsIDOMUIEvent_GetPageY(ui_event, &y); - assert(nsres == NS_OK); - nsIDOMUIEvent_Release(ui_event); - } + /* NOTE: pageY is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageY(This->event->ui_event, &y); + assert(nsres == NS_OK); } *p = y; -- 2.11.4.GIT