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

mshtml: Added IHTMLMetaElement::get_httpEquiv implementation.

Browse Source
This commit is contained in:
Jacek Caban 2012-04-03 12:04:05 +02:00 committed by Alexandre Julliard
parent 5bbcdf7b9e
commit fe4cb8441a
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/mshtml/htmlmeta.c
View File

@ -104,8 +104,19 @@ static HRESULT WINAPI HTMLMetaElement_put_httpEquiv(IHTMLMetaElement *iface, BST
static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BSTR *p) static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BSTR *p)
{ {
HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface);
FIXME("(%p)->(%p)\n", This, p); nsAString httpequiv_str, val_str;
return E_NOTIMPL; nsresult nsres;
static const PRUnichar httpEquivW[] = {'h','t','t','p','-','e','q','u','i','v',0};
TRACE("(%p)->(%p)\n", This, p);
nsAString_InitDepend(&httpequiv_str, httpEquivW);
nsAString_Init(&val_str, NULL);
nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &httpequiv_str, &val_str);
nsAString_Finish(&httpequiv_str);
return return_nsstr(nsres, &val_str, p);
} }
static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v)

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

@ -3275,6 +3275,22 @@ static void _test_meta_content(unsigned line, IUnknown *unk, const char *exconte
IHTMLMetaElement_Release(meta); IHTMLMetaElement_Release(meta);
} }
#define test_meta_httpequiv(a,b) _test_meta_httpequiv(__LINE__,a,b)
static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval)
{
IHTMLMetaElement *meta;
BSTR val = NULL;
HRESULT hres;
meta = _get_metaelem_iface(line, unk);
hres = IHTMLMetaElement_get_httpEquiv(meta, &val);
ok_(__FILE__,line)(hres == S_OK, "get_httpEquiv failed: %08x\n", hres);
ok_(__FILE__,line)(!strcmp_wa(val, exval), "httpEquiv = %s, expected %s\n", wine_dbgstr_w(val), exval);
SysFreeString(val);
IHTMLMetaElement_Release(meta);
}
#define get_elem_doc(e) _get_elem_doc(__LINE__,e) #define get_elem_doc(e) _get_elem_doc(__LINE__,e)
static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk)
{ {
@ -5306,6 +5322,7 @@ static void test_elems(IHTMLDocument2 *doc)
if(elem) { if(elem) {
test_meta_name((IUnknown*)elem, "meta name"); test_meta_name((IUnknown*)elem, "meta name");
test_meta_content((IUnknown*)elem, "text/html; charset=utf-8"); test_meta_content((IUnknown*)elem, "text/html; charset=utf-8");
test_meta_httpequiv((IUnknown*)elem, "Content-Type");
IHTMLElement_Release(elem); IHTMLElement_Release(elem);
} }