Merge to XFA: Get rid of most instance of 'foo != NULL'

core/src/fpdfdoc/doc_form.cpp

 // Copyright 2014 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 "core/include/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 const int nMaxRecursion = 32;
@@ skipping 310 matching lines @@
 }
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 typedef struct _PDF_FONTDATA {
   FX_BOOL bFind;
   LOGFONTA lf;
 } PDF_FONTDATA, FAR* LPDF_FONTDATA;
 static int CALLBACK EnumFontFamExProc(ENUMLOGFONTEXA* lpelfe,
                                       NEWTEXTMETRICEX* lpntme,
                                       DWORD FontType,
                                       LPARAM lParam) {
-  if (FontType != 0x004 || strchr(lpelfe->elfLogFont.lfFaceName, '@') != NULL) {
+  if (FontType != 0x004 || strchr(lpelfe->elfLogFont.lfFaceName, '@')) {
     return 1;
   }
   LPDF_FONTDATA pData = (LPDF_FONTDATA)lParam;
   memcpy(&pData->lf, &lpelfe->elfLogFont, sizeof(LOGFONTA));
   pData->bFind = TRUE;
   return 0;
 }
 static FX_BOOL RetrieveSpecificFont(LOGFONTA& lf) {
   PDF_FONTDATA fd;
   memset(&fd, 0, sizeof(PDF_FONTDATA));
   HDC hDC = ::GetDC(NULL);
   EnumFontFamiliesExA(hDC, &lf, (FONTENUMPROCA)EnumFontFamExProc, (LPARAM)&fd,
                       0);
   ::ReleaseDC(NULL, hDC);
   if (fd.bFind) {
     memcpy(&lf, &fd.lf, sizeof(LOGFONTA));
   }
   return fd.bFind;
 }
 static FX_BOOL RetrieveSpecificFont(uint8_t charSet,
                                     uint8_t pitchAndFamily,
                                     LPCSTR pcsFontName,
                                     LOGFONTA& lf) {
   memset(&lf, 0, sizeof(LOGFONTA));
   lf.lfCharSet = charSet;
   lf.lfPitchAndFamily = pitchAndFamily;
-  if (pcsFontName != NULL) {
+  if (pcsFontName) {
     strcpy(lf.lfFaceName, pcsFontName);
   }
   return RetrieveSpecificFont(lf);
 }
 #ifdef PDF_ENABLE_XFA
 static FX_BOOL RetrieveStockFont(int iFontObject,
                                  uint8_t charSet,
                                  LOGFONTA& lf) {
   HFONT hFont = (HFONT)::GetStockObject(iFontObject);
   if (hFont != NULL) {
@@ skipping 45 matching lines @@
                                 "Arial Unicode MS", lf);
   }
   if (!bRet) {
     bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE,
                                 "Microsoft Sans Serif", lf);
   }
   if (!bRet) {
     bRet = RetrieveSpecificFont(charSet, DEFAULT_PITCH | FF_DONTCARE, NULL, lf);
   }
   if (bRet) {
-    if (pLogFont != NULL) {
+    if (pLogFont) {
       memcpy(pLogFont, &lf, sizeof(LOGFONTA));
     }
     csFontName = lf.lfFaceName;
     return csFontName;
   }
 #endif
   return csFontName;
 }
 CFX_ByteString CPDF_InterForm::GetNativeFont(void* pLogFont) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
@@ skipping 113 matching lines @@
         break;
       }
     }
     FX_DWORD dwCount = m_pFieldTree->m_Root.CountFields();
     for (FX_DWORD m = 0; m < dwCount; m++) {
       CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(m);
       if (pField == NULL) {
         continue;
       }
       if (pField == pExcludedField) {
-        if (pExcludedControl != NULL) {
+        if (pExcludedControl) {
           if (pField->CountControls() < 2) {
             continue;
           }
         } else {
           continue;
         }
       }
       CFX_WideString csFullName = pField->GetFullName();
       int iRet = CompareFieldName(csSub, csFullName);
       if (iRet == 1) {
@@ skipping 343 matching lines @@
         if (pChildDict->GetObjNum() != dwParentObjNum) {
           LoadField(pChildDict, nLevel + 1);
         }
       }
     }
   } else {
     AddTerminalField(pFieldDict);
   }
 }
 FX_BOOL CPDF_InterForm::HasXFAForm() const {
-  return m_pFormDict && m_pFormDict->GetArray("XFA") != NULL;
+  return m_pFormDict && m_pFormDict->GetArray("XFA");
 }
 void CPDF_InterForm::FixPageFields(const CPDF_Page* pPage) {
-  ASSERT(pPage != NULL);
   CPDF_Dictionary* pPageDict = pPage->m_pFormDict;
   if (pPageDict == NULL) {
     return;
   }
   CPDF_Array* pAnnots = pPageDict->GetArray("Annots");
   if (pAnnots == NULL) {
     return;
   }
   int iAnnotCount = pAnnots->GetCount();
   for (int i = 0; i < iAnnotCount; i++) {
     CPDF_Dictionary* pAnnot = pAnnots->GetDict(i);
-    if (pAnnot != NULL && pAnnot->GetString("Subtype") == "Widget") {
+    if (pAnnot && pAnnot->GetString("Subtype") == "Widget") {
       LoadField(pAnnot);
     }
   }
 }
 CPDF_FormField* CPDF_InterForm::AddTerminalField(CPDF_Dictionary* pFieldDict) {
   if (!pFieldDict->KeyExist("T")) {
     return NULL;
   }
   CPDF_Dictionary* pDict = pFieldDict;
   CFX_WideString csWName = GetFullName(pFieldDict);
@@ skipping 187 matching lines @@
   int32_t m_codePage;
 } g_fieldEncoding[] = {
     {"BigFive", 950},
     {"GBK", 936},
     {"Shift-JIS", 932},
     {"UHC", 949},
 };
 static void FPDFDOC_FDF_GetFieldValue(CPDF_Dictionary* pFieldDict,
                                       CFX_WideString& csValue,
                                       CFX_ByteString& bsEncoding) {
-  ASSERT(pFieldDict != NULL);
   CFX_ByteString csBValue = pFieldDict->GetString("V");
   int32_t iCount = sizeof(g_fieldEncoding) / sizeof(g_fieldEncoding[0]);
   int32_t i = 0;
   for (; i < iCount; ++i)
     if (bsEncoding == g_fieldEncoding[i].m_name) {
       break;
     }
   if (i < iCount) {
     CFX_CharMap* pCharMap =
         CFX_CharMap::GetDefaultMapper(g_fieldEncoding[i].m_codePage);
-    FXSYS_assert(pCharMap != NULL);
+    FXSYS_assert(pCharMap);
     csValue.ConvertFrom(csBValue, pCharMap);
     return;
   }
   CFX_ByteString csTemp = csBValue.Left(2);
   if (csTemp == "\xFF\xFE" || csTemp == "\xFE\xFF") {
     csValue = PDF_DecodeText(csBValue);
   } else {
     csValue = CFX_WideString::FromLocal(csBValue);
   }
 }
@@ skipping 22 matching lines @@
   if (!pFieldDict->KeyExist("V")) {
     return;
   }
   CPDF_FormField* pField = m_pFieldTree->GetField(name);
   if (pField == NULL) {
     return;
   }
   CFX_WideString csWValue;
   FPDFDOC_FDF_GetFieldValue(pFieldDict, csWValue, m_bsEncoding);
   int iType = pField->GetFieldType();
-  if (bNotify && m_pFormNotify != NULL) {
+  if (bNotify && m_pFormNotify) {
     int iRet = 0;
     if (iType == FIELDTYPE_LISTBOX) {
       iRet = m_pFormNotify->BeforeSelectionChange(pField, csWValue);
     } else if (iType == FIELDTYPE_COMBOBOX || iType == FIELDTYPE_TEXTFIELD) {
       iRet = m_pFormNotify->BeforeValueChange(pField, csWValue);
     }
     if (iRet < 0) {
       return;
     }
   }
   CFX_ByteArray statusArray;
   if (iType == FIELDTYPE_CHECKBOX || iType == FIELDTYPE_RADIOBUTTON) {
     SaveCheckedFieldStatus(pField, statusArray);
   }
   pField->SetValue(csWValue);
   CPDF_FormField::Type eType = pField->GetType();
   if ((eType == CPDF_FormField::ListBox || eType == CPDF_FormField::ComboBox) &&
       pFieldDict->KeyExist("Opt")) {
     pField->m_pDict->SetAt("Opt",
                            pFieldDict->GetElementValue("Opt")->Clone(TRUE));
   }
-  if (bNotify && m_pFormNotify != NULL) {
+  if (bNotify && m_pFormNotify) {
     if (iType == FIELDTYPE_CHECKBOX || iType == FIELDTYPE_RADIOBUTTON) {
       m_pFormNotify->AfterCheckedStatusChange(pField, statusArray);
     } else if (iType == FIELDTYPE_LISTBOX) {
       m_pFormNotify->AfterSelectionChange(pField);
     } else if (iType == FIELDTYPE_COMBOBOX || iType == FIELDTYPE_TEXTFIELD) {
       m_pFormNotify->AfterValueChange(pField);
     }
   }
   if (CPDF_InterForm::m_bUpdateAP) {
     pField->UpdateAP(NULL);
   }
 }
 FX_BOOL CPDF_InterForm::ImportFromFDF(const CFDF_Document* pFDF,
                                       FX_BOOL bNotify) {
   if (pFDF == NULL) {
     return FALSE;
   }
   CPDF_Dictionary* pMainDict = pFDF->GetRoot()->GetDict("FDF");
   if (pMainDict == NULL) {
     return FALSE;
   }
   CPDF_Array* pFields = pMainDict->GetArray("Fields");
   if (pFields == NULL) {
     return FALSE;
   }
   m_bsEncoding = pMainDict->GetString("Encoding");
-  if (bNotify && m_pFormNotify != NULL) {
+  if (bNotify && m_pFormNotify) {
     int iRet = m_pFormNotify->BeforeFormImportData(this);
     if (iRet < 0) {
       return FALSE;
     }
   }
   for (FX_DWORD i = 0; i < pFields->GetCount(); i++) {
     CPDF_Dictionary* pField = pFields->GetDict(i);
     if (pField == NULL) {
       continue;
     }
     FDF_ImportField(pField, L"", bNotify);
   }
-  if (bNotify && m_pFormNotify != NULL) {
+  if (bNotify && m_pFormNotify) {
     m_pFormNotify->AfterFormImportData(this);
   }
   return TRUE;
 }
 void CPDF_InterForm::SetFormNotify(const CPDF_FormNotify* pNotify) {
   m_pFormNotify = (CPDF_FormNotify*)pNotify;
 }