Zhenbo Li : mshtml: Added IHTMLLinkElement::media property.
Alexandre Julliard
julliard at winehq.org
Mon May 19 15:09:59 CDT 2014
Module: wine
Branch: master
Commit: e6f816c99b9f1aa2438a001ff4d52706a2eb354e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f816c99b9f1aa2438a001ff4d52706a2eb354e
Author: Zhenbo Li <litimetal at gmail.com>
Date: Mon May 19 21:45:05 2014 +0800
mshtml: Added IHTMLLinkElement::media property.
---
dlls/mshtml/htmllink.c | 28 ++++++++++++++++++++++++----
dlls/mshtml/tests/dom.c | 20 ++++++++++++++++++++
2 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c
index 79f0ca9..b5ae29a 100644
--- a/dlls/mshtml/htmllink.c
+++ b/dlls/mshtml/htmllink.c
@@ -286,15 +286,35 @@ static HRESULT WINAPI HTMLLinkElement_get_disabled(IHTMLLinkElement *iface, VARI
static HRESULT WINAPI HTMLLinkElement_put_media(IHTMLLinkElement *iface, BSTR v)
{
HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface);
- FIXME("(%p)->(%s)\n", This, debugstr_w(v));
- return E_NOTIMPL;
+ nsresult nsres;
+ nsAString str;
+
+ TRACE("(%p)->(%s)\n", This, debugstr_w(v));
+
+ nsAString_InitDepend(&str, v);
+
+ nsres = nsIDOMHTMLLinkElement_SetMedia(This->nslink, &str);
+ nsAString_Finish(&str);
+
+ if(NS_FAILED(nsres)) {
+ ERR("Set Media(%s) failed: %08x\n", debugstr_w(v), nsres);
+ return E_FAIL;
+ }
+ return S_OK;
}
static HRESULT WINAPI HTMLLinkElement_get_media(IHTMLLinkElement *iface, BSTR *p)
{
HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ nsresult nsres;
+ nsAString str;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ nsAString_Init(&str, NULL);
+ nsres = nsIDOMHTMLLinkElement_GetMedia(This->nslink, &str);
+
+ return return_nsstr(nsres, &str, p);
}
static const IHTMLLinkElementVtbl HTMLLinkElementVtbl = {
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 0d6c3ac..cb1e7be 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -3812,6 +3812,25 @@ static void _test_meta_httpequiv(unsigned line, IUnknown *unk, const char *exval
IHTMLMetaElement_Release(meta);
}
+#define test_link_media(a,b) _test_link_media(__LINE__,a,b)
+static void _test_link_media(unsigned line, IHTMLElement *elem, const char *exval)
+{
+ IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem);
+ HRESULT hres;
+ BSTR str;
+
+ str = a2bstr(exval);
+ hres = IHTMLLinkElement_put_media(link, str);
+ ok_(__FILE__,line)(hres == S_OK, "put_media(%s) failed: %08x\n", exval, hres);
+ SysFreeString(str);
+
+ hres = IHTMLLinkElement_get_media(link, &str);
+ ok_(__FILE__,line)(hres == S_OK, "get_media failed: %08x\n", hres);
+ ok_(__FILE__,line)(!strcmp_wa(str, exval), "got %s, expected %s\n", wine_dbgstr_w(str), exval);
+ SysFreeString(str);
+ IHTMLLinkElement_Release(link);
+}
+
#define test_link_disabled(a,b) _test_link_disabled(__LINE__,a,b)
static void _test_link_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v)
{
@@ -7182,6 +7201,7 @@ static void test_elems2(IHTMLDocument2 *doc)
test_link_rel(elem, "stylesheet");
test_link_type(elem, "text/css");
test_link_href(elem, "about:blank");
+ test_link_media(elem, "all");
link_put_disabled(elem, VARIANT_TRUE);
link_put_rel(elem, "prev");
link_put_type(elem, "text/plain");
More information about the wine-cvs
mailing list