mshtml: Use stored nsdoc in IHTMLDocument3::getElementById.
This commit is contained in:
parent
08257acea2
commit
f1ff6b0993
|
@ -421,37 +421,36 @@ static HRESULT WINAPI HTMLDocument3_getElementById(IHTMLDocument3 *iface, BSTR v
|
||||||
IHTMLElement **pel)
|
IHTMLElement **pel)
|
||||||
{
|
{
|
||||||
HTMLDocument *This = HTMLDOC3_THIS(iface);
|
HTMLDocument *This = HTMLDOC3_THIS(iface);
|
||||||
nsIDOMDocument *nsdoc = NULL;
|
nsIDOMElement *nselem;
|
||||||
nsIDOMElement *nselem = NULL;
|
|
||||||
HTMLDOMNode *node;
|
HTMLDOMNode *node;
|
||||||
nsAString id_str;
|
nsAString id_str;
|
||||||
nsresult nsres;
|
nsresult nsres;
|
||||||
|
|
||||||
TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel);
|
TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel);
|
||||||
|
|
||||||
*pel = NULL;
|
if(!This->nsdoc) {
|
||||||
|
WARN("NULL nsdoc\n");
|
||||||
if(!This->nscontainer)
|
return E_UNEXPECTED;
|
||||||
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);
|
nsAString_Init(&id_str, v);
|
||||||
nsIDOMElement_Release(nselem);
|
nsres = nsIDOMHTMLDocument_GetElementById(This->nsdoc, &id_str, &nselem);
|
||||||
|
nsAString_Finish(&id_str);
|
||||||
|
if(FAILED(nsres)) {
|
||||||
|
ERR("GetElementById failed: %08x\n", nsres);
|
||||||
|
return E_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)pel);
|
if(nselem) {
|
||||||
|
node = get_node(This, (nsIDOMNode*)nselem, TRUE);
|
||||||
|
nsIDOMElement_Release(nselem);
|
||||||
|
|
||||||
|
IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)pel);
|
||||||
|
}else {
|
||||||
|
*pel = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue