Module: wine Branch: master Commit: 6b180082026c20c56c53cbb7d34db086042fa9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b180082026c20c56c53cbb7d3...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Sep 11 11:03:24 2014 +0200
mshtml: Added semi-stub IHTMLElement4::onmousewheel propery implementation.
---
dlls/mshtml/htmlelem3.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlelem3.c b/dlls/mshtml/htmlelem3.c index 07f4854..bcd6eb2 100644 --- a/dlls/mshtml/htmlelem3.c +++ b/dlls/mshtml/htmlelem3.c @@ -557,15 +557,19 @@ static HRESULT WINAPI HTMLElement4_Invoke(IHTMLElement4 *iface, DISPID dispIdMem static HRESULT WINAPI HTMLElement4_put_onmousewheel(IHTMLElement4 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_MOUSEWHEEL, &v); }
static HRESULT WINAPI HTMLElement4_get_onmousewheel(IHTMLElement4 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_MOUSEWHEEL, p); }
static HRESULT WINAPI HTMLElement4_normalize(IHTMLElement4 *iface) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 75b41d3..bcf4864 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -111,6 +111,9 @@ static const WCHAR onmouseoverW[] = {'o','n','m','o','u','s','e','o','v','e','r' static const WCHAR mouseupW[] = {'m','o','u','s','e','u','p',0}; static const WCHAR onmouseupW[] = {'o','n','m','o','u','s','e','u','p',0};
+static const WCHAR mousewheelW[] = {'m','o','u','s','e','w','h','e','e','l',0}; +static const WCHAR onmousewheelW[] = {'o','n','m','o','u','s','e','w','h','e','e','l',0}; + static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR onpasteW[] = {'o','n','p','a','s','t','e',0};
@@ -207,6 +210,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseupW, onmouseupW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEUP, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mousewheelW, onmousewheelW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, + 0}, {pasteW, onpasteW, EVENTT_NONE, DISPID_EVMETH_ONPASTE, EVENT_CANCELABLE}, {readystatechangeW, onreadystatechangeW, EVENTT_NONE, DISPID_EVMETH_ONREADYSTATECHANGE, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index d2426d3..bc81171 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -39,6 +39,7 @@ typedef enum { EVENTID_MOUSEOUT, EVENTID_MOUSEOVER, EVENTID_MOUSEUP, + EVENTID_MOUSEWHEEL, EVENTID_PASTE, EVENTID_READYSTATECHANGE, EVENTID_RESIZE,