Fix some bool/int mismatches.

fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp

 // Copyright 2016 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h"
 
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
@@ skipping 901 matching lines @@
     CFX_WideString ws;
     ws.FromLocal("Submit cancelled.");
     CFX_ByteString bs = ws.UTF16LE_Encode();
     int len = bs.GetLength();
     pFormFillEnv->Alert((FPDF_WIDESTRING)bs.GetBuffer(len),
                         (FPDF_WIDESTRING)L"", 0, 4);
     bs.ReleaseBuffer(len);
     return FALSE;
   }
 
-  FPDF_BOOL bRet = TRUE;

[Tom Sepez, 2016/10/25 23:08:45]

note: they mean FX_BOOL, not the other kind.

[npm, 2016/10/26 14:33:00]

Aren't they both the same (int)?

[Tom Sepez, 2016/10/26 15:45:09]

Yes, and that would be an obstacle to converting FX_BOOL to bool. 

   FPDF_FILEHANDLER* pFileHandler = nullptr;
   int fileFlag = -1;
   switch (submit.GetSubmitFormat()) {
     case XFA_ATTRIBUTEENUM_Xdp: {
       CFX_WideStringC csContentC;
       submit.GetSubmitXDPContent(csContentC);
       CFX_WideString csContent;
       csContent = csContentC;
       csContent.TrimLeft();
       csContent.TrimRight();
@@ skipping 26 matching lines @@
       return false;
   }
   if (!pFileHandler)
     return FALSE;
   if (csURL.Left(7).CompareNoCase(L"mailto:") == 0) {
     CFX_WideString csToAddress;
     CFX_WideString csCCAddress;
     CFX_WideString csBCCAddress;
     CFX_WideString csSubject;
     CFX_WideString csMsg;
-    bRet = MailToInfo(csURL, csToAddress, csCCAddress, csBCCAddress, csSubject,
-                      csMsg);
-    if (!bRet)
+    if (!MailToInfo(csURL, csToAddress, csCCAddress, csBCCAddress, csSubject,
+                    csMsg)) {
       return FALSE;
-
+    }
     CFX_ByteString bsTo = CFX_WideString(csToAddress).UTF16LE_Encode();
     CFX_ByteString bsCC = CFX_WideString(csCCAddress).UTF16LE_Encode();
     CFX_ByteString bsBcc = CFX_WideString(csBCCAddress).UTF16LE_Encode();
     CFX_ByteString bsSubject = CFX_WideString(csSubject).UTF16LE_Encode();
     CFX_ByteString bsMsg = CFX_WideString(csMsg).UTF16LE_Encode();
     FPDF_WIDESTRING pTo = (FPDF_WIDESTRING)bsTo.GetBuffer(bsTo.GetLength());
     FPDF_WIDESTRING pCC = (FPDF_WIDESTRING)bsCC.GetBuffer(bsCC.GetLength());
     FPDF_WIDESTRING pBcc = (FPDF_WIDESTRING)bsBcc.GetBuffer(bsBcc.GetLength());
     FPDF_WIDESTRING pSubject =
         (FPDF_WIDESTRING)bsSubject.GetBuffer(bsSubject.GetLength());
     FPDF_WIDESTRING pMsg = (FPDF_WIDESTRING)bsMsg.GetBuffer(bsMsg.GetLength());
     pFormFillEnv->EmailTo(pFileHandler, pTo, pSubject, pCC, pBcc, pMsg);
     bsTo.ReleaseBuffer();
     bsCC.ReleaseBuffer();
     bsBcc.ReleaseBuffer();
     bsSubject.ReleaseBuffer();
     bsMsg.ReleaseBuffer();
   } else {
     // HTTP or FTP
     CFX_WideString ws;
     CFX_ByteString bs = csURL.UTF16LE_Encode();
     int len = bs.GetLength();
     pFormFillEnv->UploadTo(pFileHandler, fileFlag,
                            (FPDF_WIDESTRING)bs.GetBuffer(len));
     bs.ReleaseBuffer(len);
   }
-  return bRet;
+  return TRUE;
 }
 
 FX_BOOL CPDFXFA_DocEnvironment::SetGlobalProperty(
     CXFA_FFDoc* hDoc,
     const CFX_ByteStringC& szPropName,
     CFXJSE_Value* pValue) {
   if (hDoc != m_pDocument->GetXFADoc())
     return FALSE;
 
   if (m_pDocument->GetFormFillEnv() &&
@@ skipping 14 matching lines @@
       !m_pDocument->GetFormFillEnv()->GetJSRuntime()) {
     return FALSE;
   }
 
   CPDFSDK_FormFillEnvironment* pFormFillEnv = m_pDocument->GetFormFillEnv();
   if (!m_pJSContext)
     m_pJSContext = pFormFillEnv->GetJSRuntime()->NewContext();
 
   return pFormFillEnv->GetJSRuntime()->GetValueByName(szPropName, pValue);
 }