Module: wine Branch: master Commit: cfef60a30e8724335451e1aa203f609fb295ef25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfef60a30e8724335451e1aa20...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Oct 15 11:17:42 2012 +0200
mshtml: Added IHTMLLinkElement::href property implementation.
---
dlls/mshtml/htmllink.c | 22 ++++++++++++++++++---- dlls/mshtml/tests/dom.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index a200b50..cfbdcb9 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -105,15 +105,29 @@ static HRESULT WINAPI HTMLLinkElement_Invoke(IHTMLLinkElement *iface, DISPID dis static HRESULT WINAPI HTMLLinkElement_put_href(IHTMLLinkElement *iface, BSTR v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString href_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&href_str, v); + nsres = nsIDOMHTMLLinkElement_SetHref(This->nslink, &href_str); + nsAString_Finish(&href_str); + + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; }
static HRESULT WINAPI HTMLLinkElement_get_href(IHTMLLinkElement *iface, BSTR *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString href_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLLinkElement_GetHref(This->nslink, &href_str); + return return_nsstr(nsres, &href_str, p); }
static HRESULT WINAPI HTMLLinkElement_put_rel(IHTMLLinkElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cc6c836..02ba3ef 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -64,7 +64,7 @@ static const char elem_test_str[] = "</body></html>"; static const char elem_test2_str[] = "<html><head><title>test</title><style>.body { margin-right: 0px; }</style>" - "<link id="linkid" rel="stylesheet" href="some.css" type="text/css"></head>" + "<link id="linkid" rel="stylesheet" href="about:blank" type="text/css"></head>" "<body><div id="divid" emptyattr="" onclick="parseInt();"></div></body>" "</html>";
@@ -3515,6 +3515,37 @@ static void _link_put_type(unsigned line, IHTMLElement *elem, const char *v) _test_link_type(line, elem, v); }
+#define test_link_href(a,b) _test_link_href(__LINE__,a,b) +static void _test_link_href(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR href; + HRESULT hres; + + hres = IHTMLLinkElement_get_href(link, &href); + ok_(__FILE__,line)(hres == S_OK, "get_href failed: %08x\n", hres); + if(v) + ok_(__FILE__,line)(!strcmp_wa(href, v), "href = %s, expected %s\n", wine_dbgstr_w(href), v); + else + ok_(__FILE__,line)(!href, "href = %s, expected NULL\n", wine_dbgstr_w(href)); + + IHTMLLinkElement_Release(link); +} + +#define link_put_href(a,b) _link_put_href(__LINE__,a,b) +static void _link_put_href(unsigned line, IHTMLElement *elem, const char *v) +{ + IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(v); + HRESULT hres; + + hres = IHTMLLinkElement_put_href(link, str); + ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres); + SysFreeString(str); + IHTMLLinkElement_Release(link); + _test_link_href(line, elem, v); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -6018,9 +6049,11 @@ static void test_elems2(IHTMLDocument2 *doc) test_link_disabled(elem, VARIANT_FALSE); test_link_rel(elem, "stylesheet"); test_link_type(elem, "text/css"); + test_link_href(elem, "about:blank"); link_put_disabled(elem, VARIANT_TRUE); link_put_rel(elem, "prev"); link_put_type(elem, "text/plain"); + link_put_href(elem, "about:prev"); IHTMLElement_Release(elem); }