Module: wine Branch: master Commit: d6be3967bde15223d2dd865761bd62497dabf1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6be3967bde15223d2dd865761...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Wed Feb 18 20:24:54 2009 +1100
mshtml: Implement IHTMLStyle_get_marginRight.
---
dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index abe8a3f..3ee3d80 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1131,8 +1131,8 @@ static HRESULT WINAPI HTMLStyle_put_marginRight(IHTMLStyle *iface, VARIANT v) static HRESULT WINAPI HTMLStyle_get_marginRight(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_RIGHT, p, 0); }
static HRESULT WINAPI HTMLStyle_put_marginBottom(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 90148ea..1663fef 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2448,6 +2448,12 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "get_position failed: %08x\n", hres); ok(!str, "str=%s\n", dbgstr_w(str));
+ V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginRight(style, &v); + ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(marginRight) = %s\n", dbgstr_w(V_BSTR(&v))); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_fontFamily(style, &str); ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres);