Remove FX_DWORD from core/ and delete definition

core/fpdfapi/fpdf_parser/cpdf_data_avail.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 "core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_data_avail.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
@@ skipping 28 matching lines @@
 // static
 int CPDF_DataAvail::s_CurrentDataAvailRecursionDepth = 0;
 
 CPDF_DataAvail::CPDF_DataAvail(IPDF_DataAvail::FileAvail* pFileAvail,
                                IFX_FileRead* pFileRead,
                                FX_BOOL bSupportHintTable)
     : IPDF_DataAvail(pFileAvail, pFileRead) {
   m_Pos = 0;
   m_dwFileLen = 0;
   if (m_pFileRead) {
-    m_dwFileLen = (FX_DWORD)m_pFileRead->GetSize();
+    m_dwFileLen = (uint32_t)m_pFileRead->GetSize();
   }
   m_dwCurrentOffset = 0;
   m_dwXRefOffset = 0;
   m_bufferOffset = 0;
   m_dwFirstPageNo = 0;
   m_bufferSize = 0;
   m_PagesObjNum = 0;
   m_dwCurrentXRefSteam = 0;
   m_dwAcroFormObjNum = 0;
   m_dwInfoObjNum = 0;
@@ skipping 40 matching lines @@
 
   int iSize = m_arrayAcroforms.GetSize();
   for (int i = 0; i < iSize; ++i)
     m_arrayAcroforms.GetAt(i)->Release();
 }
 
 void CPDF_DataAvail::SetDocument(CPDF_Document* pDoc) {
   m_pDocument = pDoc;
 }
 
