Jacek Caban : mshtml: Added IHTMLStyle2::direction property implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: adf1310f4acfc1d4cf48d30ca0ffc32c14dee4aa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=adf1310f4acfc1d4cf48d30ca0...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri Jul 22 11:40:17 2011 +0200

mshtml: Added IHTMLStyle2::direction property implementation.

---

 dlls/mshtml/htmlstyle.c   |    3 +++
 dlls/mshtml/htmlstyle.h   |    1 +
 dlls/mshtml/htmlstyle2.c  |   12 ++++++++----
 dlls/mshtml/tests/style.c |   17 +++++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 5c6157b..ae2cf93 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -97,6 +97,8 @@ static const WCHAR attrColor[] =
     {'c','o','l','o','r',0};
 static const WCHAR attrCursor[] =
     {'c','u','r','s','o','r',0};
+static const WCHAR attrDirection[] =
+    {'d','i','r','e','c','t','i','o','n',0};
 static const WCHAR attrDisplay[] =
     {'d','i','s','p','l','a','y',0};
 static const WCHAR attrFilter[] =
@@ -207,6 +209,7 @@ static const struct{
     {attrClip,                 DISPID_IHTMLSTYLE_CLIP},
     {attrColor,                DISPID_IHTMLSTYLE_COLOR},
     {attrCursor,               DISPID_IHTMLSTYLE_CURSOR},
+    {attrDirection,            DISPID_IHTMLSTYLE2_DIRECTION},
     {attrDisplay,              DISPID_IHTMLSTYLE_DISPLAY},
     {attrFilter,               DISPID_IHTMLSTYLE_FILTER},
     {attrFontFamily,           DISPID_IHTMLSTYLE_FONTFAMILY},
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index b4d9662..f23d911 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -62,6 +62,7 @@ typedef enum {
     STYLEID_CLIP,
     STYLEID_COLOR,
     STYLEID_CURSOR,
+    STYLEID_DIRECTION,
     STYLEID_DISPLAY,
     STYLEID_FILTER,
     STYLEID_FONT_FAMILY,
diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c
index db44581..a270833 100644
--- a/dlls/mshtml/htmlstyle2.c
+++ b/dlls/mshtml/htmlstyle2.c
@@ -121,15 +121,19 @@ static HRESULT WINAPI HTMLStyle2_get_borderCollapse(IHTMLStyle2 *iface, BSTR *p)
 static HRESULT WINAPI HTMLStyle2_put_direction(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_DIRECTION, v, 0);
 }
 
 static HRESULT WINAPI HTMLStyle2_get_direction(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_DIRECTION, p, 0);
 }
 
 static HRESULT WINAPI HTMLStyle2_put_behavior(IHTMLStyle2 *iface, BSTR v)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index e9061a2..d4d9a20 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -277,6 +277,23 @@ static void test_style2(IHTMLStyle2 *style2)
     ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v));
     ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
     VariantClear(&v);
+
+    /* direction */
+    str = (void*)0xdeadbeef;
+    hres = IHTMLStyle2_get_direction(style2, &str);
+    ok(hres == S_OK, "get_direction failed: %08x\n", hres);
+    ok(!str, "str = %s\n", wine_dbgstr_w(str));
+
+    str = a2bstr("ltr");
+    hres = IHTMLStyle2_put_direction(style2, str);
+    ok(hres == S_OK, "put_direction failed: %08x\n", hres);
+    SysFreeString(str);
+
+    str = NULL;
+    hres = IHTMLStyle2_get_direction(style2, &str);
+    ok(hres == S_OK, "get_direction failed: %08x\n", hres);
+    ok(!strcmp_wa(str, "ltr"), "str = %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
 }
 
 static void test_style3(IHTMLStyle3 *style3)