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

mshtml: Added IHTMLStyleElement::type property implementation.

This commit is contained in:
Jacek Caban 2010-12-17 03:39:36 +01:00 committed by Alexandre Julliard
parent 09c63b2215
commit 98e1433779
2 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/mshtml/htmlstyleelem.c
View File

@ -98,15 +98,33 @@ static HRESULT WINAPI HTMLStyleElement_Invoke(IHTMLStyleElement *iface, DISPID d
static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v) static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v)
{ {
HTMLStyleElement *This = HTMLSTYLE_THIS(iface); HTMLStyleElement *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); nsAString type_str;
return E_NOTIMPL; nsresult nsres;
TRACE("(%p)->(%s)\n", This, debugstr_w(v));
nsAString_InitDepend(&type_str, v);
nsres = nsIDOMHTMLStyleElement_SetType(This->nsstyle, &type_str);
nsAString_Finish(&type_str);
if(NS_FAILED(nsres)) {
ERR("SetType failed: %08x\n", nsres);
return E_FAIL;
}
return S_OK;
} }
static HRESULT WINAPI HTMLStyleElement_get_type(IHTMLStyleElement *iface, BSTR *p) static HRESULT WINAPI HTMLStyleElement_get_type(IHTMLStyleElement *iface, BSTR *p)
{ {
HTMLStyleElement *This = HTMLSTYLE_THIS(iface); HTMLStyleElement *This = HTMLSTYLE_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); nsAString nsstr;
return E_NOTIMPL; nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
nsAString_Init(&nsstr, NULL);
nsres = nsIDOMHTMLStyleElement_GetType(This->nsstyle, &nsstr);
return return_nsstr(nsres, &nsstr, p);
} }
static HRESULT WINAPI HTMLStyleElement_get_readyState(IHTMLStyleElement *iface, BSTR *p) static HRESULT WINAPI HTMLStyleElement_get_readyState(IHTMLStyleElement *iface, BSTR *p)

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

@ -2480,6 +2480,40 @@ static void _test_style_put_media(unsigned line, IUnknown *unk, const char *medi
_test_style_media(line, unk, media); _test_style_media(line, unk, media);
} }
#define test_style_type(s,m) _test_style_type(__LINE__,s,m)
static void _test_style_type(unsigned line, IUnknown *unk, const char *extype)
{
IHTMLStyleElement *style = _get_style_iface(line, unk);
BSTR type;
HRESULT hres;
hres = IHTMLStyleElement_get_type(style, &type);
ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres);
if(extype)
ok_(__FILE__,line)(!strcmp_wa(type, extype), "type = %s, expected %s\n", wine_dbgstr_w(type), extype);
else
ok_(__FILE__,line)(!type, "type = %s, expected NULL\n", wine_dbgstr_w(type));
IHTMLStyleElement_Release(style);
SysFreeString(type);
}
#define test_style_put_type(s,m) _test_style_put_type(__LINE__,s,m)
static void _test_style_put_type(unsigned line, IUnknown *unk, const char *type)
{
IHTMLStyleElement *style = _get_style_iface(line, unk);
BSTR str;
HRESULT hres;
str = a2bstr(type);
hres = IHTMLStyleElement_put_type(style, str);
ok_(__FILE__,line)(hres == S_OK, "put_type failed: %08x\n", hres);
IHTMLStyleElement_Release(style);
SysFreeString(str);
_test_style_type(line, unk, type);
}
#define test_elem_filters(u) _test_elem_filters(__LINE__,u) #define test_elem_filters(u) _test_elem_filters(__LINE__,u)
static void _test_elem_filters(unsigned line, IUnknown *unk) static void _test_elem_filters(unsigned line, IUnknown *unk)
{ {
@ -6328,6 +6362,8 @@ static void test_elems(IHTMLDocument2 *doc)
if(elem) { if(elem) {
test_style_media((IUnknown*)elem, NULL); test_style_media((IUnknown*)elem, NULL);
test_style_put_media((IUnknown*)elem, "screen"); test_style_put_media((IUnknown*)elem, "screen");
test_style_type((IUnknown*)elem, NULL);
test_style_put_type((IUnknown*)elem, "text/css");
IHTMLElement_Release(elem); IHTMLElement_Release(elem);
} }