Jacek Caban : mshtml: Added IHTMLLinkElement::rel property implementation.
Alexandre Julliard
julliard at winehq.org
Mon Oct 15 14:29:06 CDT 2012
Module: wine
Branch: master
Commit: c11c695b11782b7940e1db433a6833bdc99ee2a1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11c695b11782b7940e1db433a6833bdc99ee2a1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Oct 15 11:17:10 2012 +0200
mshtml: Added IHTMLLinkElement::rel property implementation.
---
dlls/mshtml/htmllink.c | 22 ++++++++++++++++++----
dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c
index e23a808..383617a 100644
--- a/dlls/mshtml/htmllink.c
+++ b/dlls/mshtml/htmllink.c
@@ -119,15 +119,29 @@ static HRESULT WINAPI HTMLLinkElement_get_href(IHTMLLinkElement *iface, BSTR *p)
static HRESULT WINAPI HTMLLinkElement_put_rel(IHTMLLinkElement *iface, BSTR v)
{
HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface);
- FIXME("(%p)->(%s)\n", This, debugstr_w(v));
- return E_NOTIMPL;
+ nsAString rel_str;
+ nsresult nsres;
+
+ TRACE("(%p)->(%s)\n", This, debugstr_w(v));
+
+ nsAString_InitDepend(&rel_str, v);
+ nsres = nsIDOMHTMLLinkElement_SetRel(This->nslink, &rel_str);
+ nsAString_Finish(&rel_str);
+
+ return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL;
}
static HRESULT WINAPI HTMLLinkElement_get_rel(IHTMLLinkElement *iface, BSTR *p)
{
HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ nsAString rel_str;
+ nsresult nsres;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ nsAString_Init(&rel_str, NULL);
+ nsres = nsIDOMHTMLLinkElement_GetRel(This->nslink, &rel_str);
+ return return_nsstr(nsres, &rel_str, p);
}
static HRESULT WINAPI HTMLLinkElement_put_rev(IHTMLLinkElement *iface, BSTR v)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index f6ce2f0..30a0f0f 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -3453,6 +3453,37 @@ static void _link_put_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL v
_test_link_disabled(line, elem, v);
}
+#define test_link_rel(a,b) _test_link_rel(__LINE__,a,b)
+static void _test_link_rel(unsigned line, IHTMLElement *elem, const char *v)
+{
+ IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem);
+ BSTR rel;
+ HRESULT hres;
+
+ hres = IHTMLLinkElement_get_rel(link, &rel);
+ ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres);
+ if(v)
+ ok_(__FILE__,line)(!strcmp_wa(rel, v), "rel = %s, expected %s\n", wine_dbgstr_w(rel), v);
+ else
+ ok_(__FILE__,line)(!rel, "rel = %s, expected NULL\n", wine_dbgstr_w(rel));
+
+ IHTMLLinkElement_Release(link);
+}
+
+#define link_put_rel(a,b) _link_put_rel(__LINE__,a,b)
+static void _link_put_rel(unsigned line, IHTMLElement *elem, const char *v)
+{
+ IHTMLLinkElement *link = _get_link_iface(line, (IUnknown*)elem);
+ BSTR str = a2bstr(v);
+ HRESULT hres;
+
+ hres = IHTMLLinkElement_put_rel(link, str);
+ ok_(__FILE__,line)(hres == S_OK, "put_disabled failed: %08x\n", hres);
+ SysFreeString(str);
+ IHTMLLinkElement_Release(link);
+ _test_link_rel(line, elem, v);
+}
+
#define get_elem_doc(e) _get_elem_doc(__LINE__,e)
static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk)
{
@@ -5954,7 +5985,9 @@ static void test_elems2(IHTMLDocument2 *doc)
elem = get_elem_by_id(doc, "linkid", TRUE);
if(elem) {
test_link_disabled(elem, VARIANT_FALSE);
+ test_link_rel(elem, "stylesheet");
link_put_disabled(elem, VARIANT_TRUE);
+ link_put_rel(elem, "prev");
IHTMLElement_Release(elem);
}
More information about the wine-cvs
mailing list