Jacek Caban : mshtml: Added IHTMLElement2::put_dir implementation.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Nov 13 07:40:25 CST 2014


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Nov 12 16:25:26 2014 +0100

mshtml: Added IHTMLElement2::put_dir implementation.

---

 dlls/mshtml/htmlelem.c  | 21 +++++++++++++++++++--
 dlls/mshtml/tests/dom.c | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c
index 7ada9aa..2c82c4a 100644
--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@@ -2601,8 +2601,25 @@ static HRESULT WINAPI HTMLElement2_get_oncellchange(IHTMLElement2 *iface, VARIAN
 static HRESULT WINAPI HTMLElement2_put_dir(IHTMLElement2 *iface, BSTR v)
 {
     HTMLElement *This = impl_from_IHTMLElement2(iface);
-    FIXME("(%p)->(%s)\n", This, debugstr_w(v));
-    return E_NOTIMPL;
+    nsAString nsstr;
+    nsresult nsres;
+
+    TRACE("(%p)->(%s)\n", This, debugstr_w(v));
+
+    if(!This->nselem) {
+        FIXME("Unsupported for comment nodes.\n");
+        return S_OK;
+    }
+
+    nsAString_InitDepend(&nsstr, v);
+    nsres = nsIDOMHTMLElement_SetDir(This->nselem, &nsstr);
+    nsAString_Finish(&nsstr);
+    if(NS_FAILED(nsres)) {
+        ERR("SetDir failed: %08x\n", nsres);
+        return E_FAIL;
+    }
+
+    return S_OK;
 }
 
 static HRESULT WINAPI HTMLElement2_get_dir(IHTMLElement2 *iface, BSTR *p)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index a4bc01f..8c7adc9 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2695,6 +2695,39 @@ static void _test_select_set_disabled(unsigned line, IHTMLSelectElement *select,
     _test_select_get_disabled(line, select, b);
 }
 
+#define test_elem_dir(u,n) _test_elem_dir(__LINE__,u,n)
+static void _test_elem_dir(unsigned line, IUnknown *unk, const char *exdir)
+{
+    IHTMLElement2 *elem = _get_elem2_iface(line, unk);
+    BSTR dir;
+    HRESULT hres;
+
+    hres = IHTMLElement2_get_dir(elem, &dir);
+    IHTMLElement2_Release(elem);
+    ok_(__FILE__, line) (hres == S_OK, "get_dir failed: %08x\n", hres);
+    if(exdir)
+        ok_(__FILE__, line) (!strcmp_wa(dir, exdir), "got dir: %s, expected %s\n", wine_dbgstr_w(dir), exdir);
+    else
+        ok_(__FILE__, line) (!dir, "got dir: %s, expected NULL\n", wine_dbgstr_w(dir));
+
+    SysFreeString(dir);
+}
+
+#define set_elem_dir(u,n) _set_elem_dir(__LINE__,u,n)
+static void _set_elem_dir(unsigned line, IUnknown *unk, const char *dira)
+{
+    IHTMLElement2 *elem = _get_elem2_iface(line, unk);
+    BSTR dir = a2bstr(dira);
+    HRESULT hres;
+
+    hres = IHTMLElement2_put_dir(elem, dir);
+    IHTMLElement2_Release(elem);
+    ok_(__FILE__, line) (hres == S_OK, "put_dir failed: %08x\n", hres);
+    SysFreeString(dir);
+
+    _test_elem_dir(line, unk, dira);
+}
+
 #define elem_get_scroll_height(u) _elem_get_scroll_height(__LINE__,u)
 static LONG _elem_get_scroll_height(unsigned line, IUnknown *unk)
 {
@@ -5640,6 +5673,9 @@ static void test_default_body(IHTMLBodyElement *body)
     ok(!l, "scrollTop = %d\n", l);
     elem_get_scroll_left((IUnknown*)body);
 
+    test_elem_dir((IUnknown*)body, NULL);
+    set_elem_dir((IUnknown*)body, "ltr");
+
     /* get_text tests */
     hres = IHTMLBodyElement_get_text(body, &v);
     ok(hres == S_OK, "expect S_OK got 0x%08d\n", hres);




More information about the wine-cvs mailing list