diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 91e4b6a8562..3ab3ac12cd9 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -601,8 +601,24 @@ static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v) static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString title_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&title_str, NULL); + nsres = nsIDOMHTMLElement_GetTitle(This->nselem, &title_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *title; + + nsAString_GetData(&title_str, &title); + *p = *title ? SysAllocString(title) : NULL; + }else { + ERR("GetTitle failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLElement_put_language(IHTMLElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f909c4fb82e..e8f8468e431 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -42,7 +42,7 @@ static const char elem_test_str[] = "test" "text test" "link" - "" + "" "" "" "
" @@ -1090,6 +1090,24 @@ static void _test_elem_put_id(unsigned line, IUnknown *unk, const char *new_id) _test_elem_id(line, unk, new_id); } +#define test_elem_title(u,t) _test_elem_title(__LINE__,u,t) +static void _test_elem_title(unsigned line, IUnknown *unk, const char *extitle) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + BSTR title; + HRESULT hres; + + hres = IHTMLElement_get_title(elem, &title); + IHTMLElement_Release(elem); + ok_(__FILE__,line) (hres == S_OK, "get_title failed: %08x\n", hres); + if(extitle) + ok_(__FILE__,line) (!strcmp_wa(title, extitle), "unexpected title %s\n", dbgstr_w(title)); + else + ok_(__FILE__,line) (!title, "title=%s, expected NULL\n", dbgstr_w(title)); + + SysFreeString(title); +} + #define test_node_get_value_str(u,e) _test_node_get_value_str(__LINE__,u,e) static void _test_node_get_value_str(unsigned line, IUnknown *unk, const char *exval) { @@ -1985,6 +2003,8 @@ static void test_elems(IHTMLDocument2 *doc) test_select_elem(select); + test_elem_title((IUnknown*)select, NULL); + node = get_first_child((IUnknown*)select); ok(node != NULL, "node == NULL\n"); if(node) { @@ -2036,6 +2056,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_class((IUnknown*)elem, "testclass"); test_elem_tabindex((IUnknown*)elem, 2); test_elem_set_tabindex((IUnknown*)elem, 3); + test_elem_title((IUnknown*)elem, "test title"); IHTMLInputElement_Release(input); IHTMLElement_Release(elem);