Bug 793394 - Thunderbird build is broken after Bug 777292 (error: cannot convert from 'int' to 'nsresult') r=neil

mailnews/import/oexpress/WabObject.cpp

@@ -328,7 +328,7 @@ HRESULT CWAB::IterateWABContents(CWabIterator *pIter, int *pDone)
 
   // Read all the rows of the table one by one
   //
-  keepGoing = TRUE;
+  keepGoing = NS_OK;
   do {
 
     hr = lpAB->QueryRows(1,  0, &lpRowAB);

mailnews/import/outlook/src/MapiMessage.cpp

@@ -851,7 +851,8 @@ bool CMapiMessage::CopyMsgAttachToFile(LPATTACH lpAttach, /*out*/ nsIFile **tmp_
   LPMESSAGE  lpMsg;
   HRESULT hr = lpAttach->OpenProperty(PR_ATTACH_DATA_OBJ, &IID_IMessage, 0, 0,
                                       reinterpret_cast<LPUNKNOWN *>(&lpMsg));
-  NS_ENSURE_SUCCESS(hr, false);
+  if (HR_FAILED(hr))
+    return false;
 
   if (!GetTmpFile(tmp_file))
     return false;

mailnews/import/winlivemail/nsWMUtils.cpp

@@ -61,7 +61,7 @@ nsWMUtils::GetRootFolder(nsIFile **aRootFolder)
   nsString expandedStoreRoot;
   expandedStoreRoot.SetLength(size - 1);
   if (expandedStoreRoot.Length() != size - 1)
-    return false;
+    return NS_ERROR_FAILURE;
   ::ExpandEnvironmentStringsW((LPCWSTR)storeRoot.get(),
                               (LPWSTR)expandedStoreRoot.BeginWriting(),
                               size);