Remove FX_DWORD from XFA, part 2

xfa/fgas/font/fgas_stdfontmgr.h

 // 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
 
 #ifndef XFA_FGAS_FONT_FGAS_STDFONTMGR_H_
 #define XFA_FGAS_FONT_FGAS_STDFONTMGR_H_
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
 #include "third_party/freetype/include/freetype/fttypes.h"
 #include "xfa/fgas/font/fgas_font.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-int32_t FX_GetSimilarValue(FX_LPCFONTDESCRIPTOR pFont, FX_DWORD dwFontStyles);
+int32_t FX_GetSimilarValue(FX_LPCFONTDESCRIPTOR pFont, uint32_t dwFontStyles);
 FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams,
                                        const CFX_FontDescriptors& fonts,
                                        void* pUserData);
 
 class CFX_StdFontMgrImp : public IFX_FontMgr {
  public:
   CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator,
                     FX_LPMatchFont pMatcher,
                     void* pUserData);
   ~CFX_StdFontMgrImp();
   virtual void Release() { delete this; }
   virtual IFX_Font* GetDefFontByCodePage(uint16_t wCodePage,
-                                         FX_DWORD dwFontStyles,
+                                         uint32_t dwFontStyles,
                                          const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset,
-                                        FX_DWORD dwFontStyles,
+                                        uint32_t dwFontStyles,
                                         const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode,
-                                        FX_DWORD dwFontStyles,
+                                        uint32_t dwFontStyles,
                                         const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetDefFontByLanguage(uint16_t wLanguage,
-                                         FX_DWORD dwFontStyles,
+                                         uint32_t dwFontStyles,
                                          const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* LoadFont(const FX_WCHAR* pszFontFamily,
-                             FX_DWORD dwFontStyles,
+                             uint32_t dwFontStyles,
                              uint16_t wCodePage = 0xFFFF);
   virtual IFX_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength);
   virtual IFX_Font* LoadFont(const FX_WCHAR* pszFileName);
   virtual IFX_Font* LoadFont(IFX_Stream* pFontStream,
                              const FX_WCHAR* pszFontAlias = NULL,
-                             FX_DWORD dwFontStyles = 0,
+                             uint32_t dwFontStyles = 0,
                              uint16_t wCodePage = 0,
                              FX_BOOL bSaveStream = FALSE);
   virtual IFX_Font* LoadFont(IFX_Font* pSrcFont,
-                             FX_DWORD dwFontStyles,
+                             uint32_t dwFontStyles,
                              uint16_t wCodePage = 0xFFFF);
   virtual void ClearFontCache();
   virtual void RemoveFont(IFX_Font* pFont);
 
  protected:
   FX_LPMatchFont m_pMatcher;
   FX_LPEnumAllFonts m_pEnumerator;
   CFX_FontDescriptors m_FontFaces;
   CFX_PtrArray m_Fonts;
   CFX_MapPtrToPtr m_CPFonts;
   CFX_MapPtrToPtr m_FamilyFonts;
   CFX_MapPtrToPtr m_UnicodeFonts;
   CFX_MapPtrToPtr m_BufferFonts;
   CFX_MapPtrToPtr m_FileFonts;
   CFX_MapPtrToPtr m_StreamFonts;
   CFX_MapPtrToPtr m_DeriveFonts;
   void* m_pUserData;
   void RemoveFont(CFX_MapPtrToPtr& fontMap, IFX_Font* pFont);
   FX_LPCFONTDESCRIPTOR FindFont(const FX_WCHAR* pszFontFamily,
-                                FX_DWORD dwFontStyles,
-                                FX_DWORD dwMatchFlags,
+                                uint32_t dwFontStyles,
+                                uint32_t dwMatchFlags,
                                 uint16_t wCodePage,
-                                FX_DWORD dwUSB = 999,
+                                uint32_t dwUSB = 999,
                                 FX_WCHAR wUnicode = 0);
-  IFX_Font* GetFont(FX_LPCFONTDESCRIPTOR pFD, FX_DWORD dwFontStyles);
+  IFX_Font* GetFont(FX_LPCFONTDESCRIPTOR pFD, uint32_t dwFontStyles);
 };
