Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_right.
Alexandre Julliard
julliard at winehq.org
Wed Sep 16 16:00:24 CDT 2009
Module: wine
Branch: master
Commit: 2ef9272e816178eb1e1447a67d7fc17f5e10b3f5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef9272e816178eb1e1447a67d7fc17f5e10b3f5
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Wed Sep 16 15:52:36 2009 +1000
mshtml: Implement IHTMLCurrentStyle_get_right.
---
dlls/mshtml/htmlcurstyle.c | 4 ++--
dlls/mshtml/htmlstyle.c | 3 +++
dlls/mshtml/htmlstyle.h | 1 +
dlls/mshtml/tests/dom.c | 5 +++++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c
index 44f623b..d6edc3a 100644
--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@@ -593,8 +593,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_unicodeBidi(IHTMLCurrentStyle *iface,
static HRESULT WINAPI HTMLCurrentStyle_get_right(IHTMLCurrentStyle *iface, VARIANT *p)
{
HTMLCurrentStyle *This = HTMLCURSTYLE_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_RIGHT, p, 0);
}
static HRESULT WINAPI HTMLCurrentStyle_get_bottom(IHTMLCurrentStyle *iface, VARIANT *p)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 1a6f610..56a38d8 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -129,6 +129,8 @@ static const WCHAR attrPaddingTop[] =
{'p','a','d','d','i','n','g','-','t','o','p',0};
static const WCHAR attrPosition[] =
{'p','o','s','i','t','i','o','n',0};
+static const WCHAR attrRight[] =
+ {'r','i','g','h','t',0};
static const WCHAR attrTextAlign[] =
{'t','e','x','t','-','a','l','i','g','n',0};
static const WCHAR attrTextDecoration[] =
@@ -199,6 +201,7 @@ static const struct{
{attrPaddingRight, DISPID_IHTMLSTYLE_PADDINGRIGHT},
{attrPaddingTop, DISPID_IHTMLSTYLE_PADDINGTOP},
{attrPosition, DISPID_IHTMLSTYLE2_POSITION},
+ {attrRight, DISPID_IHTMLSTYLE2_RIGHT},
{attrTextAlign, DISPID_IHTMLSTYLE_TEXTALIGN},
{attrTextDecoration, DISPID_IHTMLSTYLE_TEXTDECORATION},
{attrTop, DISPID_IHTMLSTYLE_TOP},
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index 08305fd..fccda1b 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -82,6 +82,7 @@ typedef enum {
STYLEID_PADDING_RIGHT,
STYLEID_PADDING_TOP,
STYLEID_POSITION,
+ STYLEID_RIGHT,
STYLEID_TEXT_ALIGN,
STYLEID_TEXT_DECORATION,
STYLEID_TOP,
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index fd8e57d..abefe20 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2786,6 +2786,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
VariantClear(&v);
+
+ hres = IHTMLCurrentStyle_get_right(current_style, &v);
+ ok(hres == S_OK, "get_Right failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+ VariantClear(&v);
}
static void test_style2(IHTMLStyle2 *style2)
More information about the wine-cvs
mailing list