-FX_DWORD CPDF_DataAvail::GetObjectSize(FX_DWORD objnum, FX_FILESIZE& offset) {
+uint32_t CPDF_DataAvail::GetObjectSize(uint32_t objnum, FX_FILESIZE& offset) {
   CPDF_Parser* pParser = m_pDocument->GetParser();
   if (!pParser || !pParser->IsValidObjectNumber(objnum))
     return 0;
 
   if (pParser->GetObjectType(objnum) == 2)
     objnum = pParser->GetObjectPositionOrZero(objnum);
 
   if (pParser->GetObjectType(objnum) != 1 &&
       pParser->GetObjectType(objnum) != 255) {
     return 0;
@@ skipping 12 matching lines @@
 }
 
 FX_BOOL CPDF_DataAvail::IsObjectsAvail(
     CFX_ArrayTemplate<CPDF_Object*>& obj_array,
     FX_BOOL bParsePage,
     IPDF_DataAvail::DownloadHints* pHints,
     CFX_ArrayTemplate<CPDF_Object*>& ret_array) {
   if (!obj_array.GetSize())
     return TRUE;
 
-  FX_DWORD count = 0;
+  uint32_t count = 0;
   CFX_ArrayTemplate<CPDF_Object*> new_obj_array;
   int32_t i = 0;
   for (i = 0; i < obj_array.GetSize(); i++) {
     CPDF_Object* pObj = obj_array[i];
     if (!pObj)
       continue;
 
     int32_t type = pObj->GetType();
     switch (type) {
       case CPDF_Object::ARRAY: {
         CPDF_Array* pArray = pObj->GetArray();
-        for (FX_DWORD k = 0; k < pArray->GetCount(); ++k)
+        for (uint32_t k = 0; k < pArray->GetCount(); ++k)
           new_obj_array.Add(pArray->GetElement(k));
       } break;
       case CPDF_Object::STREAM:
         pObj = pObj->GetDict();
       case CPDF_Object::DICTIONARY: {
         CPDF_Dictionary* pDict = pObj->GetDict();
         if (pDict && pDict->GetStringBy("Type") == "Page" && !bParsePage)
           continue;
 
         for (const auto& it : *pDict) {
           const CFX_ByteString& key = it.first;
           CPDF_Object* value = it.second;
           if (key != "Parent")
             new_obj_array.Add(value);
         }
       } break;
       case CPDF_Object::REFERENCE: {
         CPDF_Reference* pRef = pObj->AsReference();
-        FX_DWORD dwNum = pRef->GetRefObjNum();
+        uint32_t dwNum = pRef->GetRefObjNum();
 
         FX_FILESIZE offset;
-        FX_DWORD size = GetObjectSize(dwNum, offset);
+        uint32_t size = GetObjectSize(dwNum, offset);
         if (size == 0 || offset < 0 || offset >= m_dwFileLen)
           break;
 
         if (!IsDataAvail(offset, size, pHints)) {
           ret_array.Add(pObj);
           count++;
         } else if (!pdfium::ContainsKey(m_ObjectSet, dwNum)) {
           m_ObjectSet.insert(dwNum);
           CPDF_Object* pReferred =
               m_pDocument->GetIndirectObject(pRef->GetRefObjNum());
           if (pReferred)
             new_obj_array.Add(pReferred);
         }
       } break;
     }
   }
 
   if (count > 0) {
     int32_t iSize = new_obj_array.GetSize();
     for (i = 0; i < iSize; ++i) {
       CPDF_Object* pObj = new_obj_array[i];
       if (CPDF_Reference* pRef = pObj->AsReference()) {
-        FX_DWORD dwNum = pRef->GetRefObjNum();
+        uint32_t dwNum = pRef->GetRefObjNum();
         if (!pdfium::ContainsKey(m_ObjectSet, dwNum))
           ret_array.Add(pObj);
       } else {
         ret_array.Add(pObj);
       }
     }
     return FALSE;
   }
 
   obj_array.RemoveAll();
   obj_array.Append(new_obj_array);
   return IsObjectsAvail(obj_array, FALSE, pHints, ret_array);
 }
 
 IPDF_DataAvail::DocAvailStatus CPDF_DataAvail::IsDocAvail(
     IPDF_DataAvail::DownloadHints* pHints) {
   if (!m_dwFileLen && m_pFileRead) {
-    m_dwFileLen = (FX_DWORD)m_pFileRead->GetSize();
+    m_dwFileLen = (uint32_t)m_pFileRead->GetSize();
     if (!m_dwFileLen)
       return DataError;
   }
 
   while (!m_bDocAvail) {
     if (!CheckDocStatus(pHints))
       return DataNotAvailable;
   }
 
   return DataAvailable;
@@ skipping 107 matching lines @@
     case PDF_DATAAVAIL_ERROR:
       return LoadAllFile(pHints);
     default:
       m_bPagesTreeLoad = TRUE;
       m_bPagesLoad = TRUE;
       return TRUE;
   }
 }
 
 FX_BOOL CPDF_DataAvail::LoadAllFile(IPDF_DataAvail::DownloadHints* pHints) {
-  if (m_pFileAvail->IsDataAvail(0, (FX_DWORD)m_dwFileLen)) {
+  if (m_pFileAvail->IsDataAvail(0, (uint32_t)m_dwFileLen)) {
     m_docStatus = PDF_DATAAVAIL_DONE;
     return TRUE;
   }
 
-  pHints->AddSegment(0, (FX_DWORD)m_dwFileLen);
+  pHints->AddSegment(0, (uint32_t)m_dwFileLen);
   return FALSE;
 }
 
 FX_BOOL CPDF_DataAvail::LoadAllXref(IPDF_DataAvail::DownloadHints* pHints) {
-  m_parser.m_pSyntax->InitParser(m_pFileRead, (FX_DWORD)m_dwHeaderOffset);
+  m_parser.m_pSyntax->InitParser(m_pFileRead, (uint32_t)m_dwHeaderOffset);
   m_parser.m_bOwnFileRead = false;
   if (!m_parser.LoadAllCrossRefV4(m_dwLastXRefOffset) &&
       !m_parser.LoadAllCrossRefV5(m_dwLastXRefOffset)) {
     m_docStatus = PDF_DATAAVAIL_LOADALLFILE;
     return FALSE;
   }
 
   m_dwRootObjNum = m_parser.GetRootObjNum();
   m_dwInfoObjNum = m_parser.GetInfoObjNum();
   m_pCurrentParser = &m_parser;
   m_docStatus = PDF_DATAAVAIL_ROOT;
   return TRUE;
 }
 
-CPDF_Object* CPDF_DataAvail::GetObject(FX_DWORD objnum,
+CPDF_Object* CPDF_DataAvail::GetObject(uint32_t objnum,
                                        IPDF_DataAvail::DownloadHints* pHints,
                                        FX_BOOL* pExistInFile) {
   CPDF_Object* pRet = nullptr;
-  FX_DWORD size = 0;
+  uint32_t size = 0;
   FX_FILESIZE offset = 0;
   CPDF_Parser* pParser = nullptr;
 
   if (pExistInFile)
     *pExistInFile = TRUE;
 
   if (m_pDocument) {
     size = GetObjectSize(objnum, offset);
     pParser = m_pDocument->GetParser();
   } else {
-    size = (FX_DWORD)m_parser.GetObjectSize(objnum);
+    size = (uint32_t)m_parser.GetObjectSize(objnum);
     offset = m_parser.GetObjectOffset(objnum);
     pParser = &m_parser;
   }
 
   if (!IsDataAvail(offset, size, pHints))
     return nullptr;
 
   if (pParser)
     pRet = pParser->ParseIndirectObject(nullptr, objnum);
 
@@ skipping 94 matching lines @@
 
 bool CPDF_DataAvail::IsFirstCheck(int iPage) {
   return m_pageMapCheckState.insert(iPage).second;
 }
 
 void CPDF_DataAvail::ResetFirstCheck(int iPage) {
   m_pageMapCheckState.erase(iPage);
 }
 
 FX_BOOL CPDF_DataAvail::CheckPage(IPDF_DataAvail::DownloadHints* pHints) {
-  FX_DWORD iPageObjs = m_PageObjList.GetSize();
-  CFX_ArrayTemplate<FX_DWORD> UnavailObjList;
-  for (FX_DWORD i = 0; i < iPageObjs; ++i) {
-    FX_DWORD dwPageObjNum = m_PageObjList.GetAt(i);
+  uint32_t iPageObjs = m_PageObjList.GetSize();
+  CFX_ArrayTemplate<uint32_t> UnavailObjList;
+  for (uint32_t i = 0; i < iPageObjs; ++i) {
+    uint32_t dwPageObjNum = m_PageObjList.GetAt(i);
     FX_BOOL bExist = FALSE;
     CPDF_Object* pObj = GetObject(dwPageObjNum, pHints, &bExist);
     if (!pObj) {
       if (bExist)
         UnavailObjList.Add(dwPageObjNum);
       continue;
     }
 
     if (pObj->IsArray()) {
       CPDF_Array* pArray = pObj->GetArray();
@@ skipping 18 matching lines @@
     }
     pObj->Release();
   }
 
   m_PageObjList.RemoveAll();
   if (UnavailObjList.GetSize()) {
     m_PageObjList.Append(UnavailObjList);
     return FALSE;
   }
 
-  FX_DWORD iPages = m_PagesArray.GetSize();
-  for (FX_DWORD i = 0; i < iPages; i++) {
+  uint32_t iPages = m_PagesArray.GetSize();
+  for (uint32_t i = 0; i < iPages; i++) {
     CPDF_Object* pPages = m_PagesArray.GetAt(i);
     if (!pPages)
       continue;
 
     if (!GetPageKids(m_pCurrentParser, pPages)) {
       pPages->Release();
       while (++i < iPages) {
         pPages = m_PagesArray.GetAt(i);
         pPages->Release();
       }
@@ skipping 21 matching lines @@
   CPDF_Object* pKids = pDict ? pDict->GetElement("Kids") : NULL;
   if (!pKids)
     return TRUE;
 
   switch (pKids->GetType()) {
     case CPDF_Object::REFERENCE:
       m_PageObjList.Add(pKids->AsReference()->GetRefObjNum());
       break;
     case CPDF_Object::ARRAY: {
       CPDF_Array* pKidsArray = pKids->AsArray();
-      for (FX_DWORD i = 0; i < pKidsArray->GetCount(); ++i) {
+      for (uint32_t i = 0; i < pKidsArray->GetCount(); ++i) {
         if (CPDF_Reference* pRef = ToReference(pKidsArray->GetElement(i)))
           m_PageObjList.Add(pRef->GetRefObjNum());
       }
     } break;
     default:
       m_docStatus = PDF_DATAAVAIL_ERROR;
       return FALSE;
   }
   return TRUE;
 }
@@ skipping 19 matching lines @@
     m_docStatus = PDF_DATAAVAIL_ERROR;
     return FALSE;
   }
 
   pPages->Release();
   m_docStatus = PDF_DATAAVAIL_PAGE;
   return TRUE;
 }
 
 FX_BOOL CPDF_DataAvail::CheckHeader(IPDF_DataAvail::DownloadHints* pHints) {
-  FX_DWORD req_size = 1024;
+  uint32_t req_size = 1024;
   if ((FX_FILESIZE)req_size > m_dwFileLen)
-    req_size = (FX_DWORD)m_dwFileLen;
+    req_size = (uint32_t)m_dwFileLen;
 
   if (m_pFileAvail->IsDataAvail(0, req_size)) {
     uint8_t buffer[1024];
     m_pFileRead->ReadBlock(buffer, 0, req_size);
 
     if (IsLinearizedFile(buffer, req_size)) {
       m_docStatus = PDF_DATAAVAIL_FIRSTPAGE;
     } else {
       if (m_docStatus == PDF_DATAAVAIL_ERROR)
         return FALSE;
@@ skipping 21 matching lines @@
   }
 
   CPDF_Object* pFileLen = pDict ? pDict->GetElement("L") : NULL;
   if (!pFileLen) {
     m_docStatus = PDF_DATAAVAIL_ERROR;
     return FALSE;
   }
 
   FX_BOOL bNeedDownLoad = FALSE;
   if (pEndOffSet->IsNumber()) {
-    FX_DWORD dwEnd = pEndOffSet->GetInteger();
+    uint32_t dwEnd = pEndOffSet->GetInteger();
     dwEnd += 512;
     if ((FX_FILESIZE)dwEnd > m_dwFileLen)
-      dwEnd = (FX_DWORD)m_dwFileLen;
+      dwEnd = (uint32_t)m_dwFileLen;
 
     int32_t iStartPos = (int32_t)(m_dwFileLen > 1024 ? 1024 : m_dwFileLen);
     int32_t iSize = dwEnd > 1024 ? dwEnd - 1024 : 0;
     if (!m_pFileAvail->IsDataAvail(iStartPos, iSize)) {
       pHints->AddSegment(iStartPos, iSize);
       bNeedDownLoad = TRUE;
     }
   }
 
   m_dwLastXRefOffset = 0;
   FX_FILESIZE dwFileLen = 0;
   if (pXRefOffset->IsNumber())
     m_dwLastXRefOffset = pXRefOffset->GetInteger();
 
   if (pFileLen->IsNumber())
     dwFileLen = pFileLen->GetInteger();
 
   if (!m_pFileAvail->IsDataAvail(m_dwLastXRefOffset,
-                                 (FX_DWORD)(dwFileLen - m_dwLastXRefOffset))) {
+                                 (uint32_t)(dwFileLen - m_dwLastXRefOffset))) {
     if (m_docStatus == PDF_DATAAVAIL_FIRSTPAGE) {
-      FX_DWORD dwSize = (FX_DWORD)(dwFileLen - m_dwLastXRefOffset);
+      uint32_t dwSize = (uint32_t)(dwFileLen - m_dwLastXRefOffset);
       FX_FILESIZE offset = m_dwLastXRefOffset;
       if (dwSize < 512 && dwFileLen > 512) {
         dwSize = 512;
         offset = dwFileLen - 512;
       }
       pHints->AddSegment(offset, dwSize);
     }
   } else {
     m_docStatus = PDF_DATAAVAIL_FIRSTPAGE_PREPARE;
   }
 
   if (bNeedDownLoad || m_docStatus != PDF_DATAAVAIL_FIRSTPAGE_PREPARE) {
     m_docStatus = PDF_DATAAVAIL_FIRSTPAGE_PREPARE;
     return FALSE;
   }
 
   m_docStatus =
       m_bSupportHintTable ? PDF_DATAAVAIL_HINTTABLE : PDF_DATAAVAIL_DONE;
   return TRUE;
 }
 
 FX_BOOL CPDF_DataAvail::IsDataAvail(FX_FILESIZE offset,
-                                    FX_DWORD size,
+                                    uint32_t size,
                                     IPDF_DataAvail::DownloadHints* pHints) {
   if (offset > m_dwFileLen)
     return TRUE;
 
-  FX_SAFE_DWORD safeSize = pdfium::base::checked_cast<FX_DWORD>(offset);
+  FX_SAFE_DWORD safeSize = pdfium::base::checked_cast<uint32_t>(offset);
   safeSize += size;
   safeSize += 512;
   if (!safeSize.IsValid() || safeSize.ValueOrDie() > m_dwFileLen)
     size = m_dwFileLen - offset;
   else
     size += 512;
 
   if (!m_pFileAvail->IsDataAvail(offset, size)) {
     pHints->AddSegment(offset, size);
     return FALSE;
@@ skipping 45 matching lines @@
   CPDF_Stream* pStream = ToStream(pHintStream.get());
   if (pStream && pHintTables->LoadHintStream(pStream))
     m_pHintTables = std::move(pHintTables);
 
   m_docStatus = PDF_DATAAVAIL_DONE;
   return TRUE;
 }
 
 CPDF_Object* CPDF_DataAvail::ParseIndirectObjectAt(
     FX_FILESIZE pos,
-    FX_DWORD objnum,
+    uint32_t objnum,
     CPDF_IndirectObjectHolder* pObjList) {
   FX_FILESIZE SavedPos = m_syntaxParser.SavePos();
   m_syntaxParser.RestorePos(pos);
 
   bool bIsNumber;
   CFX_ByteString word = m_syntaxParser.GetNextWord(&bIsNumber);
   if (!bIsNumber)
     return nullptr;
 
-  FX_DWORD parser_objnum = FXSYS_atoui(word);
+  uint32_t parser_objnum = FXSYS_atoui(word);
   if (objnum && parser_objnum != objnum)
     return nullptr;
 
   word = m_syntaxParser.GetNextWord(&bIsNumber);
   if (!bIsNumber)
     return nullptr;
 
-  FX_DWORD gennum = FXSYS_atoui(word);
+  uint32_t gennum = FXSYS_atoui(word);
   if (m_syntaxParser.GetKeyword() != "obj") {
     m_syntaxParser.RestorePos(SavedPos);
     return nullptr;
   }
 
   CPDF_Object* pObj =
       m_syntaxParser.GetObject(pObjList, parser_objnum, gennum, true);
   m_syntaxParser.RestorePos(SavedPos);
   return pObj;
 }
 
 IPDF_DataAvail::DocLinearizationStatus CPDF_DataAvail::IsLinearizedPDF() {
-  FX_DWORD req_size = 1024;
+  uint32_t req_size = 1024;
   if (!m_pFileAvail->IsDataAvail(0, req_size))
     return LinearizationUnknown;
 
   if (!m_pFileRead)
     return NotLinearized;
 
   FX_FILESIZE dwSize = m_pFileRead->GetSize();
   if (dwSize < (FX_FILESIZE)req_size)
     return LinearizationUnknown;
 
   uint8_t buffer[1024];
   m_pFileRead->ReadBlock(buffer, 0, req_size);
   if (IsLinearizedFile(buffer, req_size))
     return Linearized;
 
   return NotLinearized;
 }
-FX_BOOL CPDF_DataAvail::IsLinearizedFile(uint8_t* pData, FX_DWORD dwLen) {
+FX_BOOL CPDF_DataAvail::IsLinearizedFile(uint8_t* pData, uint32_t dwLen) {
   ScopedFileStream file(FX_CreateMemoryStream(pData, (size_t)dwLen, FALSE));
 
   int32_t offset = GetHeaderOffset(file.get());
   if (offset == -1) {
     m_docStatus = PDF_DATAAVAIL_ERROR;
     return FALSE;
   }
 
   m_dwHeaderOffset = offset;
   m_syntaxParser.InitParser(file.get(), offset);
   m_syntaxParser.RestorePos(m_syntaxParser.m_HeaderOffset + 9);
 
   bool bNumber;
   CFX_ByteString wordObjNum = m_syntaxParser.GetNextWord(&bNumber);
   if (!bNumber)
     return FALSE;
 
-  FX_DWORD objnum = FXSYS_atoui(wordObjNum);
+  uint32_t objnum = FXSYS_atoui(wordObjNum);
   if (m_pLinearized) {
     m_pLinearized->Release();
     m_pLinearized = nullptr;
   }
 
   m_pLinearized =
       ParseIndirectObjectAt(m_syntaxParser.m_HeaderOffset + 9, objnum);
   if (!m_pLinearized)
     return FALSE;
 
@@ skipping 10 matching lines @@
 
     if (CPDF_Number* pNo = ToNumber(pDict->GetElement("P")))
       m_dwFirstPageNo = pNo->GetInteger();
 
     return TRUE;
   }
   return FALSE;
 }
 
 FX_BOOL CPDF_DataAvail::CheckEnd(IPDF_DataAvail::DownloadHints* pHints) {
-  FX_DWORD req_pos = (FX_DWORD)(m_dwFileLen > 1024 ? m_dwFileLen - 1024 : 0);
-  FX_DWORD dwSize = (FX_DWORD)(m_dwFileLen - req_pos);
+  uint32_t req_pos = (uint32_t)(m_dwFileLen > 1024 ? m_dwFileLen - 1024 : 0);
+  uint32_t dwSize = (uint32_t)(m_dwFileLen - req_pos);
 
   if (m_pFileAvail->IsDataAvail(req_pos, dwSize)) {
     uint8_t buffer[1024];
     m_pFileRead->ReadBlock(buffer, req_pos, dwSize);
 
     ScopedFileStream file(FX_CreateMemoryStream(buffer, (size_t)dwSize, FALSE));
     m_syntaxParser.InitParser(file.get(), 0);
     m_syntaxParser.RestorePos(dwSize - 1);
 
     if (m_syntaxParser.SearchWord("startxref", TRUE, FALSE, dwSize)) {
@@ skipping 23 matching lines @@
   }
 
   pHints->AddSegment(req_pos, dwSize);
   return FALSE;
 }
 
 int32_t CPDF_DataAvail::CheckCrossRefStream(
     IPDF_DataAvail::DownloadHints* pHints,
     FX_FILESIZE& xref_offset) {
   xref_offset = 0;
-  FX_DWORD req_size =
-      (FX_DWORD)(m_Pos + 512 > m_dwFileLen ? m_dwFileLen - m_Pos : 512);
+  uint32_t req_size =
+      (uint32_t)(m_Pos + 512 > m_dwFileLen ? m_dwFileLen - m_Pos : 512);
 
   if (m_pFileAvail->IsDataAvail(m_Pos, req_size)) {
     int32_t iSize = (int32_t)(m_Pos + req_size - m_dwCurrentXRefSteam);
     CFX_BinaryBuf buf(iSize);
     uint8_t* pBuf = buf.GetBuffer();
 
     m_pFileRead->ReadBlock(pBuf, m_dwCurrentXRefSteam, iSize);
 
     ScopedFileStream file(FX_CreateMemoryStream(pBuf, (size_t)iSize, FALSE));
     m_parser.m_pSyntax->InitParser(file.get(), 0);
 
     bool bNumber;
     CFX_ByteString objnum = m_parser.m_pSyntax->GetNextWord(&bNumber);
     if (!bNumber)
       return -1;
 
-    FX_DWORD objNum = FXSYS_atoui(objnum);
+    uint32_t objNum = FXSYS_atoui(objnum);
     CPDF_Object* pObj = m_parser.ParseIndirectObjectAt(nullptr, 0, objNum);
     if (!pObj) {
       m_Pos += m_parser.m_pSyntax->SavePos();
       return 0;
     }
 
     CPDF_Dictionary* pDict = pObj->GetDict();
     CPDF_Name* pName = ToName(pDict ? pDict->GetElement("Type") : nullptr);
     if (pName) {
       if (pName->GetString() == "XRef") {
@@ skipping 30 matching lines @@
 
     while (1) {
       if (!GetNextChar(ch))
         return FALSE;
       if (PDFCharIsLineEnding(ch))
         break;
     }
   }
 
   uint8_t buffer[256];
-  FX_DWORD index = 0;
+  uint32_t index = 0;
   if (PDFCharIsDelimiter(ch)) {
     buffer[index++] = ch;
     if (ch == '/') {
       while (1) {
         if (!GetNextChar(ch))
           return FALSE;
 
         if (!PDFCharIsOther(ch) && !PDFCharIsNumeric(ch)) {
           m_Pos--;
           CFX_ByteString ret(buffer, index);
@@ skipping 45 matching lines @@
 }
 
 FX_BOOL CPDF_DataAvail::GetNextChar(uint8_t& ch) {
   FX_FILESIZE pos = m_Pos;
   if (pos >= m_dwFileLen)
     return FALSE;
 
   if (m_bufferOffset >= pos ||
       (FX_FILESIZE)(m_bufferOffset + m_bufferSize) <= pos) {
     FX_FILESIZE read_pos = pos;
-    FX_DWORD read_size = 512;
+    uint32_t read_size = 512;
     if ((FX_FILESIZE)read_size > m_dwFileLen)
-      read_size = (FX_DWORD)m_dwFileLen;
+      read_size = (uint32_t)m_dwFileLen;
 
     if ((FX_FILESIZE)(read_pos + read_size) > m_dwFileLen)
       read_pos = m_dwFileLen - read_size;
 
     if (!m_pFileRead->ReadBlock(m_bufferData, read_pos, read_size))
       return FALSE;
 
     m_bufferOffset = read_pos;
     m_bufferSize = read_size;
   }
@@ skipping 124 matching lines @@
     if (!pTrailer->IsDictionary())
       return FALSE;
 
     CPDF_Dictionary* pTrailerDict = pTrailer->GetDict();
     CPDF_Object* pEncrypt = pTrailerDict->GetElement("Encrypt");
     if (ToReference(pEncrypt)) {
       m_docStatus = PDF_DATAAVAIL_LOADALLFILE;
       return TRUE;
     }
 
-    FX_DWORD xrefpos = GetDirectInteger(pTrailerDict, "Prev");
+    uint32_t xrefpos = GetDirectInteger(pTrailerDict, "Prev");
     if (xrefpos) {
       m_dwPrevXRefOffset = GetDirectInteger(pTrailerDict, "XRefStm");
       if (m_dwPrevXRefOffset) {
         m_docStatus = PDF_DATAAVAIL_LOADALLFILE;
       } else {
         m_dwPrevXRefOffset = xrefpos;
         if (m_dwPrevXRefOffset >= m_dwFileLen) {
           m_docStatus = PDF_DATAAVAIL_LOADALLFILE;
         } else {
           SetStartOffset(m_dwPrevXRefOffset);
@@ skipping 28 matching lines @@
         m_bPagesTreeLoad = TRUE;
         m_bPagesLoad = TRUE;
         m_bCurPageDictLoadOK = TRUE;
         m_docStatus = PDF_DATAAVAIL_PAGE;
         return TRUE;
     }
   }
 }
 
 FX_BOOL CPDF_DataAvail::CheckArrayPageNode(
-    FX_DWORD dwPageNo,
+    uint32_t dwPageNo,
     CPDF_DataAvail::PageNode* pPageNode,
     IPDF_DataAvail::DownloadHints* pHints) {
   FX_BOOL bExist = FALSE;
   CPDF_Object* pPages = GetObject(dwPageNo, pHints, &bExist);
   if (!bExist) {
     m_docStatus = PDF_DATAAVAIL_ERROR;
     return FALSE;
   }
 
   if (!pPages) {
     if (m_docStatus == PDF_DATAAVAIL_ERROR) {
       m_docStatus = PDF_DATAAVAIL_ERROR;
       return FALSE;
     }
     return FALSE;
   }
 
   CPDF_Array* pArray = pPages->AsArray();
   if (!pArray) {
     pPages->Release();
     m_docStatus = PDF_DATAAVAIL_ERROR;
     return FALSE;
   }
 
   pPageNode->m_type = PDF_PAGENODE_PAGES;
-  for (FX_DWORD i = 0; i < pArray->GetCount(); ++i) {
+  for (uint32_t i = 0; i < pArray->GetCount(); ++i) {
     CPDF_Reference* pKid = ToReference(pArray->GetElement(i));
     if (!pKid)
       continue;
 
     PageNode* pNode = new PageNode();
     pPageNode->m_childNode.Add(pNode);
     pNode->m_dwPageNo = pKid->GetRefObjNum();
   }
   pPages->Release();
   return TRUE;
 }
 
 FX_BOOL CPDF_DataAvail::CheckUnkownPageNode(
-    FX_DWORD dwPageNo,
+    uint32_t dwPageNo,
     CPDF_DataAvail::PageNode* pPageNode,
     IPDF_DataAvail::DownloadHints* pHints) {
   FX_BOOL bExist = FALSE;
   CPDF_Object* pPage = GetObject(dwPageNo, pHints, &bExist);
   if (!bExist) {
     m_docStatus = PDF_DATAAVAIL_ERROR;
     return FALSE;
   }
 
   if (!pPage) {
@@ skipping 28 matching lines @@
 
     switch (pKids->GetType()) {
       case CPDF_Object::REFERENCE: {
         CPDF_Reference* pKid = pKids->AsReference();
         PageNode* pNode = new PageNode();
         pPageNode->m_childNode.Add(pNode);
         pNode->m_dwPageNo = pKid->GetRefObjNum();
       } break;
       case CPDF_Object::ARRAY: {
         CPDF_Array* pKidsArray = pKids->AsArray();
-        for (FX_DWORD i = 0; i < pKidsArray->GetCount(); ++i) {
+        for (uint32_t i = 0; i < pKidsArray->GetCount(); ++i) {
           CPDF_Reference* pKid = ToReference(pKidsArray->GetElement(i));
           if (!pKid)
             continue;
 
           PageNode* pNode = new PageNode();
           pPageNode->m_childNode.Add(pNode);
           pNode->m_dwPageNo = pKid->GetRefObjNum();
         }
       } break;
       default:
@@ skipping 254 matching lines @@
     m_bAnnotsLoad = FALSE;
     m_bNeedDownLoadResource = FALSE;
     m_objs_array.RemoveAll();
     m_ObjectSet.clear();
   }
 
   if (pdfium::ContainsKey(m_pagesLoadState, iPage))
     return DataAvailable;
 
   if (m_bLinearized) {
-    if ((FX_DWORD)iPage == m_dwFirstPageNo) {
+    if ((uint32_t)iPage == m_dwFirstPageNo) {
       DocAvailStatus nRet = CheckLinearizedFirstPage(iPage, pHints);
       if (nRet == DataAvailable)
         m_pagesLoadState.insert(iPage);
       return nRet;
     }
 
     DocAvailStatus nResult = CheckLinearizedData(pHints);
     if (nResult != DataAvailable)
       return nResult;
 
@@ skipping 109 matching lines @@
 
   CFX_ArrayTemplate<CPDF_Object*> new_objs_array;
   FX_BOOL bRet = IsObjectsAvail(m_objs_array, FALSE, pHints, new_objs_array);
   m_objs_array.RemoveAll();
   if (!bRet)
     m_objs_array.Append(new_objs_array);
   return bRet;
 }
 
 void CPDF_DataAvail::GetLinearizedMainXRefInfo(FX_FILESIZE* pPos,
-                                               FX_DWORD* pSize) {
+                                               uint32_t* pSize) {
   if (pPos)
     *pPos = m_dwLastXRefOffset;
   if (pSize)
-    *pSize = (FX_DWORD)(m_dwFileLen - m_dwLastXRefOffset);
+    *pSize = (uint32_t)(m_dwFileLen - m_dwLastXRefOffset);
 }
 
 int CPDF_DataAvail::GetPageCount() const {
   if (m_pLinearized) {
     CPDF_Dictionary* pDict = m_pLinearized->GetDict();
     CPDF_Object* pObj = pDict ? pDict->GetElementValue("N") : nullptr;
     return pObj ? pObj->GetInteger() : 0;
   }
   return m_pDocument ? m_pDocument->GetPageCount() : 0;
 }
 
 CPDF_Dictionary* CPDF_DataAvail::GetPage(int index) {
   if (!m_pDocument || index < 0 || index >= GetPageCount())
     return nullptr;
 
   if (m_pLinearized) {
     CPDF_Dictionary* pDict = m_pLinearized->GetDict();
     CPDF_Object* pObj = pDict ? pDict->GetElementValue("P") : nullptr;
 
     int pageNum = pObj ? pObj->GetInteger() : 0;
     if (m_pHintTables && index != pageNum) {
       FX_FILESIZE szPageStartPos = 0;
       FX_FILESIZE szPageLength = 0;
-      FX_DWORD dwObjNum = 0;
+      uint32_t dwObjNum = 0;
       FX_BOOL bPagePosGot = m_pHintTables->GetPagePos(index, szPageStartPos,
                                                       szPageLength, dwObjNum);
       if (!bPagePosGot)
         return nullptr;
 
-      m_syntaxParser.InitParser(m_pFileRead, (FX_DWORD)szPageStartPos);
+      m_syntaxParser.InitParser(m_pFileRead, (uint32_t)szPageStartPos);
       CPDF_Object* pPageDict = ParseIndirectObjectAt(0, dwObjNum, m_pDocument);
       if (!pPageDict)
         return nullptr;
 
       if (!m_pDocument->InsertIndirectObject(dwObjNum, pPageDict))
         return nullptr;
       return pPageDict->GetDict();
     }
   }
   return m_pDocument->GetPage(index);
@@ skipping 34 matching lines @@
   return FormAvailable;
 }
 
 CPDF_DataAvail::PageNode::PageNode() : m_type(PDF_PAGENODE_UNKNOWN) {}
 
 CPDF_DataAvail::PageNode::~PageNode() {
   for (int32_t i = 0; i < m_childNode.GetSize(); ++i)
     delete m_childNode[i];
   m_childNode.RemoveAll();
 }