Module: wine Branch: master Commit: b2f3144e0c36511e356c4613c5182d363f4efe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f3144e0c36511e356c4613c5...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Apr 17 12:41:40 2012 +0200
mshtml: Added IHTMLStyle2::overflowY implementation.
---
dlls/mshtml/htmlstyle.c | 3 +++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 9bad1a6..b9f0ddd 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -136,6 +136,8 @@ static const WCHAR attrOverflow[] = {'o','v','e','r','f','l','o','w',0}; static const WCHAR attrOverflowX[] = {'o','v','e','r','f','l','o','w','-','x',0}; +static const WCHAR attrOverflowY[] = + {'o','v','e','r','f','l','o','w','-','y',0}; static const WCHAR attrPadding[] = {'p','a','d','d','i','n','g',0}; static const WCHAR attrPaddingBottom[] = @@ -232,6 +234,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX}, + {attrOverflowY, DISPID_IHTMLSTYLE2_OVERFLOWY}, {attrPadding, DISPID_IHTMLSTYLE_PADDING}, {attrPaddingBottom, DISPID_IHTMLSTYLE_PADDINGBOTTOM}, {attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 2626eb6..ce42d3e 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -84,6 +84,7 @@ typedef enum { STYLEID_MIN_HEIGHT, STYLEID_OVERFLOW, STYLEID_OVERFLOW_X, + STYLEID_OVERFLOW_Y, STYLEID_PADDING, STYLEID_PADDING_BOTTOM, STYLEID_PADDING_LEFT, diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index 05668f9..7eedc00 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -525,15 +525,19 @@ static HRESULT WINAPI HTMLStyle2_get_overflowX(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_overflowY(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW_Y, v, 0); }
static HRESULT WINAPI HTMLStyle2_get_overflowY(IHTMLStyle2 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle2(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 HTMLStyle2_put_accelerator(IHTMLStyle2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 280595e..7b6d69d 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -360,6 +360,22 @@ static void test_style2(IHTMLStyle2 *style2) hres = IHTMLStyle2_get_overflowX(style2, &str); ok(hres == S_OK, "get_overflowX failed: %08x\n", hres); ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); + + /* overflowY */ + str = (void*)0xdeadbeef; + hres = IHTMLStyle2_get_overflowY(style2, &str); + ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(!str, "overflowY = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("hidden"); + hres = IHTMLStyle2_put_overflowY(style2, str); + ok(hres == S_OK, "put_overflowY failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle2_get_overflowY(style2, &str); + ok(hres == S_OK, "get_overflowY failed: %08x\n", hres); + ok(!strcmp_wa(str, "hidden"), "overflowX = %s\n", wine_dbgstr_w(str)); }
static void test_style3(IHTMLStyle3 *style3)