mshtml: Use stored nselem in get_documentElement.

This commit is contained in:
Jacek Caban 2008-10-08 13:29:47 -05:00 committed by Alexandre Julliard
parent 4f08c4f09b
commit 08257acea2
1 changed files with 10 additions and 15 deletions

View File

@ -134,31 +134,26 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t
static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, IHTMLElement **p) static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, IHTMLElement **p)
{ {
HTMLDocument *This = HTMLDOC3_THIS(iface); HTMLDocument *This = HTMLDOC3_THIS(iface);
nsIDOMDocument *nsdoc;
HTMLDOMNode *node;
nsIDOMElement *nselem = NULL; nsIDOMElement *nselem = NULL;
HTMLDOMNode *node;
nsresult nsres; nsresult nsres;
TRACE("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
if(!This->nscontainer) { if(!This->nsdoc) {
*p = NULL; WARN("NULL nsdoc\n");
return S_OK; return E_UNEXPECTED;
} }
nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); nsres = nsIDOMHTMLDocument_GetDocumentElement(This->nsdoc, &nselem);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres)) {
ERR("GetDocument failed: %08x\n", nsres);
if(nsdoc) {
nsres = nsIDOMHTMLDocument_GetDocumentElement(nsdoc, &nselem);
if(NS_FAILED(nsres))
ERR("GetDocumentElement failed: %08x\n", nsres); ERR("GetDocumentElement failed: %08x\n", nsres);
return E_FAIL;
} }
if(nselem) { if(nselem) {
node = get_node(This, (nsIDOMNode *)nselem, TRUE); node = get_node(This, (nsIDOMNode *)nselem, TRUE);
nsIDOMDocument_Release(nsdoc); nsIDOMElement_Release(nselem);
IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p); IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_IHTMLElement, (void**)p);
}else { }else {
*p = NULL; *p = NULL;