Module: wine Branch: master Commit: 8abd37637af36c6f969de1f5a6244f279a72decf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abd37637af36c6f969de1f5a6...
Author: Jacek Caban jacek@codeweavers.com Date: Thu May 26 16:15:55 2016 +0200
mshtml: Improved FIXMEs about unimplemented events.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7abd727..67c8460 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3732,7 +3732,7 @@ static HRESULT WINAPI HTMLElement4_put_onmousewheel(IHTMLElement4 *iface, VARIAN { HTMLElement *This = impl_from_IHTMLElement4(iface);
- FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
return set_node_event(&This->node, EVENTID_MOUSEWHEEL, &v); } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 27b6c39..43e742f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -173,6 +173,7 @@ typedef struct { #define EVENT_BIND_TO_BODY 0x0008 #define EVENT_CANCELABLE 0x0010 #define EVENT_HASDEFAULTHANDLERS 0x0020 +#define EVENT_FIXME 0x0040
static const event_info_t event_info[] = { {abortW, onabortW, EVENTT_NONE, DISPID_EVMETH_ONABORT, @@ -226,7 +227,7 @@ static const event_info_t event_info[] = { {mouseupW, onmouseupW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEUP, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mousewheelW, onmousewheelW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, - 0}, + EVENT_FIXME}, {pasteW, onpasteW, EVENTT_NONE, DISPID_EVMETH_ONPASTE, EVENT_CANCELABLE}, {readystatechangeW, onreadystatechangeW, EVENTT_NONE, DISPID_EVMETH_ONREADYSTATECHANGE, @@ -1416,6 +1417,9 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, { event_target_t *data;
+ if(event_info[eid].flags & EVENT_FIXME) + FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); + remove_event_handler(event_target, eid); if(!disp) return S_OK; @@ -1518,6 +1522,9 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI return S_OK; }
+ if(event_info[eid].flags & EVENT_FIXME) + FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); + data = get_event_target_data(event_target, TRUE); if(!data) return E_OUTOFMEMORY;