Module: wine Branch: master Commit: 9e8be69d7bca79f842258a619e06338b8fc5e62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8be69d7bca79f842258a619e...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Jan 11 13:51:48 2016 +0100
mshtml: Added IHTMLCurrentStyle::overflowX 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 4257074..cace5ba 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -781,8 +781,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_accelerator(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_overflowX(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_X, p, 0); }
static HRESULT WINAPI HTMLCurrentStyle_get_overflowY(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 18905b1..e5f9619 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2904,6 +2904,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(!strcmp_wa(str, "none"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str);
+ hres = IHTMLCurrentStyle_get_overflowX(current_style, &str); + ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + current_style2 = get_current_style2_iface((IUnknown*)current_style);
b = 100;