marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Add IHTMLTableCell::width property implementation. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Jacek Caban 2020-05-28 23:06:54 +02:00 committed by Alexandre Julliard
parent 0702f06177
commit f6595bbdff
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/mshtml/htmltable.c
View File

@ -332,15 +332,32 @@ static HRESULT WINAPI HTMLTableCell_get_borderColorDark(IHTMLTableCell *iface, V
static HRESULT WINAPI HTMLTableCell_put_width(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_SetWidth(This->nscell, &nsstr);
nsAString_Finish(&nsstr);
return map_nsresult(nsres);
}
static HRESULT WINAPI HTMLTableCell_get_width(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_GetWidth(This->nscell, &nsstr);
return return_nsstr_variant(nsres, &nsstr, NSSTR_IMPLICIT_PX, p);
}
static HRESULT WINAPI HTMLTableCell_put_height(IHTMLTableCell *iface, VARIANT v)

23
dlls/mshtml/tests/dom.c
View File

@ -7649,6 +7649,29 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div)
ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"110"), "height = %s\n", wine_dbgstr_variant(&v));
VariantClear(&v);
V_VT(&v) = VT_I4;
V_I4(&v) = 200;
hres = IHTMLTableCell_put_width(cell, v);
ok(hres == S_OK, "put_width failed: %08x\n", hres);
V_VT(&v) = VT_EMPTY;
hres = IHTMLTableCell_get_width(cell, &v);
ok(hres == S_OK, "get_width failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"200"), "width = %s\n", wine_dbgstr_variant(&v));
VariantClear(&v);
V_VT(&v) = VT_BSTR;
V_BSTR(&v) = SysAllocString(L"210px");
hres = IHTMLTableCell_put_width(cell, v);
ok(hres == S_OK, "put_width failed: %08x\n", hres);
SysFreeString(V_BSTR(&v));
V_VT(&v) = VT_EMPTY;
hres = IHTMLTableCell_get_width(cell, &v);
ok(hres == S_OK, "get_width failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"210"), "width = %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);