From deee3d2ee201d62e7ef41e7d8378d7f52e057a9c Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 25 Mar 2016 14:38:58 -0700 Subject: Remove FX_DWORD from XFA, part 2 Some headers were missed in the previous CL. Review URL: https://codereview.chromium.org/1835703002 --- xfa/fgas/crt/fgas_stream.h | 14 ++++---- xfa/fgas/crt/fgas_utils.h | 8 ++--- xfa/fgas/font/fgas_font.h | 60 +++++++++++++++---------------- xfa/fgas/font/fgas_fontutils.h | 6 ++-- xfa/fgas/font/fgas_gefont.h | 12 +++---- xfa/fgas/font/fgas_stdfontmgr.h | 66 +++++++++++++++++----------------- xfa/fgas/layout/fgas_rtfbreak.h | 18 +++++----- xfa/fgas/layout/fgas_textbreak.h | 22 ++++++------ xfa/fgas/localization/fgas_localeimp.h | 2 +- xfa/fgas/xml/fgas_sax.h | 16 ++++----- xfa/fgas/xml/fgas_sax_imp.h | 28 +++++++-------- 11 files changed, 126 insertions(+), 126 deletions(-) (limited to 'xfa/fgas') diff --git a/xfa/fgas/crt/fgas_stream.h b/xfa/fgas/crt/fgas_stream.h index fd977c4a1b..3d644cf8b4 100644 --- a/xfa/fgas/crt/fgas_stream.h +++ b/xfa/fgas/crt/fgas_stream.h @@ -37,15 +37,15 @@ enum FX_STREAMSEEK { class IFX_Stream { public: - static IFX_Stream* CreateStream(IFX_FileRead* pFileRead, FX_DWORD dwAccess); - static IFX_Stream* CreateStream(IFX_FileWrite* pFileWrite, FX_DWORD dwAccess); + static IFX_Stream* CreateStream(IFX_FileRead* pFileRead, uint32_t dwAccess); + static IFX_Stream* CreateStream(IFX_FileWrite* pFileWrite, uint32_t dwAccess); static IFX_Stream* CreateStream(const FX_WCHAR* pszFileName, - FX_DWORD dwAccess); + uint32_t dwAccess); static IFX_Stream* CreateStream(uint8_t* pData, int32_t length, - FX_DWORD dwAccess); + uint32_t dwAccess); static IFX_Stream* CreateStream(IFX_BufferRead* pBufferRead, - FX_DWORD dwAccess, + uint32_t dwAccess, int32_t iFileSize = -1, FX_BOOL bReleaseBufferRead = TRUE); static IFX_Stream* CreateTextStream(IFX_Stream* pBaseStream, @@ -53,7 +53,7 @@ class IFX_Stream { virtual ~IFX_Stream() {} virtual void Release() = 0; virtual IFX_Stream* Retain() = 0; - virtual FX_DWORD GetAccessModes() const = 0; + virtual uint32_t GetAccessModes() const = 0; virtual int32_t GetLength() const = 0; virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) = 0; virtual int32_t GetPosition() = 0; @@ -70,7 +70,7 @@ class IFX_Stream { virtual int32_t GetBOM(uint8_t bom[4]) const = 0; virtual uint16_t GetCodePage() const = 0; virtual uint16_t SetCodePage(uint16_t wCodePage) = 0; - virtual IFX_Stream* CreateSharedStream(FX_DWORD dwAccess, + virtual IFX_Stream* CreateSharedStream(uint32_t dwAccess, int32_t iOffset, int32_t iLength) = 0; }; diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h index cb133b0c33..5ebb32ff37 100644 --- a/xfa/fgas/crt/fgas_utils.h +++ b/xfa/fgas/crt/fgas_utils.h @@ -84,7 +84,7 @@ class CFX_BaseArrayTemplate : public CFX_BaseArray { } }; typedef CFX_BaseArrayTemplate CFDE_PtrArray; -typedef CFX_BaseArrayTemplate CFDE_DWordArray; +typedef CFX_BaseArrayTemplate CFDE_DWordArray; typedef CFX_BaseArrayTemplate CFDE_WordArray; template @@ -281,7 +281,7 @@ class CFX_MassArrayTemplate : public CFX_BaseMassArray { }; typedef CFX_MassArrayTemplate CFX_PtrMassArray; typedef CFX_MassArrayTemplate CFX_Int32MassArray; -typedef CFX_MassArrayTemplate CFX_DWordMassArray; +typedef CFX_MassArrayTemplate CFX_DWordMassArray; typedef CFX_MassArrayTemplate CFX_WordMassArray; typedef CFX_MassArrayTemplate CFX_RectMassArray; typedef CFX_MassArrayTemplate CFX_RectFMassArray; @@ -396,7 +396,7 @@ class CFX_DiscreteArrayTemplate : public CFX_BaseDiscreteArray { void RemoveAll() { CFX_BaseDiscreteArray::RemoveAll(); } }; typedef CFX_DiscreteArrayTemplate CFX_PtrDiscreteArray; -typedef CFX_DiscreteArrayTemplate CFX_DWordDiscreteArray; +typedef CFX_DiscreteArrayTemplate CFX_DWordDiscreteArray; typedef CFX_DiscreteArrayTemplate CFX_WordDiscreteArray; class CFX_BaseStack : public CFX_Target { @@ -435,7 +435,7 @@ class CFX_StackTemplate : public CFX_BaseStack { } }; typedef CFX_StackTemplate CFX_PtrStack; -typedef CFX_StackTemplate CFX_DWordStack; +typedef CFX_StackTemplate CFX_DWordStack; typedef CFX_StackTemplate CFX_WordStack; typedef CFX_StackTemplate CFX_Int32Stack; diff --git a/xfa/fgas/font/fgas_font.h b/xfa/fgas/font/fgas_font.h index b13602cee6..8b1091ff50 100644 --- a/xfa/fgas/font/fgas_font.h +++ b/xfa/fgas/font/fgas_font.h @@ -60,7 +60,7 @@ class IFX_FontProvider { class IFX_Font { public: static IFX_Font* LoadFont(const FX_WCHAR* pszFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage, IFX_FontMgr* pFontMgr); static IFX_Font* LoadFont(const uint8_t* pBuffer, @@ -76,10 +76,10 @@ class IFX_Font { virtual ~IFX_Font() {} virtual void Release() = 0; virtual IFX_Font* Retain() = 0; - virtual IFX_Font* Derive(FX_DWORD dwFontStyles, uint16_t wCodePage = 0) = 0; + virtual IFX_Font* Derive(uint32_t dwFontStyles, uint16_t wCodePage = 0) = 0; virtual void GetFamilyName(CFX_WideString& wsFamily) const = 0; virtual void GetPsName(CFX_WideString& wsName) const = 0; - virtual FX_DWORD GetFontStyles() const = 0; + virtual uint32_t GetFontStyles() const = 0; virtual uint8_t GetCharSet() const = 0; virtual FX_BOOL GetCharWidth(FX_WCHAR wUnicode, int32_t& iWidth, @@ -98,15 +98,15 @@ class IFX_Font { virtual void* GetDevFont() const = 0; virtual void SetFontProvider(IFX_FontProvider* pProvider) = 0; #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ - virtual void SetLogicalFontStyle(FX_DWORD dwLogFontStyle) = 0; + virtual void SetLogicalFontStyle(uint32_t dwLogFontStyle) = 0; #endif }; #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ struct FX_FONTMATCHPARAMS { const FX_WCHAR* pwsFamily; - FX_DWORD dwFontStyles; - FX_DWORD dwUSB; - FX_DWORD dwMatchFlags; + uint32_t dwFontStyles; + uint32_t dwUSB; + uint32_t dwMatchFlags; FX_WCHAR wUnicode; uint16_t wCodePage; }; @@ -114,8 +114,8 @@ typedef FX_FONTMATCHPARAMS* FX_LPFONTMATCHPARAMS; typedef FX_FONTMATCHPARAMS const* FX_LPCFONTMATCHPARAMS; struct FX_FONTSIGNATURE { - FX_DWORD fsUsb[4]; - FX_DWORD fsCsb[2]; + uint32_t fsUsb[4]; + uint32_t fsCsb[2]; }; inline bool operator==(const FX_FONTSIGNATURE& left, const FX_FONTSIGNATURE& right) { @@ -126,7 +126,7 @@ inline bool operator==(const FX_FONTSIGNATURE& left, struct FX_FONTDESCRIPTOR { FX_WCHAR wsFontFace[32]; - FX_DWORD dwFontStyles; + uint32_t dwFontStyles; uint8_t uCharSet; FX_FONTSIGNATURE FontSignature; }; @@ -162,32 +162,32 @@ class IFX_FontMgr { virtual void Release() = 0; virtual IFX_Font* GetDefFontByCodePage( uint16_t wCodePage, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetDefFontByCharset( uint8_t nCharset, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetDefFontByUnicode( FX_WCHAR wUnicode, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetDefFontByLanguage( uint16_t wLanguage, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* LoadFont(const FX_WCHAR* pszFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) = 0; virtual IFX_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength) = 0; virtual IFX_Font* LoadFont(const FX_WCHAR* pszFileName) = 0; 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) = 0; virtual IFX_Font* LoadFont(IFX_Font* pSrcFont, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) = 0; virtual void ClearFontCache() = 0; virtual void RemoveFont(IFX_Font* pFont) = 0; @@ -199,22 +199,22 @@ class IFX_FontMgrDelegate { virtual IFX_Font* GetDefFontByCodePage( IFX_FontMgr* pFontMgr, uint16_t wCodePage, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetDefFontByCharset( IFX_FontMgr* pFontMgr, uint8_t nCharset, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetDefFontByUnicode( IFX_FontMgr* pFontMgr, FX_WCHAR wUnicode, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetDefFontByLanguage( IFX_FontMgr* pFontMgr, uint16_t wLanguage, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; }; class IFX_FontSourceEnum { @@ -234,36 +234,36 @@ class IFX_FontMgr { virtual void Release() = 0; virtual IFX_Font* GetDefFontByCodePage( uint16_t wCodePage, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetDefFontByCharset( uint8_t nCharset, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetDefFontByUnicode( FX_WCHAR wUnicode, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetDefFontByLanguage( uint16_t wLanguage, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetFontByCodePage(uint16_t wCodePage, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; inline IFX_Font* LoadFont(const FX_WCHAR* pszFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage) { return GetFontByCodePage(wCodePage, dwFontStyles, pszFontFamily); } virtual IFX_Font* GetFontByCharset(uint8_t nCharset, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetFontByUnicode(FX_WCHAR wUnicode, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* GetFontByLanguage(uint16_t wLanguage, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, const FX_WCHAR* pszFontFamily = NULL) = 0; virtual IFX_Font* LoadFont(const uint8_t* pBuffer, int32_t iLength, diff --git a/xfa/fgas/font/fgas_fontutils.h b/xfa/fgas/font/fgas_fontutils.h index 764aa6b937..4cb4671238 100644 --- a/xfa/fgas/font/fgas_fontutils.h +++ b/xfa/fgas/font/fgas_fontutils.h @@ -16,9 +16,9 @@ struct FGAS_FONTUSB { uint16_t wCodePage; }; -FX_DWORD FGAS_GetFontHashCode(uint16_t wCodePage, FX_DWORD dwFontStyles); -FX_DWORD FGAS_GetFontFamilyHash(const FX_WCHAR* pszFontFamily, - FX_DWORD dwFontStyles, +uint32_t FGAS_GetFontHashCode(uint16_t wCodePage, uint32_t dwFontStyles); +uint32_t FGAS_GetFontFamilyHash(const FX_WCHAR* pszFontFamily, + uint32_t dwFontStyles, uint16_t wCodePage); const FGAS_FONTUSB* FGAS_GetUnicodeBitField(FX_WCHAR wUnicode); diff --git a/xfa/fgas/font/fgas_gefont.h b/xfa/fgas/font/fgas_gefont.h index 03bc32ce63..044acdeb7f 100644 --- a/xfa/fgas/font/fgas_gefont.h +++ b/xfa/fgas/font/fgas_gefont.h @@ -14,22 +14,22 @@ class CFX_GEFont : public IFX_Font { public: - CFX_GEFont(const CFX_GEFont& src, FX_DWORD dwFontStyles); + CFX_GEFont(const CFX_GEFont& src, uint32_t dwFontStyles); CFX_GEFont(IFX_FontMgr* pFontMgr); ~CFX_GEFont(); virtual void Release(); virtual IFX_Font* Retain(); FX_BOOL LoadFont(const FX_WCHAR* pszFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage); FX_BOOL LoadFont(const uint8_t* pBuffer, int32_t length); FX_BOOL LoadFont(const FX_WCHAR* pszFileName); FX_BOOL LoadFont(IFX_Stream* pFontStream, FX_BOOL bSaveStream); FX_BOOL LoadFont(CFX_Font* pExtFont, FX_BOOL bTakeOver = FALSE); - virtual IFX_Font* Derive(FX_DWORD dwFontStyles, uint16_t wCodePage = 0); + virtual IFX_Font* Derive(uint32_t dwFontStyles, uint16_t wCodePage = 0); virtual void GetFamilyName(CFX_WideString& wsFamily) const; virtual void GetPsName(CFX_WideString& wsName) const; - virtual FX_DWORD GetFontStyles() const; + virtual uint32_t GetFontStyles() const; virtual uint8_t GetCharSet() const; virtual FX_BOOL GetCharWidth(FX_WCHAR wUnicode, int32_t& iWidth, @@ -49,7 +49,7 @@ class CFX_GEFont : public IFX_Font { m_pProvider = pProvider; } #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ - virtual void SetLogicalFontStyle(FX_DWORD dwLogFontStyle) { + virtual void SetLogicalFontStyle(uint32_t dwLogFontStyle) { m_bUseLogFontStyle = TRUE; m_dwLogFontStyle = dwLogFontStyle; } @@ -58,7 +58,7 @@ class CFX_GEFont : public IFX_Font { protected: #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ FX_BOOL m_bUseLogFontStyle; - FX_DWORD m_dwLogFontStyle; + uint32_t m_dwLogFontStyle; #endif CFX_Font* m_pFont; IFX_FontMgr* m_pFontMgr; diff --git a/xfa/fgas/font/fgas_stdfontmgr.h b/xfa/fgas/font/fgas_stdfontmgr.h index 574eefad23..433f2df276 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.h +++ b/xfa/fgas/font/fgas_stdfontmgr.h @@ -14,7 +14,7 @@ #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); @@ -27,29 +27,29 @@ class CFX_StdFontMgrImp : public IFX_FontMgr { ~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); @@ -69,14 +69,14 @@ class CFX_StdFontMgrImp : public IFX_FontMgr { 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 @@ -96,9 +96,9 @@ class CFX_FontDescriptor { 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_FontDescriptors; @@ -142,11 +142,11 @@ class CFX_FontSourceEnum_File : public IFX_FontSourceEnum { CFX_ObjectArray m_FolderQueue; CFX_ByteStringArray m_FolderPaths; }; -typedef CFX_MapPtrTemplate CFX_HashFileMap; -typedef CFX_MapPtrTemplate CFX_HashFontMap; -typedef CFX_MapPtrTemplate +typedef CFX_MapPtrTemplate CFX_HashFileMap; +typedef CFX_MapPtrTemplate CFX_HashFontMap; +typedef CFX_MapPtrTemplate CFX_HashFontDescsMap; -typedef CFX_MapPtrTemplate*> +typedef CFX_MapPtrTemplate*> CFX_HashFontsMap; typedef CFX_MapPtrTemplate CFX_UnicodeFontMap; typedef CFX_MapPtrTemplate*> @@ -160,28 +160,28 @@ class CFX_FontMgrImp : public IFX_FontMgr { 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, @@ -212,20 +212,20 @@ class CFX_FontMgrImp : public IFX_FontMgr { const CFX_WideString* pFaceName); void GetNames(const uint8_t* name_table, CFX_WideStringArray& Names); void GetCharsets(FXFT_Face pFace, CFX_ArrayTemplate& 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, @@ -235,7 +235,7 @@ class CFX_FontMgrImp : public IFX_FontMgr { 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; diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/fgas_rtfbreak.h index 8549d0c93c..dd791c24df 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.h +++ b/xfa/fgas/layout/fgas_rtfbreak.h @@ -85,7 +85,7 @@ struct FX_RTFTEXTOBJ { int32_t iLength; IFX_Font* pFont; FX_FLOAT fFontSize; - FX_DWORD dwLayoutStyles; + uint32_t dwLayoutStyles; int32_t iCharRotation; int32_t iBidiLevel; const CFX_RectF* pRect; @@ -172,7 +172,7 @@ class CFX_RTFPiece : public CFX_Target { m_iHorizontalScale = 100; m_iVerticalScale = 100; } - FX_DWORD m_dwStatus; + uint32_t m_dwStatus; int32_t m_iStartPos; int32_t m_iWidth; int32_t m_iStartChar; @@ -183,8 +183,8 @@ class CFX_RTFPiece : public CFX_Target { int32_t m_iFontHeight; int32_t m_iHorizontalScale; int32_t m_iVerticalScale; - FX_DWORD m_dwLayoutStyles; - FX_DWORD m_dwIdentity; + uint32_t m_dwLayoutStyles; + uint32_t m_dwIdentity; CFX_RTFCharArray* m_pChars; IFX_Unknown* m_pUserData; }; @@ -192,13 +192,13 @@ typedef CFX_BaseArrayTemplate CFX_RTFPieceArray; class IFX_RTFBreak { public: - static IFX_RTFBreak* Create(FX_DWORD dwPolicies); + static IFX_RTFBreak* Create(uint32_t dwPolicies); virtual ~IFX_RTFBreak() {} virtual void Release() = 0; virtual void SetLineBoundary(FX_FLOAT fLineStart, FX_FLOAT fLineEnd) = 0; virtual void SetLineStartPos(FX_FLOAT fLinePos) = 0; - virtual FX_DWORD GetLayoutStyles() const = 0; - virtual void SetLayoutStyles(FX_DWORD dwLayoutStyles) = 0; + virtual uint32_t GetLayoutStyles() const = 0; + virtual void SetLayoutStyles(uint32_t dwLayoutStyles) = 0; virtual void SetFont(IFX_Font* pFont) = 0; virtual void SetFontSize(FX_FLOAT fFontSize) = 0; virtual void SetTabWidth(FX_FLOAT fTabWidth) = 0; @@ -216,8 +216,8 @@ class IFX_RTFBreak { virtual void SetReadingOrder(FX_BOOL bRTL = FALSE) = 0; virtual void SetAlignment(int32_t iAlignment = FX_RTFLINEALIGNMENT_Left) = 0; virtual void SetUserData(IFX_Unknown* pUserData) = 0; - virtual FX_DWORD AppendChar(FX_WCHAR wch) = 0; - virtual FX_DWORD EndBreak(FX_DWORD dwStatus = FX_RTFBREAK_PieceBreak) = 0; + virtual uint32_t AppendChar(FX_WCHAR wch) = 0; + virtual uint32_t EndBreak(uint32_t dwStatus = FX_RTFBREAK_PieceBreak) = 0; virtual int32_t CountBreakPieces() const = 0; virtual const CFX_RTFPiece* GetBreakPiece(int32_t index) const = 0; virtual void GetLineRect(CFX_RectF& rect) const = 0; diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h index dd42fdf030..add156e971 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/fgas_textbreak.h @@ -104,11 +104,11 @@ struct FX_TXTRUN { int32_t iLength; IFX_Font* pFont; FX_FLOAT fFontSize; - FX_DWORD dwStyles; + uint32_t dwStyles; int32_t iHorizontalScale; int32_t iVerticalScale; int32_t iCharRotation; - FX_DWORD dwCharStyles; + uint32_t dwCharStyles; const CFX_RectF* pRect; FX_WCHAR wLineBreakChar; FX_BOOL bSkipSpace; @@ -162,7 +162,7 @@ class CFX_TxtPiece : public CFX_Target { *pWidths++ = pChar->m_iCharWidth; } } - FX_DWORD m_dwStatus; + uint32_t m_dwStatus; int32_t m_iStartPos; int32_t m_iWidth; int32_t m_iStartChar; @@ -171,7 +171,7 @@ class CFX_TxtPiece : public CFX_Target { int32_t m_iBidiPos; int32_t m_iHorizontalScale; int32_t m_iVerticalScale; - FX_DWORD m_dwCharStyles; + uint32_t m_dwCharStyles; CFX_TxtCharArray* m_pChars; void* m_pUserData; }; @@ -179,13 +179,13 @@ typedef CFX_BaseArrayTemplate CFX_TxtPieceArray; class IFX_TxtBreak { public: - static IFX_TxtBreak* Create(FX_DWORD dwPolicies); + static IFX_TxtBreak* Create(uint32_t dwPolicies); virtual ~IFX_TxtBreak() {} virtual void Release() = 0; virtual void SetLineWidth(FX_FLOAT fLineWidth) = 0; virtual void SetLinePos(FX_FLOAT fLinePos) = 0; - virtual FX_DWORD GetLayoutStyles() const = 0; - virtual void SetLayoutStyles(FX_DWORD dwLayoutStyles) = 0; + virtual uint32_t GetLayoutStyles() const = 0; + virtual void SetLayoutStyles(uint32_t dwLayoutStyles) = 0; virtual void SetFont(IFX_Font* pFont) = 0; virtual void SetFontSize(FX_FLOAT fFontSize) = 0; virtual void SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant) = 0; @@ -197,12 +197,12 @@ class IFX_TxtBreak { virtual void SetCharRotation(int32_t iCharRotation) = 0; virtual void SetCharSpace(FX_FLOAT fCharSpace) = 0; virtual void SetAlignment(int32_t iAlignment) = 0; - virtual FX_DWORD GetContextCharStyles() const = 0; - virtual void SetContextCharStyles(FX_DWORD dwCharStyles) = 0; + virtual uint32_t GetContextCharStyles() const = 0; + virtual void SetContextCharStyles(uint32_t dwCharStyles) = 0; virtual void SetCombWidth(FX_FLOAT fCombWidth) = 0; virtual void SetUserData(void* pUserData) = 0; - virtual FX_DWORD AppendChar(FX_WCHAR wch) = 0; - virtual FX_DWORD EndBreak(FX_DWORD dwStatus = FX_TXTBREAK_PieceBreak) = 0; + virtual uint32_t AppendChar(FX_WCHAR wch) = 0; + virtual uint32_t EndBreak(uint32_t dwStatus = FX_TXTBREAK_PieceBreak) = 0; virtual int32_t CountBreakChars() const = 0; virtual int32_t CountBreakPieces() const = 0; virtual const CFX_TxtPiece* GetBreakPiece(int32_t index) const = 0; diff --git a/xfa/fgas/localization/fgas_localeimp.h b/xfa/fgas/localization/fgas_localeimp.h index 1eeaa418ca..c45ed950b9 100644 --- a/xfa/fgas/localization/fgas_localeimp.h +++ b/xfa/fgas/localization/fgas_localeimp.h @@ -102,7 +102,7 @@ class CFX_FormatString : public IFX_FormatString { CFX_WideString& wsPurgePattern); IFX_Locale* GetNumericFormat(const CFX_WideString& wsPattern, int32_t& iDotIndex, - FX_DWORD& dwStyle, + uint32_t& dwStyle, CFX_WideString& wsPurgePattern); FX_BOOL FormatStrNum(const CFX_WideStringC& wsInputNum, const CFX_WideString& wsPattern, diff --git a/xfa/fgas/xml/fgas_sax.h b/xfa/fgas/xml/fgas_sax.h index de5d91493d..501c358e0f 100644 --- a/xfa/fgas/xml/fgas_sax.h +++ b/xfa/fgas/xml/fgas_sax.h @@ -32,7 +32,7 @@ class IFX_SAXReaderHandler { virtual ~IFX_SAXReaderHandler() {} virtual void* OnTagEnter(const CFX_ByteStringC& bsTagName, FX_SAXNODE eType, - FX_DWORD dwStartPos) = 0; + uint32_t dwStartPos) = 0; virtual void OnTagAttribute(void* pTag, const CFX_ByteStringC& bsAttri, const CFX_ByteStringC& bsValue) = 0; @@ -40,15 +40,15 @@ class IFX_SAXReaderHandler { virtual void OnTagData(void* pTag, FX_SAXNODE eType, const CFX_ByteStringC& bsData, - FX_DWORD dwStartPos) = 0; - virtual void OnTagClose(void* pTag, FX_DWORD dwEndPos) = 0; + uint32_t dwStartPos) = 0; + virtual void OnTagClose(void* pTag, uint32_t dwEndPos) = 0; virtual void OnTagEnd(void* pTag, const CFX_ByteStringC& bsTagName, - FX_DWORD dwEndPos) = 0; + uint32_t dwEndPos) = 0; virtual void OnTargetData(void* pTag, FX_SAXNODE eType, const CFX_ByteStringC& bsData, - FX_DWORD dwStartPos) = 0; + uint32_t dwStartPos) = 0; }; class IFX_SAXReader { @@ -56,9 +56,9 @@ class IFX_SAXReader { virtual ~IFX_SAXReader() {} virtual void Release() = 0; virtual int32_t StartParse(IFX_FileRead* pFile, - FX_DWORD dwStart = 0, - FX_DWORD dwLen = -1, - FX_DWORD dwParseMode = 0) = 0; + uint32_t dwStart = 0, + uint32_t dwLen = -1, + uint32_t dwParseMode = 0) = 0; virtual int32_t ContinueParse(IFX_Pause* pPause = NULL) = 0; virtual void SkipCurrentNode() = 0; virtual void SetHandler(IFX_SAXReaderHandler* pHandler) = 0; diff --git a/xfa/fgas/xml/fgas_sax_imp.h b/xfa/fgas/xml/fgas_sax_imp.h index 1d2161763f..a52d8356ee 100644 --- a/xfa/fgas/xml/fgas_sax_imp.h +++ b/xfa/fgas/xml/fgas_sax_imp.h @@ -12,16 +12,16 @@ class CFX_SAXFile { public: CFX_SAXFile(); - FX_BOOL StartFile(IFX_FileRead* pFile, FX_DWORD dwStart, FX_DWORD dwLen); + FX_BOOL StartFile(IFX_FileRead* pFile, uint32_t dwStart, uint32_t dwLen); FX_BOOL ReadNextBlock(); void Reset(); IFX_FileRead* m_pFile; - FX_DWORD m_dwStart; - FX_DWORD m_dwEnd; - FX_DWORD m_dwCur; + uint32_t m_dwStart; + uint32_t m_dwEnd; + uint32_t m_dwCur; uint8_t* m_pBuf; - FX_DWORD m_dwBufSize; - FX_DWORD m_dwBufIndex; + uint32_t m_dwBufSize; + uint32_t m_dwBufIndex; }; enum FX_SAXMODE { @@ -53,7 +53,7 @@ class CFX_SAXItem { m_pNext(NULL) {} void* m_pNode; FX_SAXNODE m_eNode; - FX_DWORD m_dwID; + uint32_t m_dwID; FX_BOOL m_bSkip; CFX_SAXItem* m_pPrev; CFX_SAXItem* m_pNext; @@ -72,9 +72,9 @@ class CFX_SAXReader : public IFX_SAXReader { ~CFX_SAXReader(); virtual void Release() { delete this; } virtual int32_t StartParse(IFX_FileRead* pFile, - FX_DWORD dwStart = 0, - FX_DWORD dwLen = -1, - FX_DWORD dwParseMode = 0); + uint32_t dwStart = 0, + uint32_t dwLen = -1, + uint32_t dwParseMode = 0); virtual int32_t ContinueParse(IFX_Pause* pPause = NULL); virtual void SkipCurrentNode(); virtual void SetHandler(IFX_SAXReaderHandler* pHandler); @@ -102,15 +102,15 @@ class CFX_SAXReader : public IFX_SAXReader { int32_t m_iState; CFX_SAXItem* m_pRoot; CFX_SAXItem* m_pCurItem; - FX_DWORD m_dwItemID; + uint32_t m_dwItemID; FX_SAXMODE m_eMode; FX_SAXMODE m_ePrevMode; FX_BOOL m_bCharData; uint8_t m_CurByte; - FX_DWORD m_dwDataOffset; + uint32_t m_dwDataOffset; CFX_ByteArray m_SkipStack; uint8_t m_SkipChar; - FX_DWORD m_dwNodePos; + uint32_t m_dwNodePos; uint8_t* m_pszData; int32_t m_iDataSize; int32_t m_iDataLength; @@ -119,7 +119,7 @@ class CFX_SAXReader : public IFX_SAXReader { uint8_t* m_pszName; int32_t m_iNameSize; int32_t m_iNameLength; - FX_DWORD m_dwParseMode; + uint32_t m_dwParseMode; CFX_SAXCommentContext* m_pCommentContext; void Reset(); void Push(); -- cgit v1.2.3