Module: wine Branch: master Commit: 4ee484c2ebea86f9ec61d7dcf7ac9849b9815fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee484c2ebea86f9ec61d7dcf7...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Jan 11 13:51:56 2016 +0100
mshtml: Added IHTMLCurrentStyle::overflowY implementation.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/style.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index cace5ba..b7f9731 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -788,8 +788,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_overflowX(IHTMLCurrentStyle *iface, B static HRESULT WINAPI HTMLCurrentStyle_get_overflowY(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = impl_from_IHTMLCurrentStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_Y, p, 0); }
static HRESULT WINAPI HTMLCurrentStyle_get_textTransform(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e5f9619..d568a2f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2909,6 +2909,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); SysFreeString(str);
+ hres = IHTMLCurrentStyle_get_overflowY(current_style, &str); + ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowY = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style);
b = 100;