Remove FX_DWORD from XFA.

xfa/fxfa/app/xfa_fontmgr.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 "xfa/fxfa/app/xfa_fontmgr.h"
 
 #include <algorithm>
 
@@ skipping 1680 matching lines @@
     {0xfef135f8, L"AdobeHeitiStd-Regular", L"Droid Sans Fallback", 0, 936},
 };
 #endif
 void XFA_LocalFontNameToEnglishName(const CFX_WideStringC& wsLocalName,
                                     CFX_WideString& wsEnglishName) {
   wsEnglishName = wsLocalName;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ || \
     _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ ||   \
     _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ ||   \
     _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
-  FX_DWORD dwLocalNameHash = FX_HashCode_String_GetW(
+  uint32_t dwLocalNameHash = FX_HashCode_String_GetW(
       wsLocalName.GetPtr(), wsLocalName.GetLength(), TRUE);
   int32_t iStart = 0;
   int32_t iEnd = sizeof(g_XFAFontsMap) / sizeof(XFA_FONTINFO) - 1;
   int32_t iMid = 0;
   do {
     iMid = (iStart + iEnd) / 2;
-    FX_DWORD dwFontNameHash = g_XFAFontsMap[iMid].dwFontNameHash;
+    uint32_t dwFontNameHash = g_XFAFontsMap[iMid].dwFontNameHash;
     if (dwFontNameHash == dwLocalNameHash) {
       wsEnglishName = g_XFAFontsMap[iMid].pPsName;
       break;
     } else if (dwFontNameHash < dwLocalNameHash) {
       iStart = iMid + 1;
     } else {
       iEnd = iMid - 1;
     }
   } while (iEnd >= iStart);
 #endif
 }
 const XFA_FONTINFO* XFA_GetFontINFOByFontName(
     const CFX_WideStringC& wsFontName) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ || \
     _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ ||   \
     _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ ||   \
     _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
   CFX_WideString wsFontNameTemp = wsFontName;
   wsFontNameTemp.Remove(L' ');
-  FX_DWORD dwCurFontNameHash =
+  uint32_t dwCurFontNameHash =
       FX_HashCode_String_GetW(wsFontNameTemp, wsFontNameTemp.GetLength(), TRUE);
   int32_t iStart = 0;
   int32_t iEnd = sizeof(g_XFAFontsMap) / sizeof(XFA_FONTINFO) - 1;
   int32_t iMid = 0;
   const XFA_FONTINFO* pFontInfo = NULL;
   do {
     iMid = (iStart + iEnd) / 2;
-    FX_DWORD dwFontNameHash = g_XFAFontsMap[iMid].dwFontNameHash;
+    uint32_t dwFontNameHash = g_XFAFontsMap[iMid].dwFontNameHash;
     if (dwFontNameHash == dwCurFontNameHash) {
       pFontInfo = &g_XFAFontsMap[iMid];
       break;
     } else if (dwFontNameHash < dwCurFontNameHash) {
       iStart = iMid + 1;
     } else {
       iEnd = iMid - 1;
     }
   } while (iEnd >= iStart);
   return pFontInfo;
@@ skipping 10 matching lines @@
 CXFA_DefFontMgr::~CXFA_DefFontMgr() {
   int32_t iCounts = m_CacheFonts.GetSize();
   for (int32_t i = 0; i < iCounts; i++) {
     ((IFX_Font*)m_CacheFonts[i])->Release();
   }
   m_CacheFonts.RemoveAll();
 }
 
 IFX_Font* CXFA_DefFontMgr::GetFont(IXFA_Doc* hDoc,
                                    const CFX_WideStringC& wsFontFamily,
-                                   FX_DWORD dwFontStyles,
+                                   uint32_t dwFontStyles,
                                    uint16_t wCodePage) {
   CFX_WideString wsFontName = wsFontFamily;
   IFX_FontMgr* pFDEFontMgr =
       static_cast<CXFA_FFDoc*>(hDoc)->GetApp()->GetFDEFontMgr();
   IFX_Font* pFont = pFDEFontMgr->LoadFont(wsFontName, dwFontStyles, wCodePage);
   if (!pFont) {
     const XFA_FONTINFO* pCurFont = XFA_GetFontINFOByFontName(wsFontName);
     if (pCurFont && pCurFont->pReplaceFont) {
-      FX_DWORD dwStyle = 0;
+      uint32_t dwStyle = 0;
       if (dwFontStyles & FX_FONTSTYLE_Bold) {
         dwStyle |= FX_FONTSTYLE_Bold;
       }
       if (dwFontStyles & FX_FONTSTYLE_Italic) {
         dwStyle |= FX_FONTSTYLE_Italic;
       }
       const FX_WCHAR* pReplace = pCurFont->pReplaceFont;
       int32_t iLength = FXSYS_wcslen(pReplace);
       while (iLength > 0) {
         const FX_WCHAR* pNameText = pReplace;
@@ skipping 14 matching lines @@
     }
   }
   if (pFont) {
     m_CacheFonts.Add(pFont);
   }
   return pFont;
 }
 
 IFX_Font* CXFA_DefFontMgr::GetDefaultFont(IXFA_Doc* hDoc,
                                           const CFX_WideStringC& wsFontFamily,
-                                          FX_DWORD dwFontStyles,
+                                          uint32_t dwFontStyles,
                                           uint16_t wCodePage) {
   IFX_FontMgr* pFDEFontMgr = ((CXFA_FFDoc*)hDoc)->GetApp()->GetFDEFontMgr();
   IFX_Font* pFont =
       pFDEFontMgr->LoadFont(L"Arial Narrow", dwFontStyles, wCodePage);
   if (!pFont)
     pFont =
         pFDEFontMgr->LoadFont((const FX_WCHAR*)NULL, dwFontStyles, wCodePage);
   FXSYS_assert(pFont);
   if (pFont) {
     m_CacheFonts.Add(pFont);
@@ skipping 62 matching lines @@
     }
     if (!pPDFFont->IsEmbedded()) {
       *pDstPDFFont = pPDFFont;
       return NULL;
     }
     return IFX_Font::LoadFont(&pPDFFont->m_Font, pFDEFontMgr);
   }
   return NULL;
 }
 IFX_Font* CXFA_PDFFontMgr::GetFont(const CFX_WideStringC& wsFontFamily,
-                                   FX_DWORD dwFontStyles,
+                                   uint32_t dwFontStyles,
                                    CPDF_Font** pPDFFont,
                                    FX_BOOL bStrictMatch) {
-  FX_DWORD dwHashCode =
+  uint32_t dwHashCode =
       FX_HashCode_String_GetW(wsFontFamily.GetPtr(), wsFontFamily.GetLength());
   CFX_ByteString strKey;
   strKey.Format("%u%u", dwHashCode, dwFontStyles);
   auto it = m_FontMap.find(strKey);
   if (it != m_FontMap.end())
     return it->second;
   CFX_ByteString bsPsName = CFX_ByteString::FromUnicode(wsFontFamily);
   FX_BOOL bBold = (dwFontStyles & FX_FONTSTYLE_Bold) == FX_FONTSTYLE_Bold;
   FX_BOOL bItalic = (dwFontStyles & FX_FONTSTYLE_Italic) == FX_FONTSTYLE_Italic;
   CFX_ByteString strFontName = PsNameToFontName(bsPsName, bBold, bItalic);
@@ skipping 105 matching lines @@
   wUnicode = (FX_WCHAR)pPDFFont->CharCodeFromUnicode(wUnicode);
   iWidth = pPDFFont->GetCharWidthF(wUnicode);
   return TRUE;
 }
 CXFA_FontMgr::CXFA_FontMgr() : m_pDefFontMgr(NULL) {}
 CXFA_FontMgr::~CXFA_FontMgr() {
   DelAllMgrMap();
 }
 IFX_Font* CXFA_FontMgr::GetFont(IXFA_Doc* hDoc,
                                 const CFX_WideStringC& wsFontFamily,
-                                FX_DWORD dwFontStyles,
+                                uint32_t dwFontStyles,
                                 uint16_t wCodePage) {
-  FX_DWORD dwHash = FX_HashCode_String_GetW(wsFontFamily.GetPtr(),
+  uint32_t dwHash = FX_HashCode_String_GetW(wsFontFamily.GetPtr(),
                                             wsFontFamily.GetLength(), FALSE);
   CFX_ByteString bsKey;
   bsKey.Format("%u%u%u", dwHash, dwFontStyles, wCodePage);
   auto it = m_FontMap.find(bsKey);
   if (it != m_FontMap.end())
     return it->second;
   CFX_WideString wsEnglishName;
   XFA_LocalFontNameToEnglishName(wsFontFamily, wsEnglishName);
   CXFA_PDFFontMgr* pMgr = (CXFA_PDFFontMgr*)m_PDFFontMgrArray.GetValueAt(hDoc);
   CPDF_Font* pPDFFont = NULL;
@@ skipping 44 matching lines @@
     CXFA_PDFFontMgr* pMgr = NULL;
     m_PDFFontMgrArray.GetNextAssoc(ps, (void*&)hDoc, (void*&)pMgr);
     delete pMgr;
   }
   m_PDFFontMgrArray.RemoveAll();
   m_FontMap.clear();
 }
 void CXFA_FontMgr::SetDefFontMgr(IXFA_FontMgr* pFontMgr) {
   m_pDefFontMgr = pFontMgr;
 }