marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Added IHTMLDocument3::getElementById implementation.

oldstable
Jacek Caban 2008-04-23 16:43:50 +02:00 committed by Alexandre Julliard
parent 5d49dea373
commit e610d2ff12
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/mshtml/htmldoc3.c
View File

@ -407,8 +407,37 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v
IHTMLElement **pel)
{
HTMLDocument *This = HTMLDOC3_THIS(iface);
FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel);
return E_NOTIMPL;
nsIDOMDocument *nsdoc = NULL;
nsIDOMElement *nselem = NULL;
HTMLDOMNode *node;
nsAString id_str;
nsresult nsres;
TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel);
*pel = NULL;
if(!This->nscontainer)
return S_OK;
nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc);
if(NS_FAILED(nsres) || !nsdoc)
return S_OK;
nsAString_Init(&id_str, v);
nsIDOMDocument_GetElementById(nsdoc, &id_str, &nselem);
nsIDOMDocument_Release(nsdoc);
nsAString_Finish(&id_str);
if(!nselem) {
*pel = NULL;
return S_OK;
}
node = get_node(This, (nsIDOMNode*)nselem, TRUE);
nsIDOMElement_Release(nselem);
return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)pel);
}

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

@ -777,6 +777,26 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id, BOOL expect
return elem;
}
static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id)
{
IHTMLDocument3 *doc3;
IHTMLElement *elem;
BSTR tmp;
HRESULT hres;
hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3);
ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres);
tmp = SysAllocString(id);
hres = IHTMLDocument3_getElementById(doc3, tmp, &elem);
SysFreeString(tmp);
ok(hres == S_OK, "getElementById(%s) failed: %08x\n", dbgstr_w(id), hres);
IHTMLDocument3_Release(doc3);
return elem;
}
static void test_select_elem(IHTMLSelectElement *select)
{
test_select_length(select, 2);
@ -1357,6 +1377,15 @@ static void test_elems(IHTMLDocument2 *doc)
IHTMLElementCollection_Release(col);
get_elem_by_id(doc, xxxW, FALSE);
elem = get_doc_elem_by_id(doc, xxxW);
ok(!elem, "elem != NULL\n");
elem = get_doc_elem_by_id(doc, sW);
ok(elem != NULL, "elem == NULL\n");
test_elem_type((IUnknown*)elem, ET_SELECT);
if(elem)
IHTMLElement_Release(elem);
elem = get_elem_by_id(doc, sW, TRUE);
if(elem) {
IHTMLSelectElement *select;