mshtml: Don't mix nsresult with HRESULT.
This commit is contained in:
parent
746ffa651a
commit
45b862d5ca
|
@ -1163,6 +1163,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
|
||||||
nsISelection *nsselection;
|
nsISelection *nsselection;
|
||||||
nsIDOMDocument *nsdoc;
|
nsIDOMDocument *nsdoc;
|
||||||
nsresult nsres;
|
nsresult nsres;
|
||||||
|
HRESULT hres = E_FAIL;
|
||||||
|
|
||||||
TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out);
|
TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out);
|
||||||
|
|
||||||
|
@ -1242,9 +1243,9 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
|
||||||
|
|
||||||
nsIDOMElement_Release(anchor_elem);
|
nsIDOMElement_Release(anchor_elem);
|
||||||
nsIDOMDocument_Release(nsdoc);
|
nsIDOMDocument_Release(nsdoc);
|
||||||
|
|
||||||
|
hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
nsres = E_FAIL;
|
|
||||||
|
|
||||||
nsISelection_Release(nsselection);
|
nsISelection_Release(nsselection);
|
||||||
|
|
||||||
|
@ -1252,7 +1253,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
|
||||||
SysFreeString(url);
|
SysFreeString(url);
|
||||||
|
|
||||||
TRACE("-- 0x%08x\n", nsres);
|
TRACE("-- 0x%08x\n", nsres);
|
||||||
return nsres;
|
return hres;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT query_selall_status(HTMLDocument *This, OLECMD *cmd)
|
static HRESULT query_selall_status(HTMLDocument *This, OLECMD *cmd)
|
||||||
|
|
Loading…
Reference in New Issue