Zhenbo Li : mshtml: Added IHTMLTableRow::vAlign property implementation.
Alexandre Julliard
julliard at winehq.org
Thu Mar 13 14:40:34 CDT 2014
Module: wine
Branch: master
Commit: 3679619909f9ce04d5deb8f4046e7dba80261972
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3679619909f9ce04d5deb8f4046e7dba80261972
Author: Zhenbo Li <litimetal at gmail.com>
Date: Thu Mar 13 16:27:32 2014 +0800
mshtml: Added IHTMLTableRow::vAlign property implementation.
---
dlls/mshtml/htmltablerow.c | 29 +++++++++++++++++++++++++----
dlls/mshtml/tests/dom.c | 12 ++++++++++++
2 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c
index ef01763..832cb6c 100644
--- a/dlls/mshtml/htmltablerow.c
+++ b/dlls/mshtml/htmltablerow.c
@@ -135,15 +135,36 @@ static HRESULT WINAPI HTMLTableRow_get_align(IHTMLTableRow *iface, BSTR *p)
static HRESULT WINAPI HTMLTableRow_put_vAlign(IHTMLTableRow *iface, BSTR v)
{
HTMLTableRow *This = impl_from_IHTMLTableRow(iface);
- FIXME("(%p)->(%s)\n", This, debugstr_w(v));
- return E_NOTIMPL;
+ nsAString val;
+ nsresult nsres;
+
+ TRACE("(%p)->(%s)\n", This, debugstr_w(v));
+
+ nsAString_InitDepend(&val, v);
+
+ nsres = nsIDOMHTMLTableRowElement_SetVAlign(This->nsrow, &val);
+ nsAString_Finish(&val);
+
+ if (NS_FAILED(nsres)){
+ ERR("Set VAlign(%s) failed!\n", debugstr_w(v));
+ return E_FAIL;
+ }
+
+ return S_OK;
}
static HRESULT WINAPI HTMLTableRow_get_vAlign(IHTMLTableRow *iface, BSTR *p)
{
HTMLTableRow *This = impl_from_IHTMLTableRow(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ nsAString val;
+ nsresult nsres;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ nsAString_Init(&val, NULL);
+ nsres = nsIDOMHTMLTableRowElement_GetVAlign(This->nsrow, &val);
+
+ return return_nsstr(nsres, &val, p);
}
static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index b485203..013a2a9 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -5605,6 +5605,18 @@ static void test_tr_elem(IHTMLElement *elem)
ok(!strcmp_wa(bstr, "left"), "get_align returned %s\n", wine_dbgstr_w(bstr));
SysFreeString(bstr);
+ bstr = a2bstr("top");
+ hres = IHTMLTableRow_put_vAlign(row, bstr);
+ ok(hres == S_OK, "set_valign failed: %08x\n", hres);
+ SysFreeString(bstr);
+
+ bstr = NULL;
+ hres = IHTMLTableRow_get_vAlign(row, &bstr);
+ ok(hres == S_OK, "get_valign failed: %08x\n", hres);
+ ok(bstr != NULL, "get_valign returned NULL\n");
+ ok(!strcmp_wa(bstr, "top"), "get_valign returned %s\n", wine_dbgstr_w(bstr));
+ SysFreeString(bstr);
+
IHTMLTableRow_Release(row);
}
More information about the wine-cvs
mailing list