Jacek Caban : mshtml: Use IDOMKeyboardEvent instead of nsIDOMKeyEvent in IHTMLEventObj implementation.
Alexandre Julliard
julliard at winehq.org
Tue Feb 6 15:55:49 CST 2018
Module: wine
Branch: master
Commit: b8c5f98c06abe74372f8373ff24e39872bb3fb96
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8c5f98c06abe74372f8373ff24e39872bb3fb96
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Feb 6 00:10:35 2018 +0100
mshtml: Use IDOMKeyboardEvent instead of nsIDOMKeyEvent in IHTMLEventObj implementation.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmlevent.c | 51 +++++++++----------------------------------------
1 file changed, 9 insertions(+), 42 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index c77f2b7..9f115a8 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -414,16 +414,8 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL
if(This->event && This->event->mouse_event)
return IDOMMouseEvent_get_altKey(&This->event->IDOMMouseEvent_iface, p);
- if(This->event) {
- nsIDOMKeyEvent *key_event;
- nsresult nsres;
-
- nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event);
- if(NS_SUCCEEDED(nsres)) {
- nsIDOMKeyEvent_GetAltKey(key_event, &ret);
- nsIDOMKeyEvent_Release(key_event);
- }
- }
+ if(This->event && This->event->keyboard_event)
+ return IDOMKeyboardEvent_get_altKey(&This->event->IDOMKeyboardEvent_iface, p);
*p = variant_bool(ret);
return S_OK;
@@ -439,16 +431,8 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO
if(This->event && This->event->mouse_event)
return IDOMMouseEvent_get_ctrlKey(&This->event->IDOMMouseEvent_iface, p);
- if(This->event) {
- nsIDOMKeyEvent *key_event;
- nsresult nsres;
-
- nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event);
- if(NS_SUCCEEDED(nsres)) {
- nsIDOMKeyEvent_GetCtrlKey(key_event, &ret);
- nsIDOMKeyEvent_Release(key_event);
- }
- }
+ if(This->event && This->event->keyboard_event)
+ return IDOMKeyboardEvent_get_ctrlKey(&This->event->IDOMKeyboardEvent_iface, p);
*p = variant_bool(ret);
return S_OK;
@@ -464,16 +448,8 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO
if(This->event && This->event->mouse_event)
return IDOMMouseEvent_get_shiftKey(&This->event->IDOMMouseEvent_iface, p);
- if(This->event) {
- nsIDOMKeyEvent *key_event;
- nsresult nsres;
-
- nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event);
- if(NS_SUCCEEDED(nsres)) {
- nsIDOMKeyEvent_GetShiftKey(key_event, &ret);
- nsIDOMKeyEvent_Release(key_event);
- }
- }
+ if(This->event && This->event->keyboard_event)
+ return IDOMKeyboardEvent_get_shiftKey(&This->event->IDOMKeyboardEvent_iface, p);
*p = variant_bool(ret);
return S_OK;
@@ -557,22 +533,13 @@ static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v)
static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p)
{
HTMLEventObj *This = impl_from_IHTMLEventObj(iface);
- UINT32 key_code = 0;
TRACE("(%p)->(%p)\n", This, p);
- if(This->event) {
- nsIDOMKeyEvent *key_event;
- nsresult nsres;
-
- nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event);
- if(NS_SUCCEEDED(nsres)) {
- nsIDOMKeyEvent_GetKeyCode(key_event, &key_code);
- nsIDOMKeyEvent_Release(key_event);
- }
- }
+ if(This->event && This->event->keyboard_event)
+ return IDOMKeyboardEvent_get_keyCode(&This->event->IDOMKeyboardEvent_iface, p);
- *p = key_code;
+ *p = 0;
return S_OK;
}
More information about the wine-cvs
mailing list