Bug 860966 - Compile failure in msgMapiImp.cpp with Visual Studio 2012. r=standard8
--- a/mailnews/mapi/mapihook/src/msgMapiImp.cpp
+++ b/mailnews/mapi/mapihook/src/msgMapiImp.cpp
@@ -331,17 +331,17 @@ protected:
nsCOMPtr <nsISimpleEnumerator> m_msgEnumerator;
};
LONG CMapiImp::InitContext(unsigned long session, MsgMapiListContext **listContext)
{
nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
if (!pMapiConfig)
- return NS_ERROR_FAILURE ; // get the singelton obj
+ return MAPI_E_FAILURE ; // get the singelton obj
*listContext = (MsgMapiListContext *) pMapiConfig->GetMapiListContext(session);
// This is the first message
if (!*listContext)
{
nsCOMPtr <nsIMsgFolder> inboxFolder;
nsresult rv = GetDefaultInbox(getter_AddRefs(inboxFolder));
if (NS_FAILED(rv))
{
@@ -377,17 +377,17 @@ STDMETHODIMP CMapiImp::FindNext(unsigned
// and we should start the enumeration operation.
//
*lpszMessageID = '\0';
nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
if (!pMapiConfig)
{
NS_ASSERTION(false, "failed to get config in findnext");
- return NS_ERROR_FAILURE ; // get the singelton obj
+ return MAPI_E_FAILURE ; // get the singelton obj
}
MsgMapiListContext *listContext;
LONG ret = InitContext(aSession, &listContext);
if (ret != SUCCESS_SUCCESS)
{
NS_ASSERTION(false, "init context failed");
return ret;
}