Jacek Caban : mshtml: Added IHTMLStyle2::overflowX implementation.
Alexandre Julliard
julliard at winehq.org
Tue Apr 17 13:31:49 CDT 2012
Module: wine
Branch: master
Commit: 5b99a4e88017988c4ffa0db38b9d80326d11f3be
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b99a4e88017988c4ffa0db38b9d80326d11f3be
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Apr 17 12:41:27 2012 +0200
mshtml: Added IHTMLStyle2::overflowX 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 0ac98b4..9bad1a6 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -134,6 +134,8 @@ static const WCHAR attrMinHeight[] =
{'m','i','n','-','h','e','i','g','h','t',0};
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 attrPadding[] =
{'p','a','d','d','i','n','g',0};
static const WCHAR attrPaddingBottom[] =
@@ -229,6 +231,7 @@ static const style_tbl_entry_t style_tbl[] = {
{attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP},
{attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT},
{attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW},
+ {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX},
{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 ef4f2a2..2626eb6 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -83,6 +83,7 @@ typedef enum {
STYLEID_MARGIN_TOP,
STYLEID_MIN_HEIGHT,
STYLEID_OVERFLOW,
+ STYLEID_OVERFLOW_X,
STYLEID_PADDING,
STYLEID_PADDING_BOTTOM,
STYLEID_PADDING_LEFT,
diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c
index d85ea97..05668f9 100644
--- a/dlls/mshtml/htmlstyle2.c
+++ b/dlls/mshtml/htmlstyle2.c
@@ -507,15 +507,19 @@ static HRESULT WINAPI HTMLStyle2_get_textAutospace(IHTMLStyle2 *iface, BSTR *p)
static HRESULT WINAPI HTMLStyle2_put_overflowX(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_X, v, 0);
}
static HRESULT WINAPI HTMLStyle2_get_overflowX(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_X, p, 0);
}
static HRESULT WINAPI HTMLStyle2_put_overflowY(IHTMLStyle2 *iface, BSTR v)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 6a31665..280595e 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -344,6 +344,22 @@ static void test_style2(IHTMLStyle2 *style2)
hres = IHTMLStyle2_get_bottom(style2, &v);
ok(hres == S_OK, "get_bottom failed: %08x\n", hres);
test_var_bstr(&v, "4px");
+
+ /* overflowX */
+ str = (void*)0xdeadbeef;
+ hres = IHTMLStyle2_get_overflowX(style2, &str);
+ ok(hres == S_OK, "get_overflowX failed: %08x\n", hres);
+ ok(!str, "overflowX = %s\n", wine_dbgstr_w(str));
+
+ str = a2bstr("hidden");
+ hres = IHTMLStyle2_put_overflowX(style2, str);
+ ok(hres == S_OK, "put_overflowX failed: %08x\n", hres);
+ SysFreeString(str);
+
+ str = NULL;
+ 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));
}
static void test_style3(IHTMLStyle3 *style3)
More information about the wine-cvs
mailing list