-FX_DWORD FX_GetGdiFontStyles(const LOGFONTW& lf);
+uint32_t FX_GetGdiFontStyles(const LOGFONTW& lf);
 
 #else
 
 class CFX_FontDescriptor {
  public:
   CFX_FontDescriptor()
       : m_pFileAccess(NULL), m_nFaceIndex(0), m_dwFontStyles(0) {
     m_dwUsb[0] = m_dwUsb[1] = m_dwUsb[2] = m_dwUsb[3] = 0;
     m_dwCsb[0] = m_dwCsb[1] = 0;
   }
   ~CFX_FontDescriptor() {
     if (NULL != m_pFileAccess) {
       m_pFileAccess->Release();
     }
   }
   IFX_FileAccess* m_pFileAccess;
   int32_t m_nFaceIndex;
   CFX_WideString m_wsFaceName;
   CFX_WideStringArray m_wsFamilyNames;
-  FX_DWORD m_dwFontStyles;
-  FX_DWORD m_dwUsb[4];
-  FX_DWORD m_dwCsb[2];
+  uint32_t m_dwFontStyles;
+  uint32_t m_dwUsb[4];
+  uint32_t m_dwCsb[2];
 };
 typedef CFX_ArrayTemplate<CFX_FontDescriptor*> CFX_FontDescriptors;
 
 struct FX_FontDescriptorInfo {
  public:
   CFX_FontDescriptor* pFont;
   int32_t nPenalty;
 
   bool operator>(const FX_FontDescriptorInfo& other) const {
     return nPenalty > other.nPenalty;
@@ skipping 23 matching lines @@
   virtual void Release() { delete this; }
   virtual FX_POSITION GetStartPosition(void* pUserData = NULL);
   virtual IFX_FileAccess* GetNext(FX_POSITION& pos, void* pUserData = NULL);
 
  private:
   CFX_ByteString GetNextFile();
   CFX_WideString m_wsNext;
   CFX_ObjectArray<FX_HandleParentPath> m_FolderQueue;
   CFX_ByteStringArray m_FolderPaths;
 };
-typedef CFX_MapPtrTemplate<FX_DWORD, IFX_FileAccess*> CFX_HashFileMap;
-typedef CFX_MapPtrTemplate<FX_DWORD, IFX_Font*> CFX_HashFontMap;
-typedef CFX_MapPtrTemplate<FX_DWORD, CFX_FontDescriptorInfos*>
+typedef CFX_MapPtrTemplate<uint32_t, IFX_FileAccess*> CFX_HashFileMap;
+typedef CFX_MapPtrTemplate<uint32_t, IFX_Font*> CFX_HashFontMap;
+typedef CFX_MapPtrTemplate<uint32_t, CFX_FontDescriptorInfos*>
     CFX_HashFontDescsMap;
-typedef CFX_MapPtrTemplate<FX_DWORD, CFX_ArrayTemplate<IFX_Font*>*>
+typedef CFX_MapPtrTemplate<uint32_t, CFX_ArrayTemplate<IFX_Font*>*>
     CFX_HashFontsMap;
 typedef CFX_MapPtrTemplate<FX_WCHAR, IFX_Font*> CFX_UnicodeFontMap;
 typedef CFX_MapPtrTemplate<IFX_FileAccess*, CFX_ArrayTemplate<IFX_Font*>*>
     CFX_FileFontMap;
 typedef CFX_MapPtrTemplate<IFX_Font*, IFX_FileRead*> CFX_FonStreamtMap;
 
 class CFX_FontMgrImp : public IFX_FontMgr {
  public:
   CFX_FontMgrImp(IFX_FontSourceEnum* pFontEnum,
                  IFX_FontMgrDelegate* pDelegate = NULL,
                  void* pUserData = NULL);
   virtual void Release();
   virtual IFX_Font* GetDefFontByCodePage(uint16_t wCodePage,
-                                         FX_DWORD dwFontStyles,
+                                         uint32_t dwFontStyles,
                                          const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetDefFontByCharset(uint8_t nCharset,
-                                        FX_DWORD dwFontStyles,
+                                        uint32_t dwFontStyles,
                                         const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetDefFontByUnicode(FX_WCHAR wUnicode,
-                                        FX_DWORD dwFontStyles,
+                                        uint32_t dwFontStyles,
                                         const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetDefFontByLanguage(uint16_t wLanguage,
-                                         FX_DWORD dwFontStyles,
+                                         uint32_t dwFontStyles,
                                          const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetFontByCodePage(uint16_t wCodePage,
-                                      FX_DWORD dwFontStyles,
+                                      uint32_t dwFontStyles,
                                       const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetFontByCharset(uint8_t nCharset,
-                                     FX_DWORD dwFontStyles,
+                                     uint32_t dwFontStyles,
                                      const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetFontByUnicode(FX_WCHAR wUnicode,
-                                     FX_DWORD dwFontStyles,
+                                     uint32_t dwFontStyles,
                                      const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* GetFontByLanguage(uint16_t wLanguage,
-                                      FX_DWORD dwFontStyles,
+                                      uint32_t dwFontStyles,
                                       const FX_WCHAR* pszFontFamily = NULL);
   virtual IFX_Font* LoadFont(const uint8_t* pBuffer,
                              int32_t iLength,
                              int32_t iFaceIndex,
                              int32_t* pFaceCount);
   virtual IFX_Font* LoadFont(const FX_WCHAR* pszFileName,
                              int32_t iFaceIndex,
                              int32_t* pFaceCount);
   virtual IFX_Font* LoadFont(IFX_Stream* pFontStream,
                              int32_t iFaceIndex,
@@ skipping 10 matching lines @@
 
  protected:
   void RegisterFace(FXFT_Face pFace,
                     CFX_FontDescriptors& Fonts,
                     const CFX_WideString* pFaceName,
                     IFX_FileAccess* pFontAccess);
   void RegisterFaces(IFX_FileRead* pFontStream,
                      const CFX_WideString* pFaceName);
   void GetNames(const uint8_t* name_table, CFX_WideStringArray& Names);
   void GetCharsets(FXFT_Face pFace, CFX_ArrayTemplate<uint16_t>& Charsets);
-  void GetUSBCSB(FXFT_Face pFace, FX_DWORD* USB, FX_DWORD* CSB);
-  FX_DWORD GetFlags(FXFT_Face pFace);
+  void GetUSBCSB(FXFT_Face pFace, uint32_t* USB, uint32_t* CSB);
+  uint32_t GetFlags(FXFT_Face pFace);
   CFX_FontDescriptors m_InstalledFonts;
   FX_BOOL VerifyUnicode(CFX_FontDescriptor* pDesc, FX_WCHAR wcUnicode);
   FX_BOOL VerifyUnicode(IFX_Font* pFont, FX_WCHAR wcUnicode);
   int32_t IsPartName(const CFX_WideString& Name1, const CFX_WideString& Name2);
   int32_t MatchFonts(CFX_FontDescriptorInfos& MatchedFonts,
                      uint16_t wCodePage,
-                     FX_DWORD dwFontStyles,
+                     uint32_t dwFontStyles,
                      const CFX_WideString& FontName,
                      FX_WCHAR wcUnicode = 0xFFFE);
   int32_t CalcPenalty(CFX_FontDescriptor* pInstalled,
                       uint16_t wCodePage,
-                      FX_DWORD dwFontStyles,
+                      uint32_t dwFontStyles,
                       const CFX_WideString& FontName,
                       FX_WCHAR wcUnicode = 0xFFFE);
   IFX_Font* LoadFont(IFX_FileAccess* pFontAccess,
                      int32_t iFaceIndex,
                      int32_t* pFaceCount,
                      FX_BOOL bWantCache = FALSE);
   FXFT_Face LoadFace(IFX_FileRead* pFontStream, int32_t iFaceIndex);
   IFX_FileRead* CreateFontStream(CFX_FontMapper* pFontMapper,
                                  IFX_SystemFontInfo* pSystemFontInfo,
-                                 FX_DWORD index);
+                                 uint32_t index);
   IFX_FileRead* CreateFontStream(const CFX_ByteString& bsFaceName);
   CFX_HashFontDescsMap m_Hash2CandidateList;
   CFX_HashFontsMap m_Hash2Fonts;
   CFX_HashFileMap m_Hash2FileAccess;
   CFX_HashFontMap m_FileAccess2IFXFont;
   CFX_FonStreamtMap m_IFXFont2FileRead;
   CFX_UnicodeFontMap m_FailedUnicodes2NULL;
   IFX_FontSourceEnum* m_pFontSource;
   IFX_FontMgrDelegate* m_pDelegate;
   void* m_pUserData;
 };
 #endif
 
 #endif  // XFA_FGAS_FONT_FGAS_STDFONTMGR_H_