From e8590e03eecee27cbd68ef0628885acf4c269f8a Mon Sep 17 00:00:00 2001 From: Oleg Romashin Date: Sun, 14 Oct 2012 23:20:49 -0700 Subject: [PATCH] Bug 801471 - Failed to convert nsresult to HRESULT in nsDataObj.cpp on windows build. r=jmathies --- widget/windows/nsDataObj.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/widget/windows/nsDataObj.cpp b/widget/windows/nsDataObj.cpp index 6b038d09051..7dadc4324a0 100644 --- a/widget/windows/nsDataObj.cpp +++ b/widget/windows/nsDataObj.cpp @@ -312,7 +312,7 @@ HRESULT nsDataObj::CreateStream(IStream **outStream) rv = GetDownloadDetails(getter_AddRefs(sourceURI), wideFileName); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, E_FAIL); nsDataObj::CStream *pStream = new nsDataObj::CStream(); NS_ENSURE_TRUE(pStream, E_OUTOFMEMORY); @@ -1111,10 +1111,10 @@ nsDataObj :: GetFileContentsInternetShortcut ( FORMATETC& aFE, STGMEDIUM& aSTG ) mozilla::widget::FaviconHelper::ObtainCachedIconFile(aUri, aUriHash, mIOThread, true); nsresult rv = mozilla::widget::FaviconHelper::GetOutputIconPath(aUri, icoFile, true); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, E_FAIL); nsCString path; rv = icoFile->GetNativePath(path); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, E_FAIL); static char* shortcutFormatStr = "[InternetShortcut]\r\nURL=%s\r\n" "IDList=\r\nHotKey=0\r\nIconFile=%s\r\n"