Zhenbo Li : mshtml: Added IHTMLTableRow::align property implementation.
Alexandre Julliard
julliard at winehq.org
Wed Mar 12 15:23:44 CDT 2014
Module: wine
Branch: master
Commit: 7442abde9257022fcf9f178be8284826d445986a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7442abde9257022fcf9f178be8284826d445986a
Author: Zhenbo Li <litimetal at gmail.com>
Date: Wed Mar 12 13:11:32 2014 +0800
mshtml: Added IHTMLTableRow::align property implementation.
---
dlls/mshtml/htmltablerow.c | 27 +++++++++++++++++++++++----
dlls/mshtml/tests/dom.c | 13 +++++++++++++
2 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c
index 7274ded..ef01763 100644
--- a/dlls/mshtml/htmltablerow.c
+++ b/dlls/mshtml/htmltablerow.c
@@ -102,15 +102,34 @@ static HRESULT WINAPI HTMLTableRow_Invoke(IHTMLTableRow *iface, DISPID dispIdMem
static HRESULT WINAPI HTMLTableRow_put_align(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_SetAlign(This->nsrow, &val);
+ nsAString_Finish(&val);
+ if (NS_FAILED(nsres)){
+ ERR("Set Align(%s) failed!\n", debugstr_w(v));
+ return E_FAIL;
+ }
+ return S_OK;
}
static HRESULT WINAPI HTMLTableRow_get_align(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_GetAlign(This->nsrow, &val);
+
+ return return_nsstr(nsres, &val, p);
}
static HRESULT WINAPI HTMLTableRow_put_vAlign(IHTMLTableRow *iface, BSTR v)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index cf78450..b485203 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -5576,6 +5576,7 @@ static void test_tr_elem(IHTMLElement *elem)
IHTMLElementCollection *col;
IHTMLTableRow *row;
HRESULT hres;
+ BSTR bstr;
static const elem_type_t cell_types[] = {ET_TD,ET_TD};
@@ -5592,6 +5593,18 @@ static void test_tr_elem(IHTMLElement *elem)
test_elem_collection((IUnknown*)col, cell_types, sizeof(cell_types)/sizeof(*cell_types));
IHTMLElementCollection_Release(col);
+ bstr = a2bstr("left");
+ hres = IHTMLTableRow_put_align(row, bstr);
+ ok(hres == S_OK, "set_align failed: %08x\n", hres);
+ SysFreeString(bstr);
+
+ bstr = NULL;
+ hres = IHTMLTableRow_get_align(row, &bstr);
+ ok(hres == S_OK, "get_align failed: %08x\n", hres);
+ ok(bstr != NULL, "get_align returned NULL\n");
+ ok(!strcmp_wa(bstr, "left"), "get_align returned %s\n", wine_dbgstr_w(bstr));
+ SysFreeString(bstr);
+
IHTMLTableRow_Release(row);
}
More information about the wine-cvs
mailing list