Jacek Caban : mshtml: Add IHTMLTableCell::height property implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0702f0617718ea457d5d6f7812f27ad4113feefa
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0702f0617718ea457d5d6f7812f27ad4113feefa

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu May 28 23:06:47 2020 +0200

mshtml: Add IHTMLTableCell::height property implementation.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/htmltable.c | 25 +++++++++++++++++++++----
 dlls/mshtml/tests/dom.c | 25 ++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c
index 2f40bb078d..1429631d44 100644
--- a/dlls/mshtml/htmltable.c
+++ b/dlls/mshtml/htmltable.c
@@ -346,15 +346,32 @@ static HRESULT WINAPI HTMLTableCell_get_width(IHTMLTableCell *iface, VARIANT *p)
 static HRESULT WINAPI HTMLTableCell_put_height(IHTMLTableCell *iface, VARIANT v)
 {
     HTMLTableCell *This = impl_from_IHTMLTableCell(iface);
-    FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
-    return E_NOTIMPL;
+    nsAString nsstr;
+    nsresult nsres;
+    HRESULT hres;
+
+    TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
+
+    hres = variant_to_nsstr(&v, FALSE, &nsstr);
+    if(FAILED(hres))
+        return hres;
+
+    nsres = nsIDOMHTMLTableCellElement_SetHeight(This->nscell, &nsstr);
+    nsAString_Finish(&nsstr);
+    return map_nsresult(nsres);
 }
 
 static HRESULT WINAPI HTMLTableCell_get_height(IHTMLTableCell *iface, VARIANT *p)
 {
     HTMLTableCell *This = impl_from_IHTMLTableCell(iface);
-    FIXME("(%p)->(%p)\n", This, p);
-    return E_NOTIMPL;
+    nsAString nsstr;
+    nsresult nsres;
+
+    TRACE("(%p)->(%p)\n", This, p);
+
+    nsAString_Init(&nsstr, NULL);
+    nsres = nsIDOMHTMLTableCellElement_GetHeight(This->nscell, &nsstr);
+    return return_nsstr_variant(nsres, &nsstr, NSSTR_IMPLICIT_PX, p);
 }
 
 static HRESULT WINAPI HTMLTableCell_get_cellIndex(IHTMLTableCell *iface, LONG *p)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index cb8141da93..433e0d561a 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -7564,7 +7564,7 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div)
     HRESULT hres;
     LONG lval;
     BSTR str;
-    VARIANT vbg, vDefaultbg;
+    VARIANT vbg, vDefaultbg, v;
 
     test_elem_set_innerhtml((IUnknown*)div,
                             L"<table id=\"tbl\"><tbody>"
@@ -7626,6 +7626,29 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div)
     ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg)));
     VariantClear(&vbg);
 
+    V_VT(&v) = VT_I4;
+    V_I4(&v) = 100;
+    hres = IHTMLTableCell_put_height(cell, v);
+    ok(hres == S_OK, "put_height failed: %08x\n", hres);
+
+    V_VT(&v) = VT_EMPTY;
+    hres = IHTMLTableCell_get_height(cell, &v);
+    ok(hres == S_OK, "get_height failed: %08x\n", hres);
+    ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"100"), "height = %s\n", wine_dbgstr_variant(&v));
+    VariantClear(&v);
+
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = SysAllocString(L"110px");
+    hres = IHTMLTableCell_put_height(cell, v);
+    ok(hres == S_OK, "put_height failed: %08x\n", hres);
+    SysFreeString(V_BSTR(&v));
+
+    V_VT(&v) = VT_EMPTY;
+    hres = IHTMLTableCell_get_height(cell, &v);
+    ok(hres == S_OK, "get_height failed: %08x\n", hres);
+    ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"110"), "height = %s\n", wine_dbgstr_variant(&v));
+    VariantClear(&v);
+
     /* Restore Original */
     hres = IHTMLTableCell_put_bgColor(cell, vDefaultbg);
     ok(hres == S_OK, "put_bgColor failed: %08x\n", hres);