Module: wine Branch: master Commit: 7293e84163297bca1c06e9fd86e2ca21956b968d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7293e84163297bca1c06e9fd86...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Sep 10 14:41:28 2012 +0200
mshtml: Added IHTMLWindow2::onscroll implementation.
---
dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f5880f9..f9f21df 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -113,6 +113,9 @@ static const WCHAR onreadystatechangeW[] = {'o','n','r','e','a','d','y','s','t', static const WCHAR resizeW[] = {'r','e','s','i','z','e',0}; static const WCHAR onresizeW[] = {'o','n','r','e','s','i','z','e',0};
+static const WCHAR scrollW[] = {'s','c','r','o','l','l',0}; +static const WCHAR onscrollW[] = {'o','n','s','c','r','o','l','l',0}; + static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0}; static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t','a','r','t',0};
@@ -199,6 +202,8 @@ static const event_info_t event_info[] = { 0}, {resizeW, onresizeW, EVENTT_NONE, DISPID_EVMETH_ONRESIZE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {scrollW, onscrollW, EVENTT_HTML, DISPID_EVMETH_ONSCROLL, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b6ebf81..983d128 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -40,6 +40,7 @@ typedef enum { EVENTID_PASTE, EVENTID_READYSTATECHANGE, EVENTID_RESIZE, + EVENTID_SCROLL, EVENTID_SELECTSTART, EVENTID_SUBMIT, EVENTID_LAST diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ed1fa2b..fc432d8 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1075,15 +1075,19 @@ static HRESULT WINAPI HTMLWindow2_get_onresize(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onscroll(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_SCROLL, &v); }
static HRESULT WINAPI HTMLWindow2_get_onscroll(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_SCROLL, p); }
static HRESULT WINAPI HTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocument2 **p)