ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Added IHTMLStyle::put_cssText implementation.

This commit is contained in:
Jacek Caban 2009-03-09 20:46:01 +01:00 committed by Alexandre Julliard
parent 50126adf8b
commit 3a118f86f7
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/mshtml/htmlstyle.c
View File

@ -2056,8 +2056,20 @@ static HRESULT WINAPI HTMLStyle_get_pageBreakAfter(IHTMLStyle *iface, BSTR *p)
static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_put_cssText(IHTMLStyle *iface, BSTR v)
{ {
HTMLStyle *This = HTMLSTYLE_THIS(iface); HTMLStyle *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); nsAString text_str;
return E_NOTIMPL; nsresult nsres;
TRACE("(%p)->(%s)\n", This, debugstr_w(v));
nsAString_Init(&text_str, v);
nsres = nsIDOMCSSStyleDeclaration_SetCssText(This->nsstyle, &text_str);
nsAString_Finish(&text_str);
if(NS_FAILED(nsres)) {
FIXME("SetCssStyle failed: %08x\n", nsres);
return E_FAIL;
}
return S_OK;
} }
static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_get_cssText(IHTMLStyle *iface, BSTR *p)

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

@ -1943,6 +1943,18 @@ static void _test_style_csstext(unsigned line, IHTMLStyle *style, const char *ex
SysFreeString(text); SysFreeString(text);
} }
#define test_style_set_csstext(s,t) _test_style_set_csstext(__LINE__,s,t)
static void _test_style_set_csstext(unsigned line, IHTMLStyle *style, const char *text)
{
BSTR tmp;
HRESULT hres;
tmp = a2bstr(text);
hres = IHTMLStyle_put_cssText(style, tmp);
ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres);
SysFreeString(tmp);
}
static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n,
const elem_type_t *elem_types, long len) const elem_type_t *elem_types, long len)
{ {
@ -3590,6 +3602,20 @@ static void test_default_style(IHTMLStyle *style)
} }
} }
static void test_set_csstext(IHTMLStyle *style)
{
VARIANT v;
HRESULT hres;
test_style_set_csstext(style, "background-color: black;");
hres = IHTMLStyle_get_backgroundColor(style, &v);
ok(hres == S_OK, "get_backgroundColor: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v));
ok(!strcmp_wa(V_BSTR(&v), "black"), "str=%s\n", dbgstr_w(V_BSTR(&v)));
VariantClear(&v);
}
static void test_default_selection(IHTMLDocument2 *doc) static void test_default_selection(IHTMLDocument2 *doc)
{ {
IHTMLSelectionObject *selection; IHTMLSelectionObject *selection;
@ -3830,8 +3856,6 @@ static void test_defaults(IHTMLDocument2 *doc)
test_location(doc); test_location(doc);
test_navigator(doc); test_navigator(doc);
IHTMLStyle_Release(style);
elem2 = get_elem2_iface((IUnknown*)elem); elem2 = get_elem2_iface((IUnknown*)elem);
hres = IHTMLElement2_get_currentStyle(elem2, &cstyle); hres = IHTMLElement2_get_currentStyle(elem2, &cstyle);
ok(hres == S_OK, "get_currentStyle failed: %08x\n", hres); ok(hres == S_OK, "get_currentStyle failed: %08x\n", hres);
@ -3843,6 +3867,9 @@ static void test_defaults(IHTMLDocument2 *doc)
IHTMLElement_Release(elem); IHTMLElement_Release(elem);
test_set_csstext(style);
IHTMLStyle_Release(style);
hres = IHTMLDocument2_get_styleSheets(doc, &stylesheetcol); hres = IHTMLDocument2_get_styleSheets(doc, &stylesheetcol);
ok(hres == S_OK, "get_styleSheets failed: %08x\n", hres); ok(hres == S_OK, "get_styleSheets failed: %08x\n", hres);