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/fde/css/fde_css.h | 16 ++--- xfa/fde/css/fde_csscache.h | 12 ++-- xfa/fde/css/fde_cssdatatable.h | 10 ++-- xfa/fde/css/fde_cssstyleselector.h | 84 +++++++++++++-------------- xfa/fde/css/fde_cssstylesheet.h | 20 +++---- xfa/fde/css/fde_csssyntax.h | 2 +- xfa/fde/fde_iterator.h | 4 +- xfa/fde/fde_render.h | 2 +- xfa/fde/fde_visualset.h | 2 +- xfa/fde/tto/fde_textout.h | 2 +- xfa/fde/xml/fde_xml.h | 2 +- xfa/fde/xml/fde_xml_imp.h | 6 +- xfa/fee/fde_txtedtengine.h | 2 +- xfa/fee/fde_txtedtpage.h | 2 +- xfa/fee/ifde_txtedtengine.h | 6 +- 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 ++++----- xfa/fwl/basewidget/fwl_barcodeimp.h | 4 +- xfa/fwl/basewidget/fwl_caretimp.h | 8 +-- xfa/fwl/basewidget/fwl_checkboximp.h | 6 +- xfa/fwl/basewidget/fwl_comboboximp.h | 20 +++---- xfa/fwl/basewidget/fwl_datetimepickerimp.h | 10 ++-- xfa/fwl/basewidget/fwl_editimp.h | 12 ++-- xfa/fwl/basewidget/fwl_formproxyimp.h | 2 +- xfa/fwl/basewidget/fwl_listboximp.h | 10 ++-- xfa/fwl/basewidget/fwl_monthcalendarimp.h | 6 +- xfa/fwl/basewidget/fwl_pictureboximp.h | 2 +- xfa/fwl/basewidget/fwl_pushbuttonimp.h | 8 +-- xfa/fwl/basewidget/fwl_scrollbarimp.h | 14 ++--- xfa/fwl/basewidget/fwl_spinbuttonimp.h | 8 +-- xfa/fwl/basewidget/fwl_tooltipctrlimp.h | 6 +- xfa/fwl/basewidget/ifwl_barcode.h | 2 +- xfa/fwl/basewidget/ifwl_caret.h | 4 +- xfa/fwl/basewidget/ifwl_combobox.h | 4 +- xfa/fwl/basewidget/ifwl_datetimepicker.h | 4 +- xfa/fwl/basewidget/ifwl_edit.h | 2 +- xfa/fwl/basewidget/ifwl_listbox.h | 8 +-- xfa/fwl/basewidget/ifwl_scrollbar.h | 2 +- xfa/fwl/core/cfwl_event.h | 16 ++--- xfa/fwl/core/cfwl_message.h | 14 ++--- xfa/fwl/core/cfwl_note.h | 10 ++-- xfa/fwl/core/cfwl_themepart.h | 4 +- xfa/fwl/core/cfwl_themetext.h | 2 +- xfa/fwl/core/cfwl_widgetimpproperties.h | 6 +- xfa/fwl/core/fwl_formimp.h | 10 ++-- xfa/fwl/core/fwl_gridimp.h | 4 +- xfa/fwl/core/fwl_noteimp.h | 10 ++-- xfa/fwl/core/fwl_panelimp.h | 2 +- xfa/fwl/core/fwl_sdadapterimp.h | 4 +- xfa/fwl/core/fwl_targetimp.h | 2 +- xfa/fwl/core/fwl_widgetimp.h | 28 ++++----- xfa/fwl/core/fwl_widgetmgrimp.h | 6 +- xfa/fwl/core/ifwl_adapterwidgetmgr.h | 4 +- xfa/fwl/core/ifwl_form.h | 2 +- xfa/fwl/core/ifwl_notedriver.h | 2 +- xfa/fwl/core/ifwl_target.h | 2 +- xfa/fwl/core/ifwl_themeprovider.h | 8 +-- xfa/fwl/core/ifwl_timer.h | 2 +- xfa/fwl/core/ifwl_widget.h | 16 ++--- xfa/fwl/core/ifwl_widgetmgr.h | 2 +- xfa/fwl/core/ifwl_widgetmgrdelegate.h | 2 +- xfa/fwl/core/include/ifwl_adaptertimermgr.h | 2 +- xfa/fxbarcode/oned/BC_OneDimWriter.h | 2 +- xfa/fxbarcode/pdf417/BC_PDF417Common.h | 4 +- xfa/fxbarcode/utils.h | 4 +- xfa/fxfa/app/xfa_checksum.h | 10 ++-- xfa/fxfa/app/xfa_ffbarcode.h | 6 +- xfa/fxfa/app/xfa_ffcheckbutton.h | 4 +- xfa/fxfa/app/xfa_ffchoicelist.h | 8 +-- xfa/fxfa/app/xfa_ffdoc.h | 8 +-- xfa/fxfa/app/xfa_ffdochandler.h | 4 +- xfa/fxfa/app/xfa_ffexclgroup.h | 2 +- xfa/fxfa/app/xfa_fffield.h | 32 +++++----- xfa/fxfa/app/xfa_ffimage.h | 2 +- xfa/fxfa/app/xfa_ffimageedit.h | 4 +- xfa/fxfa/app/xfa_ffnotify.h | 2 +- xfa/fxfa/app/xfa_ffpageview.h | 12 ++-- xfa/fxfa/app/xfa_ffpath.h | 6 +- xfa/fxfa/app/xfa_ffpushbutton.h | 2 +- xfa/fxfa/app/xfa_ffsignature.h | 26 ++++----- xfa/fxfa/app/xfa_fftext.h | 10 ++-- xfa/fxfa/app/xfa_fftextedit.h | 12 ++-- xfa/fxfa/app/xfa_ffwidget.h | 38 ++++++------ xfa/fxfa/app/xfa_ffwidgethandler.h | 36 ++++++------ xfa/fxfa/app/xfa_fontmgr.h | 10 ++-- xfa/fxfa/app/xfa_fwltheme.h | 12 ++-- xfa/fxfa/app/xfa_rendercontext.h | 2 +- xfa/fxfa/app/xfa_textlayout.h | 30 +++++----- xfa/fxfa/fm2js/xfa_error.h | 2 +- xfa/fxfa/fm2js/xfa_expression.h | 32 +++++----- xfa/fxfa/fm2js/xfa_fmparse.h | 2 +- xfa/fxfa/fm2js/xfa_lexer.h | 14 ++--- xfa/fxfa/fm2js/xfa_simpleexpression.h | 48 +++++++-------- xfa/fxfa/parser/xfa_basic_imp.h | 4 +- xfa/fxfa/parser/xfa_docdata.h | 2 +- xfa/fxfa/parser/xfa_doclayout.h | 2 +- xfa/fxfa/parser/xfa_document.h | 16 ++--- xfa/fxfa/parser/xfa_document_datamerger_imp.h | 2 +- xfa/fxfa/parser/xfa_document_serialize.h | 4 +- xfa/fxfa/parser/xfa_layout_appadapter.h | 2 +- xfa/fxfa/parser/xfa_localevalue.h | 14 ++--- xfa/fxfa/parser/xfa_object.h | 26 ++++----- xfa/fxfa/parser/xfa_parser_imp.h | 2 +- xfa/fxfa/parser/xfa_script.h | 2 +- xfa/fxfa/parser/xfa_script_eventpseudomodel.h | 2 +- xfa/fxfa/parser/xfa_script_hostpseudomodel.h | 2 +- xfa/fxfa/parser/xfa_script_imp.h | 6 +- xfa/fxfa/parser/xfa_script_nodehelper.h | 4 +- xfa/fxfa/parser/xfa_script_resolveprocessor.h | 4 +- xfa/fxgraphics/include/cfx_graphics.h | 2 +- xfa/fxjse/include/fxjse.h | 2 +- xfa/include/fwl/lightwidget/barcode.h | 4 +- xfa/include/fwl/lightwidget/caret.h | 4 +- xfa/include/fwl/lightwidget/combobox.h | 16 ++--- xfa/include/fwl/lightwidget/datetimepicker.h | 4 +- xfa/include/fwl/lightwidget/edit.h | 2 +- xfa/include/fwl/lightwidget/listbox.h | 14 ++--- xfa/include/fwl/lightwidget/scrollbar.h | 2 +- xfa/include/fwl/lightwidget/theme.h | 8 +-- xfa/include/fwl/lightwidget/widget.h | 24 ++++---- xfa/include/fwl/theme/carettp.h | 2 +- xfa/include/fwl/theme/checkboxtp.h | 10 ++-- xfa/include/fwl/theme/comboboxtp.h | 6 +- xfa/include/fwl/theme/formtp.h | 8 +-- xfa/include/fwl/theme/listboxtp.h | 2 +- xfa/include/fwl/theme/monthcalendartp.h | 10 ++-- xfa/include/fwl/theme/pushbuttontp.h | 24 ++++---- xfa/include/fwl/theme/scrollbartp.h | 8 +-- xfa/include/fwl/theme/utils.h | 6 +- xfa/include/fwl/theme/widgettp.h | 34 +++++------ xfa/include/fxfa/fxfa.h | 60 +++++++++---------- xfa/include/fxfa/fxfa_basic.h | 28 ++++----- xfa/include/fxfa/fxfa_objectacc.h | 4 +- xfa/include/fxfa/fxfa_widget.h | 2 +- 143 files changed, 746 insertions(+), 746 deletions(-) diff --git a/xfa/fde/css/fde_css.h b/xfa/fde/css/fde_css.h index 791620071d..d2b67d294e 100644 --- a/xfa/fde/css/fde_css.h +++ b/xfa/fde/css/fde_css.h @@ -394,7 +394,7 @@ class IFDE_CSSSelector { public: virtual ~IFDE_CSSSelector() {} virtual FDE_CSSSELECTORTYPE GetType() const = 0; - virtual FX_DWORD GetNameHash() const = 0; + virtual uint32_t GetNameHash() const = 0; virtual IFDE_CSSSelector* GetNextSelector() const = 0; }; #define FDE_CSSMEDIATYPE_Braille 0x01 @@ -428,7 +428,7 @@ class IFDE_CSSStyleRule : public IFDE_CSSRule { class IFDE_CSSMediaRule : public IFDE_CSSRule { public: virtual FDE_CSSRULETYPE GetType() const { return FDE_CSSRULETYPE_Media; } - virtual FX_DWORD GetMediaList() const = 0; + virtual uint32_t GetMediaList() const = 0; virtual int32_t CountRules() const = 0; virtual IFDE_CSSRule* GetRule(int32_t index) = 0; }; @@ -444,15 +444,15 @@ class IFDE_CSSStyleSheet : public IFX_Unknown { const CFX_WideString& szUrl, IFX_Stream* pStream, uint16_t wCodePage, - FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL); + uint32_t dwMediaList = FDE_CSSMEDIATYPE_ALL); static IFDE_CSSStyleSheet* LoadFromBuffer( const CFX_WideString& szUrl, const FX_WCHAR* pBuffer, int32_t iBufSize, uint16_t wCodePage, - FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL); + uint32_t dwMediaList = FDE_CSSMEDIATYPE_ALL); virtual FX_BOOL GetUrl(CFX_WideString& szUrl) = 0; - virtual FX_DWORD GetMediaList() const = 0; + virtual uint32_t GetMediaList() const = 0; virtual uint16_t GetCodePage() const = 0; virtual int32_t CountRules() const = 0; @@ -936,7 +936,7 @@ class IFDE_CSSParagraphStyle { virtual FDE_CSSVERTICALALIGN GetVerticalAlign() const = 0; virtual FX_FLOAT GetNumberVerticalAlign() const = 0; virtual FDE_CSSTEXTTRANSFORM GetTextTransform() const = 0; - virtual FX_DWORD GetTextDecoration() const = 0; + virtual uint32_t GetTextDecoration() const = 0; virtual const FDE_CSSLENGTH& GetLetterSpacing() const = 0; virtual const FDE_CSSLENGTH& GetWordSpacing() const = 0; virtual FDE_CSSWRITINGMODE GetWritingMode() const = 0; @@ -961,7 +961,7 @@ class IFDE_CSSParagraphStyle { virtual void SetVerticalAlign(FDE_CSSVERTICALALIGN eVerticalAlign) = 0; virtual void SetNumberVerticalAlign(FX_FLOAT fAlign) = 0; virtual void SetTextTransform(FDE_CSSTEXTTRANSFORM eTextTransform) = 0; - virtual void SetTextDecoration(FX_DWORD dwTextDecoration) = 0; + virtual void SetTextDecoration(uint32_t dwTextDecoration) = 0; virtual void SetLetterSpacing(const FDE_CSSLENGTH& letterSpacing) = 0; virtual void SetWordSpacing(const FDE_CSSLENGTH& wordSpacing) = 0; virtual void SetWritingMode(FDE_CSSWRITINGMODE eWritingMode) = 0; @@ -1065,7 +1065,7 @@ class IFDE_CSSStyleSelector { const CFDE_CSSStyleSheetArray* pArray) = 0; virtual void SetStylePriority(FDE_CSSSTYLESHEETGROUP eType, FDE_CSSSTYLESHEETPRIORITY ePriority) = 0; - virtual void UpdateStyleIndex(FX_DWORD dwMediaList) = 0; + virtual void UpdateStyleIndex(uint32_t dwMediaList) = 0; virtual IFDE_CSSAccelerator* InitAccelerator() = 0; virtual IFDE_CSSComputedStyle* CreateComputedStyle( IFDE_CSSComputedStyle* pParentStyle) = 0; diff --git a/xfa/fde/css/fde_csscache.h b/xfa/fde/css/fde_csscache.h index b886424d64..20158b5371 100644 --- a/xfa/fde/css/fde_csscache.h +++ b/xfa/fde/css/fde_csscache.h @@ -18,7 +18,7 @@ class FDE_CSSCacheItem : public CFX_Target { ~FDE_CSSCacheItem(); IFDE_CSSStyleSheet* pStylesheet; - FX_DWORD dwActivity; + uint32_t dwActivity; }; class CFDE_CSSStyleSheetCache : public IFDE_CSSStyleSheetCache, @@ -51,11 +51,11 @@ class FDE_CSSTagCache : public CFX_Target { FDE_CSSTagCache(const FDE_CSSTagCache& it); FDE_CSSTagCache* GetParent() const { return pParent; } IFDE_CSSTagProvider* GetTag() const { return pTag; } - FX_DWORD HashID() const { return dwIDHash; } - FX_DWORD HashTag() const { return dwTagHash; } + uint32_t HashID() const { return dwIDHash; } + uint32_t HashTag() const { return dwTagHash; } int32_t CountHashClass() const { return dwClassHashs.GetSize(); } void SetClassIndex(int32_t index) { iClassIndex = index; } - FX_DWORD HashClass() const { + uint32_t HashClass() const { return iClassIndex < dwClassHashs.GetSize() ? dwClassHashs.GetAt(iClassIndex) : 0; @@ -64,8 +64,8 @@ class FDE_CSSTagCache : public CFX_Target { protected: IFDE_CSSTagProvider* pTag; FDE_CSSTagCache* pParent; - FX_DWORD dwIDHash; - FX_DWORD dwTagHash; + uint32_t dwIDHash; + uint32_t dwTagHash; int32_t iClassIndex; CFDE_DWordArray dwClassHashs; }; diff --git a/xfa/fde/css/fde_cssdatatable.h b/xfa/fde/css/fde_cssdatatable.h index a44c24b614..8d17901d1d 100644 --- a/xfa/fde/css/fde_cssdatatable.h +++ b/xfa/fde/css/fde_cssdatatable.h @@ -132,8 +132,8 @@ class CFDE_CSSValueListParser : public CFX_Target { struct FDE_CSSPROPERTYTABLE { FDE_CSSPROPERTY eName; const FX_WCHAR* pszName; - FX_DWORD dwHash; - FX_DWORD dwType; + uint32_t dwHash; + uint32_t dwType; }; typedef FDE_CSSPROPERTYTABLE const* FDE_LPCCSSPROPERTYTABLE; @@ -143,7 +143,7 @@ FDE_LPCCSSPROPERTYTABLE FDE_GetCSSPropertyByEnum(FDE_CSSPROPERTY eName); struct FDE_CSSPROPERTYVALUETABLE { FDE_CSSPROPERTYVALUE eName; const FX_WCHAR* pszName; - FX_DWORD dwHash; + uint32_t dwHash; }; typedef FDE_CSSPROPERTYVALUETABLE const* FDE_LPCCSSPROPERTYVALUETABLE; @@ -167,7 +167,7 @@ typedef FDE_CSSLENGTHUNITTABLE const* FDE_LPCCSSLENGTHUNITTABLE; FDE_LPCCSSLENGTHUNITTABLE FDE_GetCSSLengthUnitByName(const FX_WCHAR* pszName, int32_t iLength); struct FDE_CSSCOLORTABLE { - FX_DWORD dwHash; + uint32_t dwHash; FX_ARGB dwValue; }; typedef FDE_CSSCOLORTABLE const* FDE_LPCCSSCOLORTABLE; @@ -176,7 +176,7 @@ FDE_LPCCSSCOLORTABLE FDE_GetCSSColorByName(const FX_WCHAR* pszName, struct FDE_CSSPERSUDOTABLE { FDE_CSSPERSUDO eName; const FX_WCHAR* pszName; - FX_DWORD dwHash; + uint32_t dwHash; }; typedef FDE_CSSPERSUDOTABLE const* FDE_LPCCSSPERSUDOTABLE; diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h index 0584a2983f..2652e3f8ea 100644 --- a/xfa/fde/css/fde_cssstyleselector.h +++ b/xfa/fde/css/fde_cssstyleselector.h @@ -22,11 +22,11 @@ class FDE_CSSRuleData : public CFX_Target { public: FDE_CSSRuleData(IFDE_CSSSelector* pSel, IFDE_CSSDeclaration* pDecl, - FX_DWORD dwPos); + uint32_t dwPos); IFDE_CSSSelector* pSelector; IFDE_CSSDeclaration* pDeclaration; - FX_DWORD dwPriority; + uint32_t dwPriority; FDE_CSSRuleData* pNext; }; @@ -39,24 +39,24 @@ class CFDE_CSSRuleCollection : public CFX_Target { m_iSelectors(0) {} ~CFDE_CSSRuleCollection() { Clear(); } void AddRulesFrom(const CFDE_CSSStyleSheetArray& sheets, - FX_DWORD dwMediaList, + uint32_t dwMediaList, IFX_FontMgr* pFontMgr); void Clear(); int32_t CountSelectors() const { return m_iSelectors; } - FDE_CSSRuleData* GetIDRuleData(FX_DWORD dwIDHash) { + FDE_CSSRuleData* GetIDRuleData(uint32_t dwIDHash) { void* pData; return m_IDRules.Lookup((void*)(uintptr_t)dwIDHash, pData) ? (FDE_CSSRuleData*)pData : NULL; } - FDE_CSSRuleData* GetTagRuleData(FX_DWORD dwTagHasn) { + FDE_CSSRuleData* GetTagRuleData(uint32_t dwTagHasn) { void* pData; return m_TagRules.Lookup((void*)(uintptr_t)dwTagHasn, pData) ? (FDE_CSSRuleData*)pData : NULL; } - FDE_CSSRuleData* GetClassRuleData(FX_DWORD dwIDHash) { + FDE_CSSRuleData* GetClassRuleData(uint32_t dwIDHash) { void* pData; return m_ClassRules.Lookup((void*)(uintptr_t)dwIDHash, pData) ? (FDE_CSSRuleData*)pData @@ -69,10 +69,10 @@ class CFDE_CSSRuleCollection : public CFX_Target { protected: void AddRulesFrom(IFDE_CSSStyleSheet* pStyleSheet, IFDE_CSSRule* pRule, - FX_DWORD dwMediaList, + uint32_t dwMediaList, IFX_FontMgr* pFontMgr); void AddRuleTo(CFX_MapPtrToPtr& map, - FX_DWORD dwKey, + uint32_t dwKey, IFDE_CSSSelector* pSel, IFDE_CSSDeclaration* pDecl); FX_BOOL AddRuleTo(FDE_CSSRuleData*& pList, FDE_CSSRuleData* pData); @@ -102,7 +102,7 @@ class CFDE_CSSStyleSelector : public IFDE_CSSStyleSelector, public CFX_Target { const CFDE_CSSStyleSheetArray* pArray); virtual void SetStylePriority(FDE_CSSSTYLESHEETGROUP eType, FDE_CSSSTYLESHEETPRIORITY ePriority); - virtual void UpdateStyleIndex(FX_DWORD dwMediaList); + virtual void UpdateStyleIndex(uint32_t dwMediaList); virtual IFDE_CSSAccelerator* InitAccelerator(); virtual IFDE_CSSComputedStyle* CreateComputedStyle( IFDE_CSSComputedStyle* pParentStyle); @@ -152,7 +152,7 @@ class CFDE_CSSStyleSelector : public IFDE_CSSStyleSelector, public CFX_Target { FDE_CSSLISTSTYLEPOSITION ToListStylePosition(FDE_CSSPROPERTYVALUE eValue); FDE_CSSVISIBILITY ToVisibility(FDE_CSSPROPERTYVALUE eValue); FDE_CSSWHITESPACE ToWhiteSpace(FDE_CSSPROPERTYVALUE eValue); - FX_DWORD ToTextDecoration(IFDE_CSSValueList* pList); + uint32_t ToTextDecoration(IFDE_CSSValueList* pList); FDE_CSSTEXTTRANSFORM ToTextTransform(FDE_CSSPROPERTYVALUE eValue); FDE_CSSFONTVARIANT ToFontVariant(FDE_CSSPROPERTYVALUE eValue); FDE_CSSFLOAT ToFloat(FDE_CSSPROPERTYVALUE eValue); @@ -338,32 +338,32 @@ class CFDE_CSSNonInheritedData { FX_FLOAT m_fVerticalAlign; FX_FLOAT m_fTextCombineNumber; - FX_DWORD m_eBDRLeftStyle : 4; - FX_DWORD m_eBDRTopStyle : 4; - FX_DWORD m_eBDRRightStyle : 4; - FX_DWORD m_eBDRBottomStyle : 4; - FX_DWORD m_eDisplay : 5; - FX_DWORD m_eVerticalAlign : 4; - FX_DWORD m_eListStyleType : 5; - FX_DWORD m_eColumnRuleStyle : 4; - FX_DWORD m_ePageBreakInside : 3; - FX_DWORD m_ePageBreakAfter : 3; - FX_DWORD m_ePageBreakBefore : 3; - FX_DWORD m_ePosition : 2; - FX_DWORD m_eBKGRepeat : 2; - FX_DWORD m_eFloat : 2; - FX_DWORD m_eClear : 2; - FX_DWORD m_eOverflowX : 3; - FX_DWORD m_eOverflowY : 3; - FX_DWORD m_eListStylePosition : 1; - FX_DWORD m_eBKGAttachment : 1; - FX_DWORD m_bHasMargin : 1; - FX_DWORD m_bHasBorder : 1; - FX_DWORD m_bHasPadding : 1; - FX_DWORD m_dwTextDecoration : 5; - FX_DWORD m_eTextCombine : 1; - FX_DWORD m_bColumnRuleColorSame : 1; - FX_DWORD m_bHasTextCombineNumber : 1; + uint32_t m_eBDRLeftStyle : 4; + uint32_t m_eBDRTopStyle : 4; + uint32_t m_eBDRRightStyle : 4; + uint32_t m_eBDRBottomStyle : 4; + uint32_t m_eDisplay : 5; + uint32_t m_eVerticalAlign : 4; + uint32_t m_eListStyleType : 5; + uint32_t m_eColumnRuleStyle : 4; + uint32_t m_ePageBreakInside : 3; + uint32_t m_ePageBreakAfter : 3; + uint32_t m_ePageBreakBefore : 3; + uint32_t m_ePosition : 2; + uint32_t m_eBKGRepeat : 2; + uint32_t m_eFloat : 2; + uint32_t m_eClear : 2; + uint32_t m_eOverflowX : 3; + uint32_t m_eOverflowY : 3; + uint32_t m_eListStylePosition : 1; + uint32_t m_eBKGAttachment : 1; + uint32_t m_bHasMargin : 1; + uint32_t m_bHasBorder : 1; + uint32_t m_bHasPadding : 1; + uint32_t m_dwTextDecoration : 5; + uint32_t m_eTextCombine : 1; + uint32_t m_bColumnRuleColorSame : 1; + uint32_t m_bHasTextCombineNumber : 1; }; class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, public IFDE_CSSFontStyle, @@ -382,9 +382,9 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, CFDE_CSSComputedStyle(IFX_MEMAllocator* pAlloc) : m_dwRefCount(1), m_pAllocator(pAlloc) {} ~CFDE_CSSComputedStyle() {} - virtual FX_DWORD AddRef() { return ++m_dwRefCount; } - virtual FX_DWORD Release() { - FX_DWORD dwRefCount = --m_dwRefCount; + virtual uint32_t AddRef() { return ++m_dwRefCount; } + virtual uint32_t Release() { + uint32_t dwRefCount = --m_dwRefCount; if (dwRefCount == 0) { if (m_NonInheritedData.m_pCounterStyle != NULL) { delete m_NonInheritedData.m_pCounterStyle; @@ -709,7 +709,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, virtual FDE_CSSTEXTTRANSFORM GetTextTransform() const { return (FDE_CSSTEXTTRANSFORM)m_InheritedData.m_eTextTransform; } - virtual FX_DWORD GetTextDecoration() const { + virtual uint32_t GetTextDecoration() const { return m_NonInheritedData.m_dwTextDecoration; } virtual const FDE_CSSLENGTH& GetLetterSpacing() const { @@ -785,7 +785,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, virtual void SetTextTransform(FDE_CSSTEXTTRANSFORM eTextTransform) { m_InheritedData.m_eTextTransform = eTextTransform; } - virtual void SetTextDecoration(FX_DWORD dwTextDecoration) { + virtual void SetTextDecoration(uint32_t dwTextDecoration) { m_NonInheritedData.m_dwTextDecoration = dwTextDecoration; } virtual void SetLetterSpacing(const FDE_CSSLENGTH& letterSpacing) { @@ -890,7 +890,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, m_CustomProperties.Add(wsName); m_CustomProperties.Add(wsValue); } - FX_DWORD m_dwRefCount; + uint32_t m_dwRefCount; IFX_MEMAllocator* m_pAllocator; CFDE_CSSInheritedData m_InheritedData; CFDE_CSSNonInheritedData m_NonInheritedData; diff --git a/xfa/fde/css/fde_cssstylesheet.h b/xfa/fde/css/fde_cssstylesheet.h index 882f80f366..8ae8bd5393 100644 --- a/xfa/fde/css/fde_cssstylesheet.h +++ b/xfa/fde/css/fde_cssstylesheet.h @@ -21,7 +21,7 @@ class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target { m_pNext(NULL) {} virtual FDE_CSSSELECTORTYPE GetType() const { return m_eType; } - virtual FX_DWORD GetNameHash() const { return m_dwHash; } + virtual uint32_t GetNameHash() const { return m_dwHash; } virtual IFDE_CSSSelector* GetNextSelector() const { return m_pNext; } static IFDE_CSSSelector* FromString(IFX_MEMAllocator* pStaticStore, @@ -37,7 +37,7 @@ class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target { FDE_CSSSELECTORTYPE eType); void SetType(FDE_CSSSELECTORTYPE eType) { m_eType = eType; } FDE_CSSSELECTORTYPE m_eType; - FX_DWORD m_dwHash; + uint32_t m_dwHash; IFDE_CSSSelector* m_pNext; }; typedef CFX_ArrayTemplate CFDE_CSSSelectorArray; @@ -63,10 +63,10 @@ class CFDE_CSSStyleRule : public IFDE_CSSStyleRule, public CFX_Target { }; class CFDE_CSSMediaRule : public IFDE_CSSMediaRule, public CFX_Target { public: - CFDE_CSSMediaRule(FX_DWORD dwMediaList) : m_dwMediaList(dwMediaList) {} + CFDE_CSSMediaRule(uint32_t dwMediaList) : m_dwMediaList(dwMediaList) {} ~CFDE_CSSMediaRule(); - virtual FX_DWORD GetMediaList() const { return m_dwMediaList; } + virtual uint32_t GetMediaList() const { return m_dwMediaList; } virtual int32_t CountRules() const { return m_RuleArray.GetSize(); } virtual IFDE_CSSRule* GetRule(int32_t index) { @@ -75,7 +75,7 @@ class CFDE_CSSMediaRule : public IFDE_CSSMediaRule, public CFX_Target { CFDE_CSSRuleArray& GetArray() { return m_RuleArray; } protected: - FX_DWORD m_dwMediaList; + uint32_t m_dwMediaList; CFDE_CSSRuleArray m_RuleArray; }; class CFDE_CSSFontFaceRule : public IFDE_CSSFontFaceRule, public CFX_Target { @@ -96,16 +96,16 @@ class CFDE_CSSFontFaceRule : public IFDE_CSSFontFaceRule, public CFX_Target { return FDE_CSSSYNTAXSTATUS_Error; class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target { public: - CFDE_CSSStyleSheet(FX_DWORD dwMediaList); + CFDE_CSSStyleSheet(uint32_t dwMediaList); ~CFDE_CSSStyleSheet(); - virtual FX_DWORD AddRef(); - virtual FX_DWORD Release(); + virtual uint32_t AddRef(); + virtual uint32_t Release(); virtual FX_BOOL GetUrl(CFX_WideString& szUrl) { szUrl = m_szUrl; return szUrl.GetLength() > 0; } - virtual FX_DWORD GetMediaList() const { return m_dwMediaList; } + virtual uint32_t GetMediaList() const { return m_dwMediaList; } virtual uint16_t GetCodePage() const { return m_wCodePage; } virtual int32_t CountRules() const; virtual IFDE_CSSRule* GetRule(int32_t index); @@ -130,7 +130,7 @@ class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target { FDE_CSSSYNTAXSTATUS SkipRuleSet(IFDE_CSSSyntaxParser* pSyntax); uint16_t m_wCodePage; uint16_t m_wRefCount; - FX_DWORD m_dwMediaList; + uint32_t m_dwMediaList; IFX_MEMAllocator* m_pAllocator; CFDE_CSSRuleArray m_RuleArray; CFX_WideString m_szUrl; diff --git a/xfa/fde/css/fde_csssyntax.h b/xfa/fde/css/fde_csssyntax.h index a25ab3badd..0f97604073 100644 --- a/xfa/fde/css/fde_csssyntax.h +++ b/xfa/fde/css/fde_csssyntax.h @@ -110,7 +110,7 @@ class CFDE_CSSSyntaxParser : public IFDE_CSSSyntaxParser, public CFX_Target { CFDE_CSSTextBuf m_TextData; CFDE_CSSTextBuf m_TextPlane; int32_t m_iTextDatLen; - FX_DWORD m_dwCheck; + uint32_t m_dwCheck; FDE_CSSSYNTAXMODE m_eMode; FDE_CSSSYNTAXSTATUS m_eStatus; CFX_StackTemplate m_ModeStack; diff --git a/xfa/fde/fde_iterator.h b/xfa/fde/fde_iterator.h index 6be6c4c0a5..5a0e7566a0 100644 --- a/xfa/fde/fde_iterator.h +++ b/xfa/fde/fde_iterator.h @@ -24,7 +24,7 @@ class CFDE_VisualSetIterator : public IFDE_VisualSetIterator, virtual void Release() { delete this; } virtual FX_BOOL AttachCanvas(IFDE_CanvasSet* pCanvas); - virtual FX_BOOL FilterObjects(FX_DWORD dwObjects = 0xFFFFFFFF); + virtual FX_BOOL FilterObjects(uint32_t dwObjects = 0xFFFFFFFF); virtual void Reset(); virtual FDE_HVISUALOBJ GetNext(IFDE_VisualSet*& pVisualSet, @@ -32,7 +32,7 @@ class CFDE_VisualSetIterator : public IFDE_VisualSetIterator, IFDE_CanvasSet** ppCanvasSet = NULL); protected: - FX_DWORD m_dwFilter; + uint32_t m_dwFilter; CFX_StackTemplate m_CanvasStack; }; diff --git a/xfa/fde/fde_render.h b/xfa/fde/fde_render.h index 2b09ed67ac..99e4bbe963 100644 --- a/xfa/fde/fde_render.h +++ b/xfa/fde/fde_render.h @@ -16,7 +16,7 @@ void FDE_GetPageMatrix(CFX_Matrix& pageMatrix, const CFX_RectF& docPageRect, const CFX_Rect& devicePageRect, int32_t iRotate, - FX_DWORD dwCoordinatesType = 0); + uint32_t dwCoordinatesType = 0); enum FDE_RENDERSTATUS { FDE_RENDERSTATUS_Reset = 0, FDE_RENDERSTATUS_Paused, diff --git a/xfa/fde/fde_visualset.h b/xfa/fde/fde_visualset.h index 593d42de20..5dc7f84cb7 100644 --- a/xfa/fde/fde_visualset.h +++ b/xfa/fde/fde_visualset.h @@ -113,7 +113,7 @@ class IFDE_VisualSetIterator { virtual ~IFDE_VisualSetIterator() {} virtual void Release() = 0; virtual FX_BOOL AttachCanvas(IFDE_CanvasSet* pCanvas) = 0; - virtual FX_BOOL FilterObjects(FX_DWORD dwObjects = 0xFFFFFFFF) = 0; + virtual FX_BOOL FilterObjects(uint32_t dwObjects = 0xFFFFFFFF) = 0; virtual void Reset() = 0; virtual FDE_HVISUALOBJ GetNext(IFDE_VisualSet*& pVisualSet, FDE_HVISUALOBJ* phCanvasObj = NULL, diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index c94571b5f8..159850e0f2 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -44,7 +44,7 @@ class IFDE_TextOut { virtual void SetFont(IFX_Font* pFont) = 0; virtual void SetFontSize(FX_FLOAT fFontSize) = 0; virtual void SetTextColor(FX_ARGB color) = 0; - virtual void SetStyles(FX_DWORD dwStyles) = 0; + virtual void SetStyles(uint32_t dwStyles) = 0; virtual void SetTabWidth(FX_FLOAT fTabWidth) = 0; virtual void SetEllipsisString(const CFX_WideString& wsEllipsis) = 0; virtual void SetParagraphBreakChar(FX_WCHAR wch) = 0; diff --git a/xfa/fde/xml/fde_xml.h b/xfa/fde/xml/fde_xml.h index 757ebf9be8..cb76ac3b8a 100644 --- a/xfa/fde/xml/fde_xml.h +++ b/xfa/fde/xml/fde_xml.h @@ -209,7 +209,7 @@ class IFDE_XMLSyntaxParser { virtual void Init(IFX_Stream* pStream, int32_t iXMLPlaneSize, int32_t iTextDataSize = 256) = 0; - virtual FX_DWORD DoSyntaxParse() = 0; + virtual uint32_t DoSyntaxParse() = 0; virtual int32_t GetStatus() const = 0; virtual int32_t GetCurrentPos() const = 0; virtual FX_FILESIZE GetCurrentBinaryPos() const = 0; diff --git a/xfa/fde/xml/fde_xml_imp.h b/xfa/fde/xml/fde_xml_imp.h index f30e12a7bb..7d74ff62bf 100644 --- a/xfa/fde/xml/fde_xml_imp.h +++ b/xfa/fde/xml/fde_xml_imp.h @@ -293,7 +293,7 @@ class CFDE_XMLSyntaxParser : public IFDE_XMLSyntaxParser, public CFX_Target { virtual void Init(IFX_Stream* pStream, int32_t iXMLPlaneSize, int32_t iTextDataSize = 256); - virtual FX_DWORD DoSyntaxParse(); + virtual uint32_t DoSyntaxParse(); virtual int32_t GetStatus() const; virtual int32_t GetCurrentPos() const { return m_iParsedChars + (m_pStart - m_pBuffer); @@ -342,8 +342,8 @@ class CFDE_XMLSyntaxParser : public IFDE_XMLSyntaxParser, public CFX_Target { FX_WCHAR* m_pCurrentBlock; int32_t m_iIndexInBlock; int32_t m_iTextDataLength; - FX_DWORD m_dwStatus; - FX_DWORD m_dwMode; + uint32_t m_dwStatus; + uint32_t m_dwMode; FX_WCHAR m_wQuotationMark; int32_t m_iEntityStart; CFX_DWordStack m_SkipStack; diff --git a/xfa/fee/fde_txtedtengine.h b/xfa/fee/fde_txtedtengine.h index 170c0598de..947570e4a4 100644 --- a/xfa/fee/fde_txtedtengine.h +++ b/xfa/fee/fde_txtedtengine.h @@ -187,7 +187,7 @@ class CFDE_TxtEdtEngine : public IFDE_TxtEdtEngine { FX_BOOL m_bBefore; int32_t m_nCaretPage; CFX_RectF m_rtCaret; - FX_DWORD m_dwFindFlags; + uint32_t m_dwFindFlags; FX_BOOL m_bLock; int32_t m_nLimit; FX_WCHAR m_wcAliasChar; diff --git a/xfa/fee/fde_txtedtpage.h b/xfa/fee/fde_txtedtpage.h index c7a3cb522a..13a444f0da 100644 --- a/xfa/fee/fde_txtedtpage.h +++ b/xfa/fee/fde_txtedtpage.h @@ -64,7 +64,7 @@ struct FDE_TEXTEDITPIECE { int32_t nCount; int32_t nBidiLevel; CFX_RectF rtPiece; - FX_DWORD dwCharStyles; + uint32_t dwCharStyles; }; typedef CFX_MassArrayTemplate CFDE_TXTEDTPieceMassArray; diff --git a/xfa/fee/ifde_txtedtengine.h b/xfa/fee/ifde_txtedtengine.h index 47700b04c7..047bf50b4e 100644 --- a/xfa/fee/ifde_txtedtengine.h +++ b/xfa/fee/ifde_txtedtengine.h @@ -110,9 +110,9 @@ struct _FDE_TXTEDTPARAMS { FX_FLOAT fPlateWidth; FX_FLOAT fPlateHeight; int32_t nLineCount; - FX_DWORD dwLayoutStyles; - FX_DWORD dwAlignment; - FX_DWORD dwMode; + uint32_t dwLayoutStyles; + uint32_t dwAlignment; + uint32_t dwMode; IFX_Font* pFont; FX_FLOAT fFontSize; FX_ARGB dwFontColor; 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(); diff --git a/xfa/fwl/basewidget/fwl_barcodeimp.h b/xfa/fwl/basewidget/fwl_barcodeimp.h index 2f12782c69..77b3552a63 100644 --- a/xfa/fwl/basewidget/fwl_barcodeimp.h +++ b/xfa/fwl/basewidget/fwl_barcodeimp.h @@ -25,7 +25,7 @@ class CFWL_BarcodeImp : public CFWL_EditImp { IFWL_Widget* pOuter); virtual ~CFWL_BarcodeImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR Update(); @@ -40,7 +40,7 @@ class CFWL_BarcodeImp : public CFWL_EditImp { void CreateBarcodeEngine(); void ReleaseBarcodeEngine(); IFX_Barcode* m_pBarcodeEngine; - FX_DWORD m_dwStatus; + uint32_t m_dwStatus; BC_TYPE m_type; friend class CFWL_BarcodeImpDelegate; }; diff --git a/xfa/fwl/basewidget/fwl_caretimp.h b/xfa/fwl/basewidget/fwl_caretimp.h index c4b6015c01..47c3a1a7f5 100644 --- a/xfa/fwl/basewidget/fwl_caretimp.h +++ b/xfa/fwl/basewidget/fwl_caretimp.h @@ -22,7 +22,7 @@ class CFWL_CaretImp : public CFWL_WidgetImp { virtual ~CFWL_CaretImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); @@ -31,8 +31,8 @@ class CFWL_CaretImp : public CFWL_WidgetImp { const CFX_Matrix* pMatrix = NULL); virtual FWL_ERR ShowCaret(FX_BOOL bFlag = TRUE); - virtual FWL_ERR GetFrequency(FX_DWORD& elapse); - virtual FWL_ERR SetFrequency(FX_DWORD elapse); + virtual FWL_ERR GetFrequency(uint32_t& elapse); + virtual FWL_ERR SetFrequency(uint32_t elapse); virtual FWL_ERR SetColor(CFX_Color crFill); protected: @@ -48,7 +48,7 @@ class CFWL_CaretImp : public CFWL_WidgetImp { }; CFWL_CaretTimer* m_pTimer; FWL_HTIMER m_hTimer; - FX_DWORD m_dwElapse; + uint32_t m_dwElapse; CFX_Color m_crFill; FX_BOOL m_bSetColor; friend class CFWL_CaretImpDelegate; diff --git a/xfa/fwl/basewidget/fwl_checkboximp.h b/xfa/fwl/basewidget/fwl_checkboximp.h index b5d0d153a7..fe0ebb05cb 100644 --- a/xfa/fwl/basewidget/fwl_checkboximp.h +++ b/xfa/fwl/basewidget/fwl_checkboximp.h @@ -20,7 +20,7 @@ class CFWL_CheckBoxImp : public CFWL_WidgetImp { IFWL_Widget* pOuter); ~CFWL_CheckBoxImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); @@ -32,14 +32,14 @@ class CFWL_CheckBoxImp : public CFWL_WidgetImp { protected: void Layout(); - FX_DWORD GetPartStates(); + uint32_t GetPartStates(); void UpdateTextOutStyles(); void NextStates(); CFX_RectF m_rtClient; CFX_RectF m_rtBox; CFX_RectF m_rtCaption; CFX_RectF m_rtFocus; - FX_DWORD m_dwTTOStyles; + uint32_t m_dwTTOStyles; int32_t m_iTTOAlign; FX_BOOL m_bBtnDown; friend class CFWL_CheckBoxImpDelegate; diff --git a/xfa/fwl/basewidget/fwl_comboboximp.h b/xfa/fwl/basewidget/fwl_comboboximp.h index 74f6c6354d..262db35082 100644 --- a/xfa/fwl/basewidget/fwl_comboboximp.h +++ b/xfa/fwl/basewidget/fwl_comboboximp.h @@ -85,15 +85,15 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp { IFWL_Widget* pOuter); virtual ~CFWL_ComboBoxImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_ERR ModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); - virtual FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE); + virtual FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); + virtual FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); virtual FWL_ERR Update(); - virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy); + virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL); virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); @@ -128,8 +128,8 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp { virtual FX_BOOL EditDelete(); virtual FX_BOOL EditDeSelect(); virtual FWL_ERR GetBBox(CFX_RectF& rect); - virtual FWL_ERR EditModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); + virtual FWL_ERR EditModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); protected: void DrawStretchHandler(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix); @@ -150,10 +150,10 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp { void DisForm_InitComboEdit(); void DisForm_ShowDropList(FX_BOOL bActivate); FX_BOOL DisForm_IsDropListShowed(); - FWL_ERR DisForm_ModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); + FWL_ERR DisForm_ModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); FWL_ERR DisForm_Update(); - FX_DWORD DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy); + uint32_t DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy); FWL_ERR DisForm_DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL); FWL_ERR DisForm_GetBBox(CFX_RectF& rect); diff --git a/xfa/fwl/basewidget/fwl_datetimepickerimp.h b/xfa/fwl/basewidget/fwl_datetimepickerimp.h index 9a4b920aed..68e85050e4 100644 --- a/xfa/fwl/basewidget/fwl_datetimepickerimp.h +++ b/xfa/fwl/basewidget/fwl_datetimepickerimp.h @@ -108,12 +108,12 @@ class CFWL_DateTimePickerImp : public CFWL_WidgetImp { IFWL_Widget* pOuter); virtual ~CFWL_DateTimePickerImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); virtual FWL_ERR Update(); - virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy); + virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL); virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pTP); @@ -140,8 +140,8 @@ class CFWL_DateTimePickerImp : public CFWL_WidgetImp { virtual FX_BOOL DeSelect(); virtual FWL_ERR GetBBox(CFX_RectF& rect); virtual FWL_ERR SetEditLimit(int32_t nLimit); - virtual FWL_ERR ModifyEditStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); + virtual FWL_ERR ModifyEditStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); public: IFWL_DateTimeEdit* GetDataTimeEdit(); @@ -166,7 +166,7 @@ class CFWL_DateTimePickerImp : public CFWL_WidgetImp { void DisForm_InitDateTimeEdit(); FX_BOOL DisForm_IsMonthCalendarShowed(); void DisForm_ShowMonthCalendar(FX_BOOL bActivate); - FX_DWORD DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy); + uint32_t DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy); FX_BOOL DisForm_IsNeedShowButton(); FWL_ERR DisForm_Update(); FWL_ERR DisForm_GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); diff --git a/xfa/fwl/basewidget/fwl_editimp.h b/xfa/fwl/basewidget/fwl_editimp.h index 3dcf48e1ae..f8fb1aa37d 100644 --- a/xfa/fwl/basewidget/fwl_editimp.h +++ b/xfa/fwl/basewidget/fwl_editimp.h @@ -31,14 +31,14 @@ class CFWL_EditImp : public CFWL_WidgetImp, public IFDE_TxtEdtEventSink { // CFWL_WidgetImp: FWL_ERR GetClassName(CFX_WideString& wsClass) const override; - FX_DWORD GetClassID() const override; + uint32_t GetClassID() const override; FWL_ERR Initialize() override; FWL_ERR Finalize() override; FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; FWL_ERR SetWidgetRect(const CFX_RectF& rect) override; FWL_ERR Update() override; - FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy) override; - FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE) override; + uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy) override; + FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE) override; FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL) override; FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) override; @@ -109,7 +109,7 @@ class CFWL_EditImp : public CFWL_WidgetImp, public IFDE_TxtEdtEventSink { CFX_WideString& wsBlockText) override; FX_BOOL On_Validate(IFDE_TxtEdtEngine* pEdit, CFX_WideString& wsText) override; - virtual FWL_ERR SetBackgroundColor(FX_DWORD color); + virtual FWL_ERR SetBackgroundColor(uint32_t color); virtual FWL_ERR SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize); void SetScrollOffset(FX_FLOAT fScrollOffset); FX_BOOL GetSuggestWords(CFX_PointF pointf, @@ -177,7 +177,7 @@ class CFWL_EditImp : public CFWL_WidgetImp, public IFDE_TxtEdtEventSink { CFX_WideString m_wsCache; friend class CFWL_TxtEdtEventSink; friend class CFWL_EditImpDelegate; - FX_DWORD m_backColor; + uint32_t m_backColor; FX_BOOL m_updateBackColor; CFX_WideString m_wsFont; CFX_ByteStringArray m_RecordArr; @@ -204,7 +204,7 @@ class CFWL_EditImpDelegate : public CFWL_WidgetImpDelegate { void OnMouseMove(CFWL_MsgMouse* pMsg); void OnKeyDown(CFWL_MsgKey* pMsg); void OnChar(CFWL_MsgKey* pMsg); - FX_BOOL OnScroll(IFWL_ScrollBar* pScrollBar, FX_DWORD dwCode, FX_FLOAT fPos); + FX_BOOL OnScroll(IFWL_ScrollBar* pScrollBar, uint32_t dwCode, FX_FLOAT fPos); void DoCursor(CFWL_MsgMouse* pMsg); CFWL_EditImp* m_pOwner; }; diff --git a/xfa/fwl/basewidget/fwl_formproxyimp.h b/xfa/fwl/basewidget/fwl_formproxyimp.h index c26f21a0d1..4e5e807507 100644 --- a/xfa/fwl/basewidget/fwl_formproxyimp.h +++ b/xfa/fwl/basewidget/fwl_formproxyimp.h @@ -19,7 +19,7 @@ class CFWL_FormProxyImp : public CFWL_FormImp { IFWL_Widget* pOuter); ~CFWL_FormProxyImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); diff --git a/xfa/fwl/basewidget/fwl_listboximp.h b/xfa/fwl/basewidget/fwl_listboximp.h index a4f9188b4d..1dd0db1b4c 100644 --- a/xfa/fwl/basewidget/fwl_listboximp.h +++ b/xfa/fwl/basewidget/fwl_listboximp.h @@ -26,12 +26,12 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp { IFWL_Widget* pOuter); ~CFWL_ListBoxImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); virtual FWL_ERR Update(); - virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy); + virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL); virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); @@ -44,7 +44,7 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp { virtual FWL_ERR* Sort(IFWL_ListBoxCompare* pCom); protected: - FWL_HLISTITEM GetItem(FWL_HLISTITEM hItem, FX_DWORD dwKeyCode); + FWL_HLISTITEM GetItem(FWL_HLISTITEM hItem, uint32_t dwKeyCode); void SetSelection(FWL_HLISTITEM hStart, FWL_HLISTITEM hEnd, FX_BOOL bSelected); @@ -92,7 +92,7 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp { CFX_RectF m_rtConent; std::unique_ptr m_pHorzScrollBar; std::unique_ptr m_pVertScrollBar; - FX_DWORD m_dwTTOStyles; + uint32_t m_dwTTOStyles; int32_t m_iTTOAligns; FWL_HLISTITEM m_hAnchor; FX_FLOAT m_fItemHeight; @@ -116,7 +116,7 @@ class CFWL_ListBoxImpDelegate : public CFWL_WidgetImpDelegate { void OnMouseWheel(CFWL_MsgMouseWheel* pMsg); void OnKeyDown(CFWL_MsgKey* pMsg); void OnVK(FWL_HLISTITEM hItem, FX_BOOL bShift, FX_BOOL bCtrl); - FX_BOOL OnScroll(IFWL_ScrollBar* pScrollBar, FX_DWORD dwCode, FX_FLOAT fPos); + FX_BOOL OnScroll(IFWL_ScrollBar* pScrollBar, uint32_t dwCode, FX_FLOAT fPos); void DispatchSelChangedEv(); CFWL_ListBoxImp* m_pOwner; }; diff --git a/xfa/fwl/basewidget/fwl_monthcalendarimp.h b/xfa/fwl/basewidget/fwl_monthcalendarimp.h index f1c12b5302..c67848fd1d 100644 --- a/xfa/fwl/basewidget/fwl_monthcalendarimp.h +++ b/xfa/fwl/basewidget/fwl_monthcalendarimp.h @@ -23,7 +23,7 @@ class CFWL_MonthCalendarImp : public CFWL_WidgetImp { IFWL_Widget* pOuter); ~CFWL_MonthCalendarImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); @@ -209,7 +209,7 @@ class CFWL_MonthCalendarImp : public CFWL_WidgetImp { struct FWL_DATEINFO { FWL_DATEINFO(int32_t day, int32_t dayofweek, - FX_DWORD dwSt, + uint32_t dwSt, CFX_RectF rc, CFX_WideString& wsday) : iDay(day), @@ -219,7 +219,7 @@ struct FWL_DATEINFO { wsDay(wsday) {} int32_t iDay; int32_t iDayOfWeek; - FX_DWORD dwStates; + uint32_t dwStates; CFX_RectF rect; CFX_WideString wsDay; }; diff --git a/xfa/fwl/basewidget/fwl_pictureboximp.h b/xfa/fwl/basewidget/fwl_pictureboximp.h index c848e980af..f2e67124f6 100644 --- a/xfa/fwl/basewidget/fwl_pictureboximp.h +++ b/xfa/fwl/basewidget/fwl_pictureboximp.h @@ -19,7 +19,7 @@ class CFWL_PictureBoxImp : public CFWL_WidgetImp { IFWL_Widget* pOuter); ~CFWL_PictureBoxImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); diff --git a/xfa/fwl/basewidget/fwl_pushbuttonimp.h b/xfa/fwl/basewidget/fwl_pushbuttonimp.h index 8c0d5f3395..be6941249c 100644 --- a/xfa/fwl/basewidget/fwl_pushbuttonimp.h +++ b/xfa/fwl/basewidget/fwl_pushbuttonimp.h @@ -20,11 +20,11 @@ class CFWL_PushButtonImp : public CFWL_WidgetImp { IFWL_Widget* pOuter); virtual ~CFWL_PushButtonImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE); + virtual FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); virtual FWL_ERR Update(); virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL); @@ -36,12 +36,12 @@ class CFWL_PushButtonImp : public CFWL_WidgetImp { void DrawText(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); - FX_DWORD GetPartStates(); + uint32_t GetPartStates(); void UpdateTextOutStyles(); CFX_RectF m_rtClient; CFX_RectF m_rtCaption; FX_BOOL m_bBtnDown; - FX_DWORD m_dwTTOStyles; + uint32_t m_dwTTOStyles; int32_t m_iTTOAlign; friend class CFWL_PushButtonImpDelegate; }; diff --git a/xfa/fwl/basewidget/fwl_scrollbarimp.h b/xfa/fwl/basewidget/fwl_scrollbarimp.h index a06e47aada..08f7c69bf7 100644 --- a/xfa/fwl/basewidget/fwl_scrollbarimp.h +++ b/xfa/fwl/basewidget/fwl_scrollbarimp.h @@ -20,7 +20,7 @@ class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer { IFWL_Widget* pOuter); ~CFWL_ScrollBarImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); @@ -38,7 +38,7 @@ class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer { virtual FWL_ERR SetPos(FX_FLOAT fPos); virtual FX_FLOAT GetTrackPos(); virtual FWL_ERR SetTrackPos(FX_FLOAT fTrackPos); - virtual FX_BOOL DoScroll(FX_DWORD dwCode, FX_FLOAT fPos = 0.0f); + virtual FX_BOOL DoScroll(uint32_t dwCode, FX_FLOAT fPos = 0.0f); virtual FWL_ERR SetOuter(IFWL_Widget* pOuter); virtual int32_t Run(FWL_HTIMER hTimer); @@ -64,7 +64,7 @@ class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer { FX_FLOAT GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy); void GetTrackRect(CFX_RectF& rect, FX_BOOL bLower = TRUE); FX_BOOL SendEvent(); - FX_BOOL OnScroll(FX_DWORD dwCode, FX_FLOAT fPos); + FX_BOOL OnScroll(uint32_t dwCode, FX_FLOAT fPos); FWL_HTIMER m_hTimer; FX_FLOAT m_fRangeMin; @@ -106,13 +106,13 @@ class CFWL_ScrollBarImpDelegate : public CFWL_WidgetImpDelegate { const CFX_Matrix* pMatrix = NULL) override; protected: - void OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - void OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - void OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); + void OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + void OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + void OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); void OnMouseLeave(); void OnMouseWheel(FX_FLOAT fx, FX_FLOAT fy, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fDeltaX, FX_FLOAT fDeltaY); void DoMouseDown(int32_t iItem, diff --git a/xfa/fwl/basewidget/fwl_spinbuttonimp.h b/xfa/fwl/basewidget/fwl_spinbuttonimp.h index 7f04ae5c1c..71e2a6dd61 100644 --- a/xfa/fwl/basewidget/fwl_spinbuttonimp.h +++ b/xfa/fwl/basewidget/fwl_spinbuttonimp.h @@ -21,12 +21,12 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer { IFWL_Widget* pOuter); ~CFWL_SpinButtonImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); virtual FWL_ERR Update(); - virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy); + virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL); virtual int32_t Run(FWL_HTIMER hTimer); @@ -43,8 +43,8 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer { CFX_RectF m_rtClient; CFX_RectF m_rtUpButton; CFX_RectF m_rtDnButton; - FX_DWORD m_dwUpState; - FX_DWORD m_dwDnState; + uint32_t m_dwUpState; + uint32_t m_dwDnState; int32_t m_iButtonIndex; FX_BOOL m_bLButtonDwn; FWL_HTIMER m_hTimer; diff --git a/xfa/fwl/basewidget/fwl_tooltipctrlimp.h b/xfa/fwl/basewidget/fwl_tooltipctrlimp.h index 121f302572..119c3e1159 100644 --- a/xfa/fwl/basewidget/fwl_tooltipctrlimp.h +++ b/xfa/fwl/basewidget/fwl_tooltipctrlimp.h @@ -21,14 +21,14 @@ class CFWL_ToolTipImp : public CFWL_FormImp { IFWL_Widget* pOuter); virtual ~CFWL_ToolTipImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); virtual FWL_ERR Update(); virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL); - virtual FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet); + virtual FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet); virtual FWL_ERR GetClientRect(CFX_RectF& rect); FWL_ERR SetAnchor(const CFX_RectF& rtAnchor); FWL_ERR Show(); @@ -54,7 +54,7 @@ class CFWL_ToolTipImp : public CFWL_FormImp { CFX_RectF m_rtClient; CFX_RectF m_rtCaption; FX_BOOL m_bBtnDown; - FX_DWORD m_dwTTOStyles; + uint32_t m_dwTTOStyles; int32_t m_iTTOAlign; CFX_RectF m_rtAnchor; FWL_HTIMER m_hTimerShow; diff --git a/xfa/fwl/basewidget/ifwl_barcode.h b/xfa/fwl/basewidget/ifwl_barcode.h index 250e608da7..0dbdcb03c1 100644 --- a/xfa/fwl/basewidget/ifwl_barcode.h +++ b/xfa/fwl/basewidget/ifwl_barcode.h @@ -47,7 +47,7 @@ class IFWL_BarcodeDP : public IFWL_EditDP { virtual int32_t GetVersion() = 0; virtual int32_t GetErrorCorrectionLevel() = 0; virtual FX_BOOL GetTruncated() = 0; - virtual FX_DWORD GetBarcodeAttributeMask() = 0; + virtual uint32_t GetBarcodeAttributeMask() = 0; }; class IFWL_Barcode : public IFWL_Edit { diff --git a/xfa/fwl/basewidget/ifwl_caret.h b/xfa/fwl/basewidget/ifwl_caret.h index 5b0138f6ce..229bf12198 100644 --- a/xfa/fwl/basewidget/ifwl_caret.h +++ b/xfa/fwl/basewidget/ifwl_caret.h @@ -22,8 +22,8 @@ class IFWL_Caret : public IFWL_Widget { IFWL_Widget* pOuter); FWL_ERR ShowCaret(FX_BOOL bFlag = TRUE); - FWL_ERR GetFrequency(FX_DWORD& elapse); - FWL_ERR SetFrequency(FX_DWORD elapse); + FWL_ERR GetFrequency(uint32_t& elapse); + FWL_ERR SetFrequency(uint32_t elapse); FWL_ERR SetColor(CFX_Color crFill); protected: diff --git a/xfa/fwl/basewidget/ifwl_combobox.h b/xfa/fwl/basewidget/ifwl_combobox.h index 93efe287b2..98a6750278 100644 --- a/xfa/fwl/basewidget/ifwl_combobox.h +++ b/xfa/fwl/basewidget/ifwl_combobox.h @@ -142,8 +142,8 @@ class IFWL_ComboBox : public IFWL_Widget { FX_BOOL EditDelete(); FX_BOOL EditDeSelect(); FWL_ERR GetBBox(CFX_RectF& rect); - FWL_ERR EditModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); + FWL_ERR EditModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); protected: IFWL_ComboBox(); diff --git a/xfa/fwl/basewidget/ifwl_datetimepicker.h b/xfa/fwl/basewidget/ifwl_datetimepicker.h index 25c69682a9..f2a91aba64 100644 --- a/xfa/fwl/basewidget/ifwl_datetimepicker.h +++ b/xfa/fwl/basewidget/ifwl_datetimepicker.h @@ -105,8 +105,8 @@ class IFWL_DateTimePicker : public IFWL_Widget { FX_BOOL DeSelect(); FWL_ERR GetBBox(CFX_RectF& rect); FWL_ERR SetEditLimit(int32_t nLimit); - FWL_ERR ModifyEditStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); + FWL_ERR ModifyEditStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); protected: IFWL_DateTimePicker(); diff --git a/xfa/fwl/basewidget/ifwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h index 74b66e8779..f77714122d 100644 --- a/xfa/fwl/basewidget/ifwl_edit.h +++ b/xfa/fwl/basewidget/ifwl_edit.h @@ -163,7 +163,7 @@ class IFWL_Edit : public IFWL_Widget { FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant); FWL_ERR SetOuter(IFWL_Widget* pOuter); FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax); - FWL_ERR SetBackColor(FX_DWORD dwColor); + FWL_ERR SetBackColor(uint32_t dwColor); FWL_ERR SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize); void SetScrollOffset(FX_FLOAT fScrollOffset); FX_BOOL GetSuggestWords(CFX_PointF pointf, diff --git a/xfa/fwl/basewidget/ifwl_listbox.h b/xfa/fwl/basewidget/ifwl_listbox.h index 7bec4edd18..1225eafcba 100644 --- a/xfa/fwl/basewidget/ifwl_listbox.h +++ b/xfa/fwl/basewidget/ifwl_listbox.h @@ -80,7 +80,7 @@ class IFWL_ListBoxDP : public IFWL_DataProvider { virtual FX_BOOL SetItemIndex(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, int32_t nIndex) = 0; - virtual FX_DWORD GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) = 0; + virtual uint32_t GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) = 0; virtual FWL_ERR GetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, CFX_WideString& wsText) = 0; @@ -90,7 +90,7 @@ class IFWL_ListBoxDP : public IFWL_DataProvider { virtual void* GetItemData(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) = 0; virtual FWL_ERR SetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwStyle) = 0; + uint32_t dwStyle) = 0; virtual FWL_ERR SetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText) = 0; @@ -106,11 +106,11 @@ class IFWL_ListBoxDP : public IFWL_DataProvider { virtual FWL_ERR SetItemCheckRect(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtCheck) = 0; - virtual FX_DWORD GetItemCheckState(IFWL_Widget* pWidget, + virtual uint32_t GetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) = 0; virtual FWL_ERR SetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwCheckState) = 0; + uint32_t dwCheckState) = 0; }; class IFWL_ListBoxCompare { diff --git a/xfa/fwl/basewidget/ifwl_scrollbar.h b/xfa/fwl/basewidget/ifwl_scrollbar.h index c481332132..a5b17eab90 100644 --- a/xfa/fwl/basewidget/ifwl_scrollbar.h +++ b/xfa/fwl/basewidget/ifwl_scrollbar.h @@ -68,7 +68,7 @@ class IFWL_ScrollBar : public IFWL_Widget { FWL_ERR SetPos(FX_FLOAT fPos); FX_FLOAT GetTrackPos(); FWL_ERR SetTrackPos(FX_FLOAT fTrackPos); - FX_BOOL DoScroll(FX_DWORD dwCode, FX_FLOAT fPos = 0.0f); + FX_BOOL DoScroll(uint32_t dwCode, FX_FLOAT fPos = 0.0f); protected: IFWL_ScrollBar(); diff --git a/xfa/fwl/core/cfwl_event.h b/xfa/fwl/core/cfwl_event.h index 97ca1d31a1..5f7a135372 100644 --- a/xfa/fwl/core/cfwl_event.h +++ b/xfa/fwl/core/cfwl_event.h @@ -70,7 +70,7 @@ class CFWL_Event : public CFWL_Note { wsClass = L## #classname; \ return FWL_ERR_Succeeded; \ } \ - virtual FX_DWORD GetClassID() const { return eventhashcode; } + virtual uint32_t GetClassID() const { return eventhashcode; } #define END_FWL_EVENT_DEF \ } \ @@ -79,8 +79,8 @@ class CFWL_Event : public CFWL_Note { BEGIN_FWL_EVENT_DEF(CFWL_EvtMouse, FWL_EVTHASH_Mouse) FX_FLOAT m_fx; FX_FLOAT m_fy; -FX_DWORD m_dwFlags; -FX_DWORD m_dwCmd; +uint32_t m_dwFlags; +uint32_t m_dwCmd; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtMouseWheel, FWL_EVTHASH_MouseWheel) @@ -88,13 +88,13 @@ FX_FLOAT m_fx; FX_FLOAT m_fy; FX_FLOAT m_fDeltaX; FX_FLOAT m_fDeltaY; -FX_DWORD m_dwFlags; +uint32_t m_dwFlags; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtKey, FWL_EVTHASH_Key) -FX_DWORD m_dwKeyCode; -FX_DWORD m_dwFlags; -FX_DWORD m_dwCmd; +uint32_t m_dwKeyCode; +uint32_t m_dwFlags; +uint32_t m_dwCmd; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtSetFocus, FWL_EVTHASH_SetFocus) @@ -114,7 +114,7 @@ BEGIN_FWL_EVENT_DEF(CFWL_EvtClick, FWL_EVTHASH_Click) END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtScroll, FWL_EVTHASH_Scroll) -FX_DWORD m_iScrollCode; +uint32_t m_iScrollCode; FX_FLOAT m_fPos; FX_BOOL* m_pRet; END_FWL_EVENT_DEF diff --git a/xfa/fwl/core/cfwl_message.h b/xfa/fwl/core/cfwl_message.h index f3e4a58602..7bd6af1977 100644 --- a/xfa/fwl/core/cfwl_message.h +++ b/xfa/fwl/core/cfwl_message.h @@ -78,7 +78,7 @@ class CFWL_Message : public CFWL_Note { wsClass = L## #classname; \ return FWL_ERR_Succeeded; \ } \ - virtual FX_DWORD GetClassID() const { return msghashcode; } + virtual uint32_t GetClassID() const { return msghashcode; } #define END_FWL_MESSAGE_DEF \ } \ @@ -93,8 +93,8 @@ END_FWL_MESSAGE_DEF BEGIN_FWL_MESSAGE_DEF(CFWL_MsgMouse, FWL_MSGHASH_Mouse) FX_FLOAT m_fx; FX_FLOAT m_fy; -FX_DWORD m_dwFlags; -FX_DWORD m_dwCmd; +uint32_t m_dwFlags; +uint32_t m_dwCmd; END_FWL_MESSAGE_DEF BEGIN_FWL_MESSAGE_DEF(CFWL_MsgMouseWheel, FWL_MSGHASH_MouseWheel) @@ -102,7 +102,7 @@ FX_FLOAT m_fx; FX_FLOAT m_fy; FX_FLOAT m_fDeltaX; FX_FLOAT m_fDeltaY; -FX_DWORD m_dwFlags; +uint32_t m_dwFlags; END_FWL_MESSAGE_DEF BEGIN_FWL_MESSAGE_DEF(CFWL_MsgSetFocus, FWL_MSGHASH_SetFocus) @@ -114,9 +114,9 @@ IFWL_Widget* m_pSetFocus; END_FWL_MESSAGE_DEF BEGIN_FWL_MESSAGE_DEF(CFWL_MsgKey, FWL_MSGHASH_Key) -FX_DWORD m_dwKeyCode; -FX_DWORD m_dwFlags; -FX_DWORD m_dwCmd; +uint32_t m_dwKeyCode; +uint32_t m_dwFlags; +uint32_t m_dwCmd; END_FWL_MESSAGE_DEF BEGIN_FWL_MESSAGE_DEF(CFWL_MsgCursor, FWL_MSGHASH_Cursor) diff --git a/xfa/fwl/core/cfwl_note.h b/xfa/fwl/core/cfwl_note.h index c0f105388c..d173dc6f76 100644 --- a/xfa/fwl/core/cfwl_note.h +++ b/xfa/fwl/core/cfwl_note.h @@ -17,9 +17,9 @@ class IFWL_Widget; // get cast to IFWL_* types. class CFWL_Note { public: - virtual FX_DWORD Release() { + virtual uint32_t Release() { m_dwRefCount--; - FX_DWORD dwRefCount = m_dwRefCount; + uint32_t dwRefCount = m_dwRefCount; if (!m_dwRefCount) delete this; return dwRefCount; @@ -35,7 +35,7 @@ class CFWL_Note { return FWL_ERR_Succeeded; } - virtual FX_DWORD GetClassID() const { return 0; } + virtual uint32_t GetClassID() const { return 0; } virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const { return TRUE; @@ -46,7 +46,7 @@ class CFWL_Note { IFWL_Widget* m_pSrcTarget; IFWL_Widget* m_pDstTarget; - FX_DWORD m_dwExtend; + uint32_t m_dwExtend; protected: CFWL_Note(FX_BOOL bIsEvent) @@ -60,7 +60,7 @@ class CFWL_Note { virtual FX_BOOL Initialize() { return TRUE; } virtual int32_t Finalize() { return 0; } - FX_DWORD m_dwRefCount; + uint32_t m_dwRefCount; FX_BOOL m_bIsEvent; }; diff --git a/xfa/fwl/core/cfwl_themepart.h b/xfa/fwl/core/cfwl_themepart.h index ddbdc321b2..884f38101f 100644 --- a/xfa/fwl/core/cfwl_themepart.h +++ b/xfa/fwl/core/cfwl_themepart.h @@ -23,8 +23,8 @@ class CFWL_ThemePart { CFX_RectF m_rtPart; IFWL_Widget* m_pWidget; int32_t m_iPart; - FX_DWORD m_dwStates; - FX_DWORD m_dwData; + uint32_t m_dwStates; + uint32_t m_dwData; void* m_pData; }; diff --git a/xfa/fwl/core/cfwl_themetext.h b/xfa/fwl/core/cfwl_themetext.h index e4c0e92ed1..7f3dde91d8 100644 --- a/xfa/fwl/core/cfwl_themetext.h +++ b/xfa/fwl/core/cfwl_themetext.h @@ -15,7 +15,7 @@ class CFWL_ThemeText : public CFWL_ThemePart { public: CFWL_ThemeText() : m_pGraphics(NULL) {} CFX_WideString m_wsText; - FX_DWORD m_dwTTOStyles; + uint32_t m_dwTTOStyles; int32_t m_iTTOAlign; CFX_Graphics* m_pGraphics; }; diff --git a/xfa/fwl/core/cfwl_widgetimpproperties.h b/xfa/fwl/core/cfwl_widgetimpproperties.h index 7a3bab603d..8b1cf864d4 100644 --- a/xfa/fwl/core/cfwl_widgetimpproperties.h +++ b/xfa/fwl/core/cfwl_widgetimpproperties.h @@ -31,9 +31,9 @@ class CFWL_WidgetImpProperties { CFX_Matrix m_ctmOnParent; CFX_RectF m_rtWidget; - FX_DWORD m_dwStyles; - FX_DWORD m_dwStyleExes; - FX_DWORD m_dwStates; + uint32_t m_dwStyles; + uint32_t m_dwStyleExes; + uint32_t m_dwStates; IFWL_ThemeProvider* m_pThemeProvider; IFWL_DataProvider* m_pDataProvider; IFWL_Widget* m_pParent; diff --git a/xfa/fwl/core/fwl_formimp.h b/xfa/fwl/core/fwl_formimp.h index e5c0f8022e..fbfdfae271 100644 --- a/xfa/fwl/core/fwl_formimp.h +++ b/xfa/fwl/core/fwl_formimp.h @@ -53,7 +53,7 @@ class CFWL_SysBtn { } CFX_RectF m_rtBtn; - FX_DWORD m_dwState; + uint32_t m_dwState; }; enum FORM_RESIZETYPE { FORM_RESIZETYPE_None = 0, @@ -76,7 +76,7 @@ class CFWL_FormImp : public CFWL_PanelImp { CFWL_FormImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); virtual ~CFWL_FormImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); @@ -84,13 +84,13 @@ class CFWL_FormImp : public CFWL_PanelImp { virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); virtual FWL_ERR GetClientRect(CFX_RectF& rect); virtual FWL_ERR Update(); - virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy); + virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL); virtual FWL_FORMSIZE GetFormSize(); virtual FWL_ERR SetFormSize(FWL_FORMSIZE eFormSize); virtual IFWL_Widget* DoModal(); - virtual IFWL_Widget* DoModal(FX_DWORD& dwCommandID); + virtual IFWL_Widget* DoModal(uint32_t& dwCommandID); virtual FWL_ERR EndDoModal(); virtual FWL_ERR SetBorderRegion(CFX_Path* pPath); virtual void DrawBackground(CFX_Graphics* pGraphics, @@ -105,7 +105,7 @@ class CFWL_FormImp : public CFWL_PanelImp { void RemoveSysButtons(); void CalcContentRect(CFX_RectF& rtContent); CFWL_SysBtn* GetSysBtnAtPoint(FX_FLOAT fx, FX_FLOAT fy); - CFWL_SysBtn* GetSysBtnByState(FX_DWORD dwState); + CFWL_SysBtn* GetSysBtnByState(uint32_t dwState); CFWL_SysBtn* GetSysBtnByIndex(int32_t nIndex); int32_t GetSysBtnIndex(CFWL_SysBtn* pBtn); FX_FLOAT GetCaptionHeight(); diff --git a/xfa/fwl/core/fwl_gridimp.h b/xfa/fwl/core/fwl_gridimp.h index 3329cb779d..1ba773d95b 100644 --- a/xfa/fwl/core/fwl_gridimp.h +++ b/xfa/fwl/core/fwl_gridimp.h @@ -65,7 +65,7 @@ class CFWL_GridWidgetInfo { int32_t m_iRow; int32_t m_iRowSpan; CFWL_GridLength m_Size[6]; - FX_DWORD m_dwMarginFlag; + uint32_t m_dwMarginFlag; FX_FLOAT m_Margin[4]; FX_FLOAT m_fActualWidth; FX_FLOAT m_fActualHeight; @@ -76,7 +76,7 @@ class CFWL_GridImp : public CFWL_ContentImp { CFWL_GridImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); virtual ~CFWL_GridImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); diff --git a/xfa/fwl/core/fwl_noteimp.h b/xfa/fwl/core/fwl_noteimp.h index 57c70edee0..8f3e0c3737 100644 --- a/xfa/fwl/core/fwl_noteimp.h +++ b/xfa/fwl/core/fwl_noteimp.h @@ -42,7 +42,7 @@ class CFWL_NoteLoop : public IFWL_NoteLoop { FWL_ERR SetMainForm(CFWL_WidgetImp* pForm); protected: - void GenerateCommondEvent(FX_DWORD dwCommand); + void GenerateCommondEvent(uint32_t dwCommand); CFWL_WidgetImp* m_pForm; FX_BOOL m_bContinueModal; @@ -57,7 +57,7 @@ class CFWL_NoteDriver : public IFWL_NoteDriver { FX_BOOL SendNote(CFWL_Note* pNote) override; FWL_ERR RegisterEventTarget(IFWL_Widget* pListener, IFWL_Widget* pEventSource = NULL, - FX_DWORD dwFilter = FWL_EVENT_ALL_MASK) override; + uint32_t dwFilter = FWL_EVENT_ALL_MASK) override; FWL_ERR UnregisterEventTarget(IFWL_Widget* pListener) override; void ClearEventTargets(FX_BOOL bRemoveAll) override; int32_t GetQueueMaxSize() const override; @@ -116,7 +116,7 @@ class CFWL_NoteDriver : public IFWL_NoteDriver { void* m_hookInfo; }; -typedef CFX_MapPtrTemplate CFWL_EventSource; +typedef CFX_MapPtrTemplate CFWL_EventSource; class CFWL_EventTarget { public: @@ -124,9 +124,9 @@ class CFWL_EventTarget { : m_pListener(pListener), m_pNoteDriver(pNoteDriver), m_bInvalid(FALSE) {} ~CFWL_EventTarget(); int32_t SetEventSource(IFWL_Widget* pSource, - FX_DWORD dwFilter = FWL_EVENT_ALL_MASK); + uint32_t dwFilter = FWL_EVENT_ALL_MASK); FX_BOOL ProcessEvent(CFWL_Event* pEvent); - FX_BOOL IsFilterEvent(CFWL_Event* pEvent, FX_DWORD dwFilter); + FX_BOOL IsFilterEvent(CFWL_Event* pEvent, uint32_t dwFilter); FX_BOOL IsInvalid() { return m_bInvalid; } void FlagInvalid() { m_bInvalid = TRUE; } diff --git a/xfa/fwl/core/fwl_panelimp.h b/xfa/fwl/core/fwl_panelimp.h index 9462a38490..81e74c189b 100644 --- a/xfa/fwl/core/fwl_panelimp.h +++ b/xfa/fwl/core/fwl_panelimp.h @@ -19,7 +19,7 @@ class CFWL_PanelImp : public CFWL_WidgetImp { IFWL_Widget* pOuter); virtual ~CFWL_PanelImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); virtual FWL_ERR Update(); virtual IFWL_Content* GetContent(); diff --git a/xfa/fwl/core/fwl_sdadapterimp.h b/xfa/fwl/core/fwl_sdadapterimp.h index 0e8bd7f683..2bc69796fb 100644 --- a/xfa/fwl/core/fwl_sdadapterimp.h +++ b/xfa/fwl/core/fwl_sdadapterimp.h @@ -45,7 +45,7 @@ class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr { virtual FWL_ERR SetWidgetCaption(IFWL_Widget* pWidget, const CFX_WideStringC& wsCaption); virtual FWL_ERR SetBorderRegion(IFWL_Widget* pWidget, CFX_Path* pPath); - virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, FX_DWORD dwAlpha); + virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, uint32_t dwAlpha); virtual FWL_ERR SetFullScreen(IFWL_Widget* pWidget, FX_BOOL bFullScreen); virtual FX_BOOL CheckMessage(); virtual FX_BOOL IsIdleMessage(); @@ -55,7 +55,7 @@ class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr { void* pDC, CFX_RectF* pClip = 0); virtual void* GetWindow(IFWL_Widget* pWidget); - virtual FX_DWORD GetKeyState(FX_DWORD dwVirtKey); + virtual uint32_t GetKeyState(uint32_t dwVirtKey); virtual FWL_ERR RunLoop(IFWL_Widget* widget); virtual FWL_ERR EndLoop(); virtual FWL_ERR InitMenu(IFWL_Menu* pMenu, IFWL_MenuDP* pMenuData); diff --git a/xfa/fwl/core/fwl_targetimp.h b/xfa/fwl/core/fwl_targetimp.h index 69946fbf14..c1a5e56c2a 100644 --- a/xfa/fwl/core/fwl_targetimp.h +++ b/xfa/fwl/core/fwl_targetimp.h @@ -15,7 +15,7 @@ class CFWL_TargetImp { virtual ~CFWL_TargetImp(); virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; - virtual FX_DWORD GetClassID() const; + virtual uint32_t GetClassID() const; virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); diff --git a/xfa/fwl/core/fwl_widgetimp.h b/xfa/fwl/core/fwl_widgetimp.h index 718268fd31..e460fb9733 100644 --- a/xfa/fwl/core/fwl_widgetimp.h +++ b/xfa/fwl/core/fwl_widgetimp.h @@ -36,14 +36,14 @@ class CFWL_WidgetImp : public CFWL_TargetImp { virtual IFWL_Widget* GetOwner(); virtual FWL_ERR SetOwner(IFWL_Widget* pOwner); virtual IFWL_Widget* GetOuter(); - virtual FX_DWORD GetStyles(); - virtual FWL_ERR ModifyStyles(FX_DWORD dwStylesAdded, - FX_DWORD dwStylesRemoved); - virtual FX_DWORD GetStylesEx(); - virtual FWL_ERR ModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); - virtual FX_DWORD GetStates(); - virtual FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE); + virtual uint32_t GetStyles(); + virtual FWL_ERR ModifyStyles(uint32_t dwStylesAdded, + uint32_t dwStylesRemoved); + virtual uint32_t GetStylesEx(); + virtual FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); + virtual uint32_t GetStates(); + virtual FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); virtual FWL_ERR SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback); @@ -51,7 +51,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp { virtual FWL_ERR Update(); virtual FWL_ERR LockUpdate(); virtual FWL_ERR UnlockUpdate(); - virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy); + virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FWL_ERR TransformTo(IFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy); virtual FWL_ERR TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt); virtual FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE); @@ -86,7 +86,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp { FX_FLOAT GetBorderSize(FX_BOOL bCX = TRUE); FX_FLOAT GetEdgeWidth(); void GetRelativeRect(CFX_RectF& rect); - void* GetThemeCapacity(FX_DWORD dwCapacity); + void* GetThemeCapacity(uint32_t dwCapacity); IFWL_ThemeProvider* GetAvailableTheme(); CFWL_WidgetImp* GetRootOuter(); CFX_SizeF CalcTextSize(const CFX_WideString& wsText, @@ -95,7 +95,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp { int32_t iLineWidth = -1); void CalcTextRect(const CFX_WideString& wsText, IFWL_ThemeProvider* pTheme, - FX_DWORD dwTTOStyles, + uint32_t dwTTOStyles, int32_t iTTOAlign, CFX_RectF& rect); void SetFocus(FX_BOOL bFocus); @@ -118,7 +118,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp { CFX_RectF& rtPopup); FX_BOOL GetScreenSize(FX_FLOAT& fx, FX_FLOAT& fy); void RegisterEventTarget(IFWL_Widget* pEventSource = NULL, - FX_DWORD dwFilter = FWL_EVENT_ALL_MASK); + uint32_t dwFilter = FWL_EVENT_ALL_MASK); void UnregisterEventTarget(); void DispatchKeyEvent(CFWL_MsgKey* pNote); void DispatchEvent(CFWL_Event* pEvent); @@ -149,8 +149,8 @@ class CFWL_WidgetImp : public CFWL_TargetImp { int32_t m_iLock; friend class CFWL_WidgetImpDelegate; friend void FWL_SetWidgetRect(IFWL_Widget* widget, const CFX_RectF& rect); - friend void FWL_SetWidgetStates(IFWL_Widget* widget, FX_DWORD dwStates); - friend void FWL_SetWidgetStyles(IFWL_Widget* widget, FX_DWORD dwStyles); + friend void FWL_SetWidgetStates(IFWL_Widget* widget, uint32_t dwStates); + friend void FWL_SetWidgetStyles(IFWL_Widget* widget, uint32_t dwStyles); }; class CFWL_WidgetImpDelegate : public IFWL_WidgetDelegate { diff --git a/xfa/fwl/core/fwl_widgetmgrimp.h b/xfa/fwl/core/fwl_widgetmgrimp.h index 76e4425555..fa489971c5 100644 --- a/xfa/fwl/core/fwl_widgetmgrimp.h +++ b/xfa/fwl/core/fwl_widgetmgrimp.h @@ -66,7 +66,7 @@ class CFWL_WidgetMgr : public IFWL_WidgetMgr { FX_BOOL SetWidgetIndex(IFWL_Widget* pWidget, int32_t nIndex) override; FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect = NULL) override; - FX_DWORD GetCapability() override { return m_dwCapability; } + uint32_t GetCapability() override { return m_dwCapability; } void AddWidget(IFWL_Widget* pWidget); void InsertWidget(IFWL_Widget* pParent, @@ -130,7 +130,7 @@ class CFWL_WidgetMgr : public IFWL_WidgetMgr { IFWL_AdapterWidgetMgr* m_pAdapter; CFWL_WidgetMgrDelegate* m_pDelegate; friend class CFWL_WidgetMgrDelegate; - FX_DWORD m_dwCapability; + uint32_t m_dwCapability; #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_) CFX_RectF m_rtScreen; #endif @@ -143,7 +143,7 @@ class CFWL_WidgetMgrDelegate : public IFWL_WidgetMgrDelegate { // IFWL_WidgetMgrDelegate: FWL_ERR OnSetCapability( - FX_DWORD dwCapability = FWL_WGTMGR_DisableThread) override; + uint32_t dwCapability = FWL_WGTMGR_DisableThread) override; int32_t OnProcessMessageToForm(CFWL_Message* pMessage) override; FWL_ERR OnDrawWidget(IFWL_Widget* pWidget, CFX_Graphics* pGraphics, diff --git a/xfa/fwl/core/ifwl_adapterwidgetmgr.h b/xfa/fwl/core/ifwl_adapterwidgetmgr.h index 80dbfd9bf5..1e8405ab2f 100644 --- a/xfa/fwl/core/ifwl_adapterwidgetmgr.h +++ b/xfa/fwl/core/ifwl_adapterwidgetmgr.h @@ -38,7 +38,7 @@ class IFWL_AdapterWidgetMgr { virtual FWL_ERR SetWidgetCaption(IFWL_Widget* pWidget, const CFX_WideStringC& wsCaption) = 0; virtual FWL_ERR SetBorderRegion(IFWL_Widget* pWidget, CFX_Path* pPath) = 0; - virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, FX_DWORD dwAlpha) = 0; + virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, uint32_t dwAlpha) = 0; virtual FWL_ERR ShowWidget(IFWL_Widget* pWidget) = 0; virtual FWL_ERR HideWidget(IFWL_Widget* pWidget) = 0; virtual FWL_ERR SetNormal(IFWL_Widget* pWidget) = 0; @@ -58,7 +58,7 @@ class IFWL_AdapterWidgetMgr { void* pDC, CFX_RectF* pClip = 0) = 0; virtual void* GetWindow(IFWL_Widget* pWidget) = 0; - virtual FX_DWORD GetKeyState(FX_DWORD dwVirtKey) = 0; + virtual uint32_t GetKeyState(uint32_t dwVirtKey) = 0; virtual FWL_ERR RunLoop(IFWL_Widget* widget) = 0; virtual FWL_ERR EndLoop() = 0; virtual FWL_ERR InitMenu(IFWL_Menu* pMenu, IFWL_MenuDP* pMenuData) = 0; diff --git a/xfa/fwl/core/ifwl_form.h b/xfa/fwl/core/ifwl_form.h index 66391692a9..b5cb72b181 100644 --- a/xfa/fwl/core/ifwl_form.h +++ b/xfa/fwl/core/ifwl_form.h @@ -86,7 +86,7 @@ class IFWL_Form : public IFWL_Panel { FWL_FORMSIZE GetFormSize(); FWL_ERR SetFormSize(FWL_FORMSIZE eFormSize); IFWL_Widget* DoModal(); - IFWL_Widget* DoModal(FX_DWORD& dwCommandID); + IFWL_Widget* DoModal(uint32_t& dwCommandID); FWL_ERR EndDoModal(); FWL_ERR SetBorderRegion(CFX_Path* pPath); diff --git a/xfa/fwl/core/ifwl_notedriver.h b/xfa/fwl/core/ifwl_notedriver.h index cdb751f324..706e97af15 100644 --- a/xfa/fwl/core/ifwl_notedriver.h +++ b/xfa/fwl/core/ifwl_notedriver.h @@ -33,7 +33,7 @@ class IFWL_NoteDriver { virtual FWL_ERR RegisterEventTarget( IFWL_Widget* pListener, IFWL_Widget* pEventSource = NULL, - FX_DWORD dwFilter = FWL_EVENT_ALL_MASK) = 0; + uint32_t dwFilter = FWL_EVENT_ALL_MASK) = 0; virtual FWL_ERR UnregisterEventTarget(IFWL_Widget* pListener) = 0; virtual void ClearEventTargets(FX_BOOL bRemoveAll) = 0; virtual int32_t GetQueueMaxSize() const = 0; diff --git a/xfa/fwl/core/ifwl_target.h b/xfa/fwl/core/ifwl_target.h index fd6410e16c..f0de3b13ee 100644 --- a/xfa/fwl/core/ifwl_target.h +++ b/xfa/fwl/core/ifwl_target.h @@ -35,7 +35,7 @@ class IFWL_Target { // These call into equivalent polymorphic methods of m_pImpl. There // should be no need to override these in subclasses. FWL_ERR GetClassName(CFX_WideString& wsClass) const; - FX_DWORD GetClassID() const; + uint32_t GetClassID() const; FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; FWL_ERR Initialize(); FWL_ERR Finalize(); diff --git a/xfa/fwl/core/ifwl_themeprovider.h b/xfa/fwl/core/ifwl_themeprovider.h index 2bdacd5947..f0fb1492a8 100644 --- a/xfa/fwl/core/ifwl_themeprovider.h +++ b/xfa/fwl/core/ifwl_themeprovider.h @@ -35,9 +35,9 @@ class IFWL_ThemeProvider { public: virtual ~IFWL_ThemeProvider() {} virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget) = 0; - virtual FX_DWORD GetThemeID(IFWL_Widget* pWidget) = 0; - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t GetThemeID(IFWL_Widget* pWidget) = 0; + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE) = 0; virtual FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix) = 0; virtual FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget, @@ -45,7 +45,7 @@ class IFWL_ThemeProvider { virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams) = 0; virtual FX_BOOL DrawText(CFWL_ThemeText* pParams) = 0; virtual void* GetCapacity(CFWL_ThemePart* pThemePart, - FX_DWORD dwCapacity) = 0; + uint32_t dwCapacity) = 0; virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget) = 0; virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) = 0; diff --git a/xfa/fwl/core/ifwl_timer.h b/xfa/fwl/core/ifwl_timer.h index 42fc84be17..5f113bc021 100644 --- a/xfa/fwl/core/ifwl_timer.h +++ b/xfa/fwl/core/ifwl_timer.h @@ -17,7 +17,7 @@ class IFWL_Timer { virtual int32_t Run(FWL_HTIMER hTimer) = 0; }; FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer, - FX_DWORD dwElapse, + uint32_t dwElapse, FX_BOOL bImmediately = TRUE); int32_t FWL_StopTimer(FWL_HTIMER hTimer); diff --git a/xfa/fwl/core/ifwl_widget.h b/xfa/fwl/core/ifwl_widget.h index 06e4bebc1c..eb1183fdf1 100644 --- a/xfa/fwl/core/ifwl_widget.h +++ b/xfa/fwl/core/ifwl_widget.h @@ -31,12 +31,12 @@ class IFWL_Widget : public IFWL_Target { IFWL_Widget* GetOwner(); FWL_ERR SetOwner(IFWL_Widget* pOwner); IFWL_Widget* GetOuter(); - FX_DWORD GetStyles(); - FWL_ERR ModifyStyles(FX_DWORD dwStylesAdded, FX_DWORD dwStylesRemoved); - FX_DWORD GetStylesEx(); - FWL_ERR ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved); - FX_DWORD GetStates(); - FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE); + uint32_t GetStyles(); + FWL_ERR ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved); + uint32_t GetStylesEx(); + FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved); + uint32_t GetStates(); + FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); FWL_ERR SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback); @@ -44,7 +44,7 @@ class IFWL_Widget : public IFWL_Target { FWL_ERR Update(); FWL_ERR LockUpdate(); FWL_ERR UnlockUpdate(); - FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy); + uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); FWL_ERR TransformTo(IFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy); FWL_ERR TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt); FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE); @@ -58,7 +58,7 @@ class IFWL_Widget : public IFWL_Target { CFX_SizeF GetOffsetFromParent(IFWL_Widget* pParent); }; -typedef CFX_MapPtrTemplate CFX_MapAccelerators; +typedef CFX_MapPtrTemplate CFX_MapAccelerators; FWL_ERR FWL_Accelerator_SetApp(CFX_MapAccelerators* pMapAccel); FWL_ERR FWL_Accelerator_SetThread(CFX_MapAccelerators* pMapAccel); diff --git a/xfa/fwl/core/ifwl_widgetmgr.h b/xfa/fwl/core/ifwl_widgetmgr.h index 5ff11f3592..648206eea9 100644 --- a/xfa/fwl/core/ifwl_widgetmgr.h +++ b/xfa/fwl/core/ifwl_widgetmgr.h @@ -39,7 +39,7 @@ class IFWL_WidgetMgr { virtual FX_BOOL SetWidgetIndex(IFWL_Widget* pWidget, int32_t nIndex) = 0; virtual FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect = NULL) = 0; - virtual FX_DWORD GetCapability() = 0; + virtual uint32_t GetCapability() = 0; }; IFWL_WidgetMgr* FWL_GetWidgetMgr(); diff --git a/xfa/fwl/core/ifwl_widgetmgrdelegate.h b/xfa/fwl/core/ifwl_widgetmgrdelegate.h index 620495722a..2435c0bc23 100644 --- a/xfa/fwl/core/ifwl_widgetmgrdelegate.h +++ b/xfa/fwl/core/ifwl_widgetmgrdelegate.h @@ -23,7 +23,7 @@ class IFWL_WidgetMgrDelegate { virtual ~IFWL_WidgetMgrDelegate() {} virtual FWL_ERR OnSetCapability( - FX_DWORD dwCapability = FWL_WGTMGR_DisableThread) = 0; + uint32_t dwCapability = FWL_WGTMGR_DisableThread) = 0; virtual int32_t OnProcessMessageToForm(CFWL_Message* pMessage) = 0; virtual FWL_ERR OnDrawWidget(IFWL_Widget* pWidget, CFX_Graphics* pGraphics, diff --git a/xfa/fwl/core/include/ifwl_adaptertimermgr.h b/xfa/fwl/core/include/ifwl_adaptertimermgr.h index 7c776704e1..64fc260ce5 100644 --- a/xfa/fwl/core/include/ifwl_adaptertimermgr.h +++ b/xfa/fwl/core/include/ifwl_adaptertimermgr.h @@ -16,7 +16,7 @@ class IFWL_AdapterTimerMgr { public: virtual ~IFWL_AdapterTimerMgr() {} virtual FWL_ERR Start(IFWL_Timer* pTimer, - FX_DWORD dwElapse, + uint32_t dwElapse, FWL_HTIMER& hTimer, FX_BOOL bImmediately = TRUE) = 0; virtual FWL_ERR Stop(FWL_HTIMER hTimer) = 0; diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.h b/xfa/fxbarcode/oned/BC_OneDimWriter.h index b015070968..e504f0bacb 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.h +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.h @@ -109,7 +109,7 @@ class CBC_OneDimWriter : public CBC_Writer { CFX_Font* m_pFont; FX_FLOAT m_fFontSize; int32_t m_iFontStyle; - FX_DWORD m_fontColor; + uint32_t m_fontColor; BC_TEXT_LOC m_locTextLoc; int32_t m_iContentLen; FX_BOOL m_bLeftPadding; diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/fxbarcode/pdf417/BC_PDF417Common.h index 5e05b542e6..c72d66410e 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Common.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417Common.h @@ -14,7 +14,7 @@ class CBC_PDF417Common { CBC_PDF417Common(); virtual ~CBC_PDF417Common(); static int32_t getBitCountSum(CFX_Int32Array& moduleBitCount); - static int32_t getCodeword(FX_DWORD symbol); + static int32_t getCodeword(uint32_t symbol); static const int32_t NUMBER_OF_CODEWORDS = 929; static const int32_t MAX_CODEWORDS_IN_BARCODE = NUMBER_OF_CODEWORDS - 1; static const int32_t MIN_ROWS_IN_BARCODE = 3; @@ -28,7 +28,7 @@ class CBC_PDF417Common { private: static CFX_Int32Array* EMPTY_INT_ARRAY; - static int32_t findCodewordIndex(FX_DWORD symbol); + static int32_t findCodewordIndex(uint32_t symbol); }; #endif // XFA_FXBARCODE_PDF417_BC_PDF417COMMON_H_ diff --git a/xfa/fxbarcode/utils.h b/xfa/fxbarcode/utils.h index 60d4754096..da10555e2e 100644 --- a/xfa/fxbarcode/utils.h +++ b/xfa/fxbarcode/utils.h @@ -11,8 +11,8 @@ typedef CFX_MapPtrTemplate CFX_PtrToInt32; FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst, - FX_DWORD first, - FX_DWORD last, + uint32_t first, + uint32_t last, int32_t count, FX_CHAR c); void BC_FX_ByteString_Append(CFX_ByteString& dst, int32_t count, FX_CHAR c); diff --git a/xfa/fxfa/app/xfa_checksum.h b/xfa/fxfa/app/xfa_checksum.h index 5331800b82..c997dc76fa 100644 --- a/xfa/fxfa/app/xfa_checksum.h +++ b/xfa/fxfa/app/xfa_checksum.h @@ -26,7 +26,7 @@ class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler { virtual ~CXFA_SAXReaderHandler(); virtual void* OnTagEnter(const CFX_ByteStringC& bsTagName, FX_SAXNODE eType, - FX_DWORD dwStartPos); + uint32_t dwStartPos); virtual void OnTagAttribute(void* pTag, const CFX_ByteStringC& bsAttri, const CFX_ByteStringC& bsValue); @@ -34,16 +34,16 @@ class CXFA_SAXReaderHandler : public IFX_SAXReaderHandler { virtual void OnTagData(void* pTag, FX_SAXNODE eType, const CFX_ByteStringC& bsData, - FX_DWORD dwStartPos); - virtual void OnTagClose(void* pTag, FX_DWORD dwEndPos); + uint32_t dwStartPos); + virtual void OnTagClose(void* pTag, uint32_t dwEndPos); virtual void OnTagEnd(void* pTag, const CFX_ByteStringC& bsTagName, - FX_DWORD dwEndPos); + uint32_t dwEndPos); virtual void OnTargetData(void* pTag, FX_SAXNODE eType, const CFX_ByteStringC& bsData, - FX_DWORD dwStartPos); + uint32_t dwStartPos); protected: void UpdateChecksum(FX_BOOL bCheckSpace); diff --git a/xfa/fxfa/app/xfa_ffbarcode.h b/xfa/fxfa/app/xfa_ffbarcode.h index 2e00f4e3a2..77d8ba840a 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.h +++ b/xfa/fxfa/app/xfa_ffbarcode.h @@ -18,11 +18,11 @@ class CXFA_FFBarcode : public CXFA_FFTextEdit { virtual FX_BOOL LoadWidget(); virtual void RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, - FX_DWORD dwStatus = 0, + uint32_t dwStatus = 0, int32_t iRotate = 0); virtual void UpdateWidgetProperty(); - virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); }; enum XFA_BARCODETYPEENUM { diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.h b/xfa/fxfa/app/xfa_ffcheckbutton.h index 852736577d..5eeb3e86a8 100644 --- a/xfa/fxfa/app/xfa_ffcheckbutton.h +++ b/xfa/fxfa/app/xfa_ffcheckbutton.h @@ -16,14 +16,14 @@ class CXFA_FFCheckButton : public CXFA_FFField { virtual ~CXFA_FFCheckButton(); virtual void RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, - FX_DWORD dwStatus = 0, + uint32_t dwStatus = 0, int32_t iRotate = 0); virtual FX_BOOL LoadWidget(); virtual FX_BOOL PerformLayout(); virtual FX_BOOL UpdateFWLData(); virtual void UpdateWidgetProperty(); - virtual FX_BOOL OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); void SetFWLCheckState(XFA_CHECKSTATE eCheckState); virtual int32_t OnProcessMessage(CFWL_Message* pMessage); virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent); diff --git a/xfa/fxfa/app/xfa_ffchoicelist.h b/xfa/fxfa/app/xfa_ffchoicelist.h index 1699b18039..3d8863c066 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.h +++ b/xfa/fxfa/app/xfa_ffchoicelist.h @@ -21,7 +21,7 @@ class CXFA_FFListBox : public CXFA_FFField { virtual FX_BOOL CommitData(); virtual FX_BOOL UpdateFWLData(); virtual FX_BOOL IsDataChanged(); - FX_DWORD GetAlignment(); + uint32_t GetAlignment(); public: void OnSelectChanged(IFWL_Widget* pWidget, const CFX_Int32Array& arrSels); @@ -41,11 +41,11 @@ class CXFA_FFComboBox : public CXFA_FFField { CXFA_FFComboBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); virtual ~CXFA_FFComboBox(); virtual FX_BOOL GetBBox(CFX_RectF& rtBox, - FX_DWORD dwStatus, + uint32_t dwStatus, FX_BOOL bDrawFocus = FALSE); virtual FX_BOOL LoadWidget(); virtual void UpdateWidgetProperty(); - virtual FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget); virtual FX_BOOL CanUndo(); virtual FX_BOOL CanRedo(); @@ -69,7 +69,7 @@ class CXFA_FFComboBox : public CXFA_FFField { virtual FX_BOOL CommitData(); virtual FX_BOOL UpdateFWLData(); virtual FX_BOOL IsDataChanged(); - FX_DWORD GetAlignment(); + uint32_t GetAlignment(); void FWLEventSelChange(CXFA_EventParam* pParam); CFX_WideString m_wsNewValue; diff --git a/xfa/fxfa/app/xfa_ffdoc.h b/xfa/fxfa/app/xfa_ffdoc.h index d656d30de7..8b61bd228f 100644 --- a/xfa/fxfa/app/xfa_ffdoc.h +++ b/xfa/fxfa/app/xfa_ffdoc.h @@ -25,15 +25,15 @@ class CXFA_FFDoc : public IXFA_Doc { CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider); ~CXFA_FFDoc(); IXFA_DocProvider* GetDocProvider() { return m_pDocProvider; } - FX_DWORD GetDocType(); + uint32_t GetDocType(); int32_t StartLoad(); int32_t DoLoad(IFX_Pause* pPause = NULL); void StopLoad(); - IXFA_DocView* CreateDocView(FX_DWORD dwView = 0); + IXFA_DocView* CreateDocView(uint32_t dwView = 0); FX_BOOL OpenDoc(IFX_FileRead* pStream, FX_BOOL bTakeOverFile); FX_BOOL OpenDoc(CPDF_Document* pPDFDoc); FX_BOOL CloseDoc(); - void SetDocType(FX_DWORD dwType); + void SetDocType(uint32_t dwType); CXFA_Document* GetXFADoc() { return m_pDocument; } CXFA_FFApp* GetApp() { return m_pApp; } CXFA_FFDocView* GetDocView(IXFA_DocLayout* pLayout); @@ -57,7 +57,7 @@ class CXFA_FFDoc : public IXFA_Doc { CPDF_Document* m_pPDFDoc; CFX_MapPtrToPtr m_mapNamedImages; CFX_MapPtrToPtr m_mapTypeToDocView; - FX_DWORD m_dwDocType; + uint32_t m_dwDocType; FX_BOOL m_bOwnStream; }; diff --git a/xfa/fxfa/app/xfa_ffdochandler.h b/xfa/fxfa/app/xfa_ffdochandler.h index 47dd85fa81..ff2491509a 100644 --- a/xfa/fxfa/app/xfa_ffdochandler.h +++ b/xfa/fxfa/app/xfa_ffdochandler.h @@ -15,12 +15,12 @@ class CXFA_FFDocHandler : public IXFA_DocHandler { ~CXFA_FFDocHandler(); virtual void ReleaseDoc(IXFA_Doc* hDoc); virtual IXFA_DocProvider* GetDocProvider(IXFA_Doc* hDoc); - virtual FX_DWORD GetDocType(IXFA_Doc* hDoc); + virtual uint32_t GetDocType(IXFA_Doc* hDoc); virtual int32_t StartLoad(IXFA_Doc* hDoc); virtual int32_t DoLoad(IXFA_Doc* hDoc, IFX_Pause* pPause = NULL); virtual void StopLoad(IXFA_Doc* hDoc); - virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, FX_DWORD dwView = 0); + virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, uint32_t dwView = 0); virtual int32_t CountPackages(IXFA_Doc* hDoc); virtual void GetPackageName(IXFA_Doc* hDoc, int32_t iPackage, diff --git a/xfa/fxfa/app/xfa_ffexclgroup.h b/xfa/fxfa/app/xfa_ffexclgroup.h index fd3f4d80db..cdda4d0417 100644 --- a/xfa/fxfa/app/xfa_ffexclgroup.h +++ b/xfa/fxfa/app/xfa_ffexclgroup.h @@ -17,7 +17,7 @@ class CXFA_FFExclGroup : public CXFA_FFWidget { virtual void RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, - FX_DWORD dwStatus = 0, + uint32_t dwStatus = 0, int32_t iRotate = 0); }; diff --git a/xfa/fxfa/app/xfa_fffield.h b/xfa/fxfa/app/xfa_fffield.h index 952cfcda5a..a6174157d3 100644 --- a/xfa/fxfa/app/xfa_fffield.h +++ b/xfa/fxfa/app/xfa_fffield.h @@ -22,38 +22,38 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate { virtual ~CXFA_FFField(); virtual FX_BOOL GetBBox(CFX_RectF& rtBox, - FX_DWORD dwStatus, + uint32_t dwStatus, FX_BOOL bDrawFocus = FALSE); virtual void RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, - FX_DWORD dwStatus = 0, + uint32_t dwStatus = 0, int32_t iRotate = 0); virtual FX_BOOL IsLoaded(); virtual FX_BOOL LoadWidget(); virtual void UnloadWidget(); virtual FX_BOOL PerformLayout(); virtual void UpdateFWL(); - FX_DWORD UpdateUIProperty(); + uint32_t UpdateUIProperty(); virtual FX_BOOL OnMouseEnter(); virtual FX_BOOL OnMouseExit(); - virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnLButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnMouseWheel(FX_DWORD dwFlags, + virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnLButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnMouseWheel(uint32_t dwFlags, int16_t zDelta, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnRButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnRButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnSetFocus(CXFA_FFWidget* pOldWidget); virtual FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget); - virtual FX_BOOL OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags); - virtual FX_BOOL OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags); - virtual FX_BOOL OnChar(FX_DWORD dwChar, FX_DWORD dwFlags); - virtual FX_DWORD OnHitTest(FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags); + virtual FX_BOOL OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags); + virtual FX_BOOL OnChar(uint32_t dwChar, uint32_t dwFlags); + virtual uint32_t OnHitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnSetCursor(FX_FLOAT fx, FX_FLOAT fy); protected: @@ -72,7 +72,7 @@ class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate { virtual FX_BOOL IsDataChanged(); void DrawHighlight(CFX_Graphics* pGS, CFX_Matrix* pMatrix, - FX_DWORD dwStatus, + uint32_t dwStatus, FX_BOOL bEllipse = FALSE); void DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix); void TranslateFWLMessage(CFWL_Message* pMessage); diff --git a/xfa/fxfa/app/xfa_ffimage.h b/xfa/fxfa/app/xfa_ffimage.h index 71bb495be1..7bbeafc1ac 100644 --- a/xfa/fxfa/app/xfa_ffimage.h +++ b/xfa/fxfa/app/xfa_ffimage.h @@ -15,7 +15,7 @@ class CXFA_FFImage : public CXFA_FFDraw { virtual ~CXFA_FFImage(); virtual void RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, - FX_DWORD dwStatus = 0, + uint32_t dwStatus = 0, int32_t iRotate = 0); virtual FX_BOOL IsLoaded(); virtual FX_BOOL LoadWidget(); diff --git a/xfa/fxfa/app/xfa_ffimageedit.h b/xfa/fxfa/app/xfa_ffimageedit.h index 7ecd18a0c1..1acc13c7fa 100644 --- a/xfa/fxfa/app/xfa_ffimageedit.h +++ b/xfa/fxfa/app/xfa_ffimageedit.h @@ -16,11 +16,11 @@ class CXFA_FFImageEdit : public CXFA_FFField { virtual void RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, - FX_DWORD dwStatus = 0, + uint32_t dwStatus = 0, int32_t iRotate = 0); virtual FX_BOOL LoadWidget(); virtual void UnloadWidget(); - virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual int32_t OnProcessMessage(CFWL_Message* pMessage); virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent); virtual FWL_ERR OnDrawWidget(CFX_Graphics* pGraphics, diff --git a/xfa/fxfa/app/xfa_ffnotify.h b/xfa/fxfa/app/xfa_ffnotify.h index e61c07924e..30c8f0d107 100644 --- a/xfa/fxfa/app/xfa_ffnotify.h +++ b/xfa/fxfa/app/xfa_ffnotify.h @@ -25,7 +25,7 @@ class CXFA_FFNotify : public IXFA_Notify { void* pParam3 = NULL, void* pParam4 = NULL); virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender, - FX_DWORD dwEvent, + uint32_t dwEvent, void* pParam = NULL, void* pAdditional = NULL, void* pAdditional2 = NULL); diff --git a/xfa/fxfa/app/xfa_ffpageview.h b/xfa/fxfa/app/xfa_ffpageview.h index b68e828123..20818e7107 100644 --- a/xfa/fxfa/app/xfa_ffpageview.h +++ b/xfa/fxfa/app/xfa_ffpageview.h @@ -27,8 +27,8 @@ class CXFA_FFPageView : public CXFA_ContainerLayoutItem, public IXFA_PageView { void UnloadPageView() override; IXFA_Widget* GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) override; IXFA_WidgetIterator* CreateWidgetIterator( - FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form, - FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible | + uint32_t dwTraverseWay = XFA_TRAVERSEWAY_Form, + uint32_t dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) override; @@ -43,7 +43,7 @@ typedef CXFA_NodeIteratorTemplate& sSuggest); protected: - FX_DWORD GetAlignment(); + uint32_t GetAlignment(); FX_BOOL CommitData() override; FX_BOOL UpdateFWLData() override; FX_BOOL IsDataChanged() override; @@ -98,7 +98,7 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit { virtual ~CXFA_FFDateTimeEdit(); virtual FX_BOOL GetBBox(CFX_RectF& rtBox, - FX_DWORD dwStatus, + uint32_t dwStatus, FX_BOOL bDrawFocus = FALSE); virtual FX_BOOL LoadWidget(); virtual void UpdateWidgetProperty(); @@ -120,7 +120,7 @@ class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit { virtual FX_BOOL DeSelect(); protected: - FX_DWORD GetAlignment(); + uint32_t GetAlignment(); virtual FX_BOOL PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL CommitData(); diff --git a/xfa/fxfa/app/xfa_ffwidget.h b/xfa/fxfa/app/xfa_ffwidget.h index 3782e3b8a6..4cc6c0bbbb 100644 --- a/xfa/fxfa/app/xfa_ffwidget.h +++ b/xfa/fxfa/app/xfa_ffwidget.h @@ -46,16 +46,16 @@ class CXFA_FFWidget : public IXFA_Widget, void SetPageView(IXFA_PageView* pPageView); void GetWidgetRect(CFX_RectF& rtWidget); CFX_RectF ReCacheWidgetRect(); - FX_DWORD GetStatus(); - void ModifyStatus(FX_DWORD dwAdded, FX_DWORD dwRemoved); + uint32_t GetStatus(); + void ModifyStatus(uint32_t dwAdded, uint32_t dwRemoved); virtual FX_BOOL GetBBox(CFX_RectF& rtBox, - FX_DWORD dwStatus, + uint32_t dwStatus, FX_BOOL bDrawFocus = FALSE); CXFA_WidgetAcc* GetDataAcc(); FX_BOOL GetToolTip(CFX_WideString& wsToolTip); virtual void RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, - FX_DWORD dwStatus = 0, + uint32_t dwStatus = 0, int32_t iRotate = 0); virtual FX_BOOL IsLoaded(); @@ -66,24 +66,24 @@ class CXFA_FFWidget : public IXFA_Widget, virtual void UpdateWidgetProperty(); virtual FX_BOOL OnMouseEnter(); virtual FX_BOOL OnMouseExit(); - virtual FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnLButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnMouseWheel(FX_DWORD dwFlags, + virtual FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnLButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnMouseWheel(uint32_t dwFlags, int16_t zDelta, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_BOOL OnRButtonDblClk(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnRButtonDblClk(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnSetFocus(CXFA_FFWidget* pOldWidget); virtual FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget); - virtual FX_BOOL OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags); - virtual FX_BOOL OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags); - virtual FX_BOOL OnChar(FX_DWORD dwChar, FX_DWORD dwFlags); - virtual FX_DWORD OnHitTest(FX_FLOAT fx, FX_FLOAT fy); + virtual FX_BOOL OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags); + virtual FX_BOOL OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags); + virtual FX_BOOL OnChar(uint32_t dwChar, uint32_t dwFlags); + virtual uint32_t OnHitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnSetCursor(FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL CanUndo() { return FALSE; } virtual FX_BOOL CanRedo() { return FALSE; } @@ -130,11 +130,11 @@ class CXFA_FFWidget : public IXFA_Widget, CXFA_Box box, const CFX_RectF& rtBorder, CFX_Matrix* pMatrix, - FX_DWORD dwFlags = 0); + uint32_t dwFlags = 0); void GetMinMaxWidth(FX_FLOAT fMinWidth, FX_FLOAT fMaxWidth); void GetMinMaxHeight(FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight); void GetRectWithoutRotate(CFX_RectF& rtWidget); - FX_BOOL IsMatchVisibleStatus(FX_DWORD dwStatus); + FX_BOOL IsMatchVisibleStatus(uint32_t dwStatus); void EventKillFocus(); FX_BOOL IsButtonDown(); @@ -182,6 +182,6 @@ void XFA_DrawBox(CXFA_Box box, CFX_Graphics* pGS, const CFX_RectF& rtWidget, CFX_Matrix* pMatrix, - FX_DWORD dwFlags = 0); + uint32_t dwFlags = 0); #endif // XFA_FXFA_APP_XFA_FFWIDGET_H_ diff --git a/xfa/fxfa/app/xfa_ffwidgethandler.h b/xfa/fxfa/app/xfa_ffwidgethandler.h index a9998b395c..931eb28437 100644 --- a/xfa/fxfa/app/xfa_ffwidgethandler.h +++ b/xfa/fxfa/app/xfa_ffwidgethandler.h @@ -23,10 +23,10 @@ class CXFA_FFWidgetHandler : public IXFA_WidgetHandler { IXFA_Widget* hBefore = NULL); virtual IXFA_PageView* GetPageView(IXFA_Widget* hWidget); virtual void GetRect(IXFA_Widget* hWidget, CFX_RectF& rt); - virtual FX_DWORD GetStatus(IXFA_Widget* hWidget); + virtual uint32_t GetStatus(IXFA_Widget* hWidget); virtual FX_BOOL GetBBox(IXFA_Widget* hWidget, CFX_RectF& rtBox, - FX_DWORD dwStatus, + uint32_t dwStatus, FX_BOOL bDrawFocus = FALSE); virtual CXFA_WidgetAcc* GetDataAcc(IXFA_Widget* hWidget); virtual void GetName(IXFA_Widget* hWidget, @@ -41,49 +41,49 @@ class CXFA_FFWidgetHandler : public IXFA_WidgetHandler { virtual FX_BOOL OnMouseEnter(IXFA_Widget* hWidget); virtual FX_BOOL OnMouseExit(IXFA_Widget* hWidget); virtual FX_BOOL OnLButtonDown(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnLButtonUp(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnLButtonDblClk(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnMouseMove(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnMouseWheel(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, int16_t zDelta, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnRButtonDown(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnRButtonUp(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnRButtonDblClk(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnKeyDown(IXFA_Widget* hWidget, - FX_DWORD dwKeyCode, - FX_DWORD dwFlags); + uint32_t dwKeyCode, + uint32_t dwFlags); virtual FX_BOOL OnKeyUp(IXFA_Widget* hWidget, - FX_DWORD dwKeyCode, - FX_DWORD dwFlags); + uint32_t dwKeyCode, + uint32_t dwFlags); virtual FX_BOOL OnChar(IXFA_Widget* hWidget, - FX_DWORD dwChar, - FX_DWORD dwFlags); - virtual FX_DWORD OnHitTest(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy); + uint32_t dwChar, + uint32_t dwFlags); + virtual uint32_t OnHitTest(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy); virtual FX_BOOL OnSetCursor(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy); virtual void RenderWidget(IXFA_Widget* hWidget, CFX_Graphics* pGS, @@ -136,7 +136,7 @@ class CXFA_FFWidgetHandler : public IXFA_WidgetHandler { CXFA_Node* pBefore) const; CXFA_Node* CreateFontNode(CXFA_Node* pParent) const; CXFA_Node* CreateMarginNode(CXFA_Node* pParent, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fInsets[4]) const; CXFA_Node* CreateValueNode(XFA_ELEMENT eValue, CXFA_Node* pParent) const; IXFA_ObjFactory* GetObjFactory() const; diff --git a/xfa/fxfa/app/xfa_fontmgr.h b/xfa/fxfa/app/xfa_fontmgr.h index 516d7bb6e0..20d3e5656c 100644 --- a/xfa/fxfa/app/xfa_fontmgr.h +++ b/xfa/fxfa/app/xfa_fontmgr.h @@ -17,7 +17,7 @@ class CPDF_Font; struct XFA_FONTINFO { - FX_DWORD dwFontNameHash; + uint32_t dwFontNameHash; const FX_WCHAR* pPsName; const FX_WCHAR* pReplaceFont; uint16_t dwStyles; @@ -32,11 +32,11 @@ class CXFA_DefFontMgr : public IXFA_FontMgr { // IXFA_FontMgr: IFX_Font* GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) override; IFX_Font* GetDefaultFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) override; protected: @@ -48,7 +48,7 @@ class CXFA_PDFFontMgr : public IFX_FontProvider { CXFA_PDFFontMgr(CXFA_FFDoc* pDoc); ~CXFA_PDFFontMgr(); IFX_Font* GetFont(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, CPDF_Font** pPDFFont, FX_BOOL bStrictMatch = TRUE); FX_BOOL GetCharWidth(IFX_Font* pFont, @@ -82,7 +82,7 @@ class CXFA_FontMgr { ~CXFA_FontMgr(); IFX_Font* GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF); void LoadDocFonts(IXFA_Doc* hDoc); void ReleaseDocFonts(IXFA_Doc* hDoc); diff --git a/xfa/fxfa/app/xfa_fwltheme.h b/xfa/fxfa/app/xfa_fwltheme.h index 484c56967a..0266b8c24d 100644 --- a/xfa/fxfa/app/xfa_fwltheme.h +++ b/xfa/fxfa/app/xfa_fwltheme.h @@ -35,17 +35,17 @@ class CXFA_FWLTheme : public IFWL_ThemeProvider { virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const { return FWL_ERR_Succeeded; } - virtual FX_DWORD GetHashCode() const { return 0; } + virtual uint32_t GetHashCode() const { return 0; } virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD GetThemeID(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t GetThemeID(IFWL_Widget* pWidget); + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget); virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart); virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart, @@ -79,7 +79,7 @@ class CXFA_FWLTheme : public IFWL_ThemeProvider { CFWL_BarcodeTP* m_pBarcodeTP; IFDE_TextOut* m_pTextOut; FX_FLOAT m_fCapacity; - FX_DWORD m_dwCapacity; + uint32_t m_dwCapacity; IFX_Font* m_pCalendarFont; CFX_WideString m_wsResource; CXFA_FFApp* m_pApp; diff --git a/xfa/fxfa/app/xfa_rendercontext.h b/xfa/fxfa/app/xfa_rendercontext.h index ef4b3069a6..c19adeddfa 100644 --- a/xfa/fxfa/app/xfa_rendercontext.h +++ b/xfa/fxfa/app/xfa_rendercontext.h @@ -28,7 +28,7 @@ class CXFA_RenderContext : public IXFA_RenderContext { CFX_Graphics* m_pGS; CFX_Matrix m_matrix; CXFA_RenderOptions m_options; - FX_DWORD m_dwStatus; + uint32_t m_dwStatus; CFX_RectF m_rtClipRect; }; diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h index 9cc1e29f3b..f6c3262536 100644 --- a/xfa/fxfa/app/xfa_textlayout.h +++ b/xfa/fxfa/app/xfa_textlayout.h @@ -74,12 +74,12 @@ class CXFA_TextParseContext : public CFX_Target { const IFDE_CSSDeclaration** GetDecls() { return (const IFDE_CSSDeclaration**)m_ppMatchedDecls; } - FX_DWORD CountDecls() const { return m_dwMatchedDecls; } + uint32_t CountDecls() const { return m_dwMatchedDecls; } IFDE_CSSComputedStyle* m_pParentStyle; protected: IFDE_CSSDeclaration** m_ppMatchedDecls; - FX_DWORD m_dwMatchedDecls; + uint32_t m_dwMatchedDecls; FDE_CSSDISPLAY m_eDisplay; }; @@ -169,7 +169,7 @@ class CXFA_LoaderContext { CXFA_Node* m_pNode; IFDE_CSSComputedStyle* m_pParentStyle; CFX_ArrayTemplate m_lineHeights; - FX_DWORD m_dwFlags; + uint32_t m_dwFlags; CFX_FloatArray m_BlocksHeight; }; @@ -180,21 +180,21 @@ class CXFA_LinkUserData : public IFX_Unknown, public CFX_Target { m_pszURLContent = pszText; } ~CXFA_LinkUserData() {} - virtual FX_DWORD Release() { - FX_DWORD dwRefCount = --m_dwRefCount; + virtual uint32_t Release() { + uint32_t dwRefCount = --m_dwRefCount; if (dwRefCount <= 0) { FXTARGET_DeleteWith(CXFA_LinkUserData, m_pAllocator, this); } return dwRefCount; } - virtual FX_DWORD AddRef() { return ++m_dwRefCount; } + virtual uint32_t AddRef() { return ++m_dwRefCount; } public: const FX_WCHAR* GetLinkURL() { return m_pszURLContent; } protected: IFX_MEMAllocator* m_pAllocator; - FX_DWORD m_dwRefCount; + uint32_t m_dwRefCount; CFX_WideString m_pszURLContent; }; @@ -226,21 +226,21 @@ class CXFA_TextUserData : public IFX_Unknown, public CFX_Target { if (m_pLinkData) m_pLinkData->Release(); } - virtual FX_DWORD Release() { - FX_DWORD dwRefCount = --m_dwRefCount; + virtual uint32_t Release() { + uint32_t dwRefCount = --m_dwRefCount; if (dwRefCount == 0) { FXTARGET_DeleteWith(CXFA_TextUserData, m_pAllocator, this); } return dwRefCount; } - virtual FX_DWORD AddRef() { return ++m_dwRefCount; } + virtual uint32_t AddRef() { return ++m_dwRefCount; } IFDE_CSSComputedStyle* m_pStyle; CXFA_LinkUserData* m_pLinkData; protected: IFX_MEMAllocator* m_pAllocator; - FX_DWORD m_dwRefCount; + uint32_t m_dwRefCount; }; class XFA_TextPiece : public CFX_Target { @@ -277,7 +277,7 @@ class CXFA_PieceLine : public CFX_Target { typedef CFX_ArrayTemplate CXFA_PieceLineArray; struct XFA_TABSTOPS { - FX_DWORD dwAlign; + uint32_t dwAlign; FX_FLOAT fTabstops; }; @@ -289,7 +289,7 @@ class CXFA_TextTabstopsContext { m_bTabstops(FALSE), m_fTabWidth(0), m_fLeft(0) {} - void Append(FX_DWORD dwAlign, FX_FLOAT fTabstops) { + void Append(uint32_t dwAlign, FX_FLOAT fTabstops) { int32_t i = 0; for (i = 0; i < m_iTabCount; i++) { XFA_TABSTOPS* pTabstop = m_tabstops.GetDataPtr(i); @@ -380,11 +380,11 @@ class CXFA_TextLayout { FX_FLOAT& fLinePos, FX_FLOAT fSpaceAbove, FX_BOOL bSavePieces); - void AppendTextLine(FX_DWORD dwStatus, + void AppendTextLine(uint32_t dwStatus, FX_FLOAT& fLinePos, FX_BOOL bSavePieces, FX_BOOL bEndBreak = FALSE); - void EndBreak(FX_DWORD dwStatus, FX_FLOAT& fLinePos, FX_BOOL bDefault); + void EndBreak(uint32_t dwStatus, FX_FLOAT& fLinePos, FX_BOOL bDefault); FX_BOOL IsEnd(FX_BOOL bSavePieces); void ProcessText(CFX_WideString& wsText); void UpdateAlign(FX_FLOAT fHeight, FX_FLOAT fBottom); diff --git a/xfa/fxfa/fm2js/xfa_error.h b/xfa/fxfa/fm2js/xfa_error.h index b8116edf2a..2415cd3212 100644 --- a/xfa/fxfa/fm2js/xfa_error.h +++ b/xfa/fxfa/fm2js/xfa_error.h @@ -27,7 +27,7 @@ class CXFA_FMErrorInfo { public: CXFA_FMErrorInfo() : linenum(0) {} ~CXFA_FMErrorInfo() {} - FX_DWORD linenum; + uint32_t linenum; CFX_WideString message; }; const FX_WCHAR* XFA_FM_ErrorMsg(XFA_FM_ERRMSG msg); diff --git a/xfa/fxfa/fm2js/xfa_expression.h b/xfa/fxfa/fm2js/xfa_expression.h index 0b99e8da13..9bd0c9b89f 100644 --- a/xfa/fxfa/fm2js/xfa_expression.h +++ b/xfa/fxfa/fm2js/xfa_expression.h @@ -24,22 +24,22 @@ enum XFA_FM_EXPTYPE { class CXFA_FMExpression { public: - explicit CXFA_FMExpression(FX_DWORD line); - CXFA_FMExpression(FX_DWORD line, XFA_FM_EXPTYPE type); + explicit CXFA_FMExpression(uint32_t line); + CXFA_FMExpression(uint32_t line, XFA_FM_EXPTYPE type); virtual ~CXFA_FMExpression() {} virtual void ToJavaScript(CFX_WideTextBuf& javascript); virtual void ToImpliedReturnJS(CFX_WideTextBuf&); - FX_DWORD GetLine() { return m_line; } + uint32_t GetLine() { return m_line; } XFA_FM_EXPTYPE GetExpType() const { return m_type; } protected: XFA_FM_EXPTYPE m_type; - FX_DWORD m_line; + uint32_t m_line; }; class CXFA_FMFunctionDefinition : public CXFA_FMExpression { public: - CXFA_FMFunctionDefinition(FX_DWORD line, + CXFA_FMFunctionDefinition(uint32_t line, FX_BOOL isGlobal, const CFX_WideStringC& wsName, CFX_WideStringCArray* pArguments, @@ -57,7 +57,7 @@ class CXFA_FMFunctionDefinition : public CXFA_FMExpression { class CXFA_FMVarExpression : public CXFA_FMExpression { public: - CXFA_FMVarExpression(FX_DWORD line, + CXFA_FMVarExpression(uint32_t line, const CFX_WideStringC& wsName, CXFA_FMExpression* pInit); void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -70,7 +70,7 @@ class CXFA_FMVarExpression : public CXFA_FMExpression { class CXFA_FMExpExpression : public CXFA_FMExpression { public: - CXFA_FMExpExpression(FX_DWORD line, CXFA_FMSimpleExpression* pExpression); + CXFA_FMExpExpression(uint32_t line, CXFA_FMSimpleExpression* pExpression); void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -80,7 +80,7 @@ class CXFA_FMExpExpression : public CXFA_FMExpression { class CXFA_FMBlockExpression : public CXFA_FMExpression { public: - CXFA_FMBlockExpression(FX_DWORD line, CFX_PtrArray* pExpressionList); + CXFA_FMBlockExpression(uint32_t line, CFX_PtrArray* pExpressionList); ~CXFA_FMBlockExpression() override; void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -91,7 +91,7 @@ class CXFA_FMBlockExpression : public CXFA_FMExpression { class CXFA_FMDoExpression : public CXFA_FMExpression { public: - CXFA_FMDoExpression(FX_DWORD line, CXFA_FMExpression* pList); + CXFA_FMDoExpression(uint32_t line, CXFA_FMExpression* pList); void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -101,7 +101,7 @@ class CXFA_FMDoExpression : public CXFA_FMExpression { class CXFA_FMIfExpression : public CXFA_FMExpression { public: - CXFA_FMIfExpression(FX_DWORD line, + CXFA_FMIfExpression(uint32_t line, CXFA_FMSimpleExpression* pExpression, CXFA_FMExpression* pIfExpression, CXFA_FMExpression* pElseExpression); @@ -116,7 +116,7 @@ class CXFA_FMIfExpression : public CXFA_FMExpression { class CXFA_FMLoopExpression : public CXFA_FMExpression { public: - explicit CXFA_FMLoopExpression(FX_DWORD line) : CXFA_FMExpression(line) {} + explicit CXFA_FMLoopExpression(uint32_t line) : CXFA_FMExpression(line) {} ~CXFA_FMLoopExpression() override; void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -124,7 +124,7 @@ class CXFA_FMLoopExpression : public CXFA_FMExpression { class CXFA_FMWhileExpression : public CXFA_FMLoopExpression { public: - CXFA_FMWhileExpression(FX_DWORD line, + CXFA_FMWhileExpression(uint32_t line, CXFA_FMSimpleExpression* pCodition, CXFA_FMExpression* pExpression); void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -137,7 +137,7 @@ class CXFA_FMWhileExpression : public CXFA_FMLoopExpression { class CXFA_FMBreakExpression : public CXFA_FMExpression { public: - explicit CXFA_FMBreakExpression(FX_DWORD line); + explicit CXFA_FMBreakExpression(uint32_t line); ~CXFA_FMBreakExpression() override; void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -145,7 +145,7 @@ class CXFA_FMBreakExpression : public CXFA_FMExpression { class CXFA_FMContinueExpression : public CXFA_FMExpression { public: - explicit CXFA_FMContinueExpression(FX_DWORD line); + explicit CXFA_FMContinueExpression(uint32_t line); ~CXFA_FMContinueExpression() override; void ToJavaScript(CFX_WideTextBuf& javascript) override; void ToImpliedReturnJS(CFX_WideTextBuf&) override; @@ -153,7 +153,7 @@ class CXFA_FMContinueExpression : public CXFA_FMExpression { class CXFA_FMForExpression : public CXFA_FMLoopExpression { public: - CXFA_FMForExpression(FX_DWORD line, + CXFA_FMForExpression(uint32_t line, const CFX_WideStringC& wsVariant, CXFA_FMSimpleExpression* pAssignment, CXFA_FMSimpleExpression* pAccessor, @@ -174,7 +174,7 @@ class CXFA_FMForExpression : public CXFA_FMLoopExpression { class CXFA_FMForeachExpression : public CXFA_FMLoopExpression { public: - CXFA_FMForeachExpression(FX_DWORD line, + CXFA_FMForeachExpression(uint32_t line, const CFX_WideStringC& wsIdentifier, CFX_PtrArray* pAccessors, CXFA_FMExpression* pList); diff --git a/xfa/fxfa/fm2js/xfa_fmparse.h b/xfa/fxfa/fm2js/xfa_fmparse.h index a8991b466f..288ae90744 100644 --- a/xfa/fxfa/fm2js/xfa_fmparse.h +++ b/xfa/fxfa/fm2js/xfa_fmparse.h @@ -18,7 +18,7 @@ class CXFA_FMParse { int32_t Init(const CFX_WideStringC& wsFormcalc, CXFA_FMErrorInfo* pErrorInfo); void NextToken(); void Check(XFA_FM_TOKEN op); - void Error(FX_DWORD lineNum, XFA_FM_ERRMSG msg, ...); + void Error(uint32_t lineNum, XFA_FM_ERRMSG msg, ...); CFX_PtrArray* ParseTopExpression(); CXFA_FMExpression* ParseFunction(); CXFA_FMExpression* ParseExpression(); diff --git a/xfa/fxfa/fm2js/xfa_lexer.h b/xfa/fxfa/fm2js/xfa_lexer.h index 40fd8cae13..fd89dc72eb 100644 --- a/xfa/fxfa/fm2js/xfa_lexer.h +++ b/xfa/fxfa/fm2js/xfa_lexer.h @@ -94,25 +94,25 @@ const FX_WCHAR* XFA_FM_KeywordToString(XFA_FM_TOKEN op); class CXFA_FMToken { public: CXFA_FMToken(); - explicit CXFA_FMToken(FX_DWORD uLineNum); + explicit CXFA_FMToken(uint32_t uLineNum); CFX_WideStringC m_wstring; XFA_FM_TOKEN m_type; - FX_DWORD m_uLinenum; + uint32_t m_uLinenum; }; class CXFA_FMLexer { public: CXFA_FMLexer(const CFX_WideStringC& wsFormcalc, CXFA_FMErrorInfo* pErrorInfo); CXFA_FMToken* NextToken(); - FX_DWORD Number(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); - FX_DWORD String(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); - FX_DWORD Identifiers(CXFA_FMToken* t, + uint32_t Number(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); + uint32_t String(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); + uint32_t Identifiers(CXFA_FMToken* t, const FX_WCHAR* p, const FX_WCHAR*& pEnd); void Comment(const FX_WCHAR* p, const FX_WCHAR*& pEnd); XFA_FM_TOKEN IsKeyword(const CFX_WideStringC& p); - void SetCurrentLine(FX_DWORD line) { m_uCurrentLine = line; } + void SetCurrentLine(uint32_t line) { m_uCurrentLine = line; } void SetToken(CXFA_FMToken* pToken) { if (m_pToken.get() != pToken) m_pToken.reset(pToken); @@ -126,7 +126,7 @@ class CXFA_FMLexer { CXFA_FMToken* Scan(); const FX_WCHAR* m_ptr; - FX_DWORD m_uCurrentLine; + uint32_t m_uCurrentLine; std::unique_ptr m_pToken; CXFA_FMErrorInfo* m_pErrorInfo; }; diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.h b/xfa/fxfa/fm2js/xfa_simpleexpression.h index 3b8164e7d7..94f628b09b 100644 --- a/xfa/fxfa/fm2js/xfa_simpleexpression.h +++ b/xfa/fxfa/fm2js/xfa_simpleexpression.h @@ -57,7 +57,7 @@ enum XFA_FM_AccessorIndex { class CXFA_FMSimpleExpression { public: - CXFA_FMSimpleExpression(FX_DWORD line, XFA_FM_TOKEN op); + CXFA_FMSimpleExpression(uint32_t line, XFA_FM_TOKEN op); virtual ~CXFA_FMSimpleExpression() {} virtual void ToJavaScript(CFX_WideTextBuf& javascript); virtual void ToImpliedReturnJS(CFX_WideTextBuf& javascript); @@ -65,20 +65,20 @@ class CXFA_FMSimpleExpression { XFA_FM_TOKEN GetOperatorToken() const; protected: - FX_DWORD m_line; + uint32_t m_line; XFA_FM_TOKEN m_op; }; class CXFA_FMNullExpression : public CXFA_FMSimpleExpression { public: - explicit CXFA_FMNullExpression(FX_DWORD line); + explicit CXFA_FMNullExpression(uint32_t line); ~CXFA_FMNullExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; }; class CXFA_FMNumberExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMNumberExpression(FX_DWORD line, CFX_WideStringC wsNumber); + CXFA_FMNumberExpression(uint32_t line, CFX_WideStringC wsNumber); ~CXFA_FMNumberExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -88,7 +88,7 @@ class CXFA_FMNumberExpression : public CXFA_FMSimpleExpression { class CXFA_FMStringExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMStringExpression(FX_DWORD line, CFX_WideStringC wsString); + CXFA_FMStringExpression(uint32_t line, CFX_WideStringC wsString); ~CXFA_FMStringExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -98,7 +98,7 @@ class CXFA_FMStringExpression : public CXFA_FMSimpleExpression { class CXFA_FMIdentifierExpressionn : public CXFA_FMSimpleExpression { public: - CXFA_FMIdentifierExpressionn(FX_DWORD line, CFX_WideStringC wsIdentifier); + CXFA_FMIdentifierExpressionn(uint32_t line, CFX_WideStringC wsIdentifier); ~CXFA_FMIdentifierExpressionn() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -108,7 +108,7 @@ class CXFA_FMIdentifierExpressionn : public CXFA_FMSimpleExpression { class CXFA_FMUnaryExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMUnaryExpression(FX_DWORD line, + CXFA_FMUnaryExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp); void ToJavaScript(CFX_WideTextBuf& javascript) override; @@ -119,7 +119,7 @@ class CXFA_FMUnaryExpression : public CXFA_FMSimpleExpression { class CXFA_FMBinExpression : public CXFA_FMSimpleExpression { public: - CXFA_FMBinExpression(FX_DWORD line, + CXFA_FMBinExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -132,7 +132,7 @@ class CXFA_FMBinExpression : public CXFA_FMSimpleExpression { class CXFA_FMAssignExpression : public CXFA_FMBinExpression { public: - CXFA_FMAssignExpression(FX_DWORD line, + CXFA_FMAssignExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -143,7 +143,7 @@ class CXFA_FMAssignExpression : public CXFA_FMBinExpression { class CXFA_FMLogicalOrExpression : public CXFA_FMBinExpression { public: - CXFA_FMLogicalOrExpression(FX_DWORD line, + CXFA_FMLogicalOrExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -153,7 +153,7 @@ class CXFA_FMLogicalOrExpression : public CXFA_FMBinExpression { class CXFA_FMLogicalAndExpression : public CXFA_FMBinExpression { public: - CXFA_FMLogicalAndExpression(FX_DWORD line, + CXFA_FMLogicalAndExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -163,7 +163,7 @@ class CXFA_FMLogicalAndExpression : public CXFA_FMBinExpression { class CXFA_FMEqualityExpression : public CXFA_FMBinExpression { public: - CXFA_FMEqualityExpression(FX_DWORD line, + CXFA_FMEqualityExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -173,7 +173,7 @@ class CXFA_FMEqualityExpression : public CXFA_FMBinExpression { class CXFA_FMRelationalExpression : public CXFA_FMBinExpression { public: - CXFA_FMRelationalExpression(FX_DWORD line, + CXFA_FMRelationalExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -183,7 +183,7 @@ class CXFA_FMRelationalExpression : public CXFA_FMBinExpression { class CXFA_FMAdditiveExpression : public CXFA_FMBinExpression { public: - CXFA_FMAdditiveExpression(FX_DWORD line, + CXFA_FMAdditiveExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -193,7 +193,7 @@ class CXFA_FMAdditiveExpression : public CXFA_FMBinExpression { class CXFA_FMMultiplicativeExpression : public CXFA_FMBinExpression { public: - CXFA_FMMultiplicativeExpression(FX_DWORD line, + CXFA_FMMultiplicativeExpression(uint32_t line, XFA_FM_TOKEN op, CXFA_FMSimpleExpression* pExp1, CXFA_FMSimpleExpression* pExp2); @@ -203,34 +203,34 @@ class CXFA_FMMultiplicativeExpression : public CXFA_FMBinExpression { class CXFA_FMPosExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMPosExpression(FX_DWORD line, CXFA_FMSimpleExpression* pExp); + CXFA_FMPosExpression(uint32_t line, CXFA_FMSimpleExpression* pExp); ~CXFA_FMPosExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; }; class CXFA_FMNegExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMNegExpression(FX_DWORD line, CXFA_FMSimpleExpression* pExp); + CXFA_FMNegExpression(uint32_t line, CXFA_FMSimpleExpression* pExp); ~CXFA_FMNegExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; }; class CXFA_FMNotExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMNotExpression(FX_DWORD line, CXFA_FMSimpleExpression* pExp); + CXFA_FMNotExpression(uint32_t line, CXFA_FMSimpleExpression* pExp); ~CXFA_FMNotExpression() override {} void ToJavaScript(CFX_WideTextBuf& javascript) override; }; class CXFA_FMCallExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMCallExpression(FX_DWORD line, + CXFA_FMCallExpression(uint32_t line, CXFA_FMSimpleExpression* pExp, CFX_PtrArray* pArguments, FX_BOOL bIsSomMethod); ~CXFA_FMCallExpression() override; bool IsBuildInFunc(CFX_WideTextBuf* funcName); - FX_DWORD IsMethodWithObjParam(const CFX_WideStringC& methodName); + uint32_t IsMethodWithObjParam(const CFX_WideStringC& methodName); void ToJavaScript(CFX_WideTextBuf& javascript) override; private: @@ -240,7 +240,7 @@ class CXFA_FMCallExpression : public CXFA_FMUnaryExpression { class CXFA_FMDotAccessorExpression : public CXFA_FMBinExpression { public: - CXFA_FMDotAccessorExpression(FX_DWORD line, + CXFA_FMDotAccessorExpression(uint32_t line, CXFA_FMSimpleExpression* pAccessor, XFA_FM_TOKEN op, CFX_WideStringC wsIdentifier, @@ -254,7 +254,7 @@ class CXFA_FMDotAccessorExpression : public CXFA_FMBinExpression { class CXFA_FMIndexExpression : public CXFA_FMUnaryExpression { public: - CXFA_FMIndexExpression(FX_DWORD line, + CXFA_FMIndexExpression(uint32_t line, XFA_FM_AccessorIndex accessorIndex, CXFA_FMSimpleExpression* pIndexExp, FX_BOOL bIsStarIndex); @@ -268,7 +268,7 @@ class CXFA_FMIndexExpression : public CXFA_FMUnaryExpression { class CXFA_FMDotDotAccessorExpression : public CXFA_FMBinExpression { public: - CXFA_FMDotDotAccessorExpression(FX_DWORD line, + CXFA_FMDotDotAccessorExpression(uint32_t line, CXFA_FMSimpleExpression* pAccessor, XFA_FM_TOKEN op, CFX_WideStringC wsIdentifier, @@ -282,7 +282,7 @@ class CXFA_FMDotDotAccessorExpression : public CXFA_FMBinExpression { class CXFA_FMMethodCallExpression : public CXFA_FMBinExpression { public: - CXFA_FMMethodCallExpression(FX_DWORD line, + CXFA_FMMethodCallExpression(uint32_t line, CXFA_FMSimpleExpression* pAccessorExp1, CXFA_FMSimpleExpression* pCallExp); ~CXFA_FMMethodCallExpression() override {} diff --git a/xfa/fxfa/parser/xfa_basic_imp.h b/xfa/fxfa/parser/xfa_basic_imp.h index d0440face1..ac0f8692ee 100644 --- a/xfa/fxfa/parser/xfa_basic_imp.h +++ b/xfa/fxfa/parser/xfa_basic_imp.h @@ -27,7 +27,7 @@ class CXFA_WideTextRead : public IFX_Stream { virtual void Release(); virtual IFX_Stream* Retain(); - virtual FX_DWORD GetAccessModes() const; + virtual uint32_t GetAccessModes() const; virtual int32_t GetLength() const; virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset); virtual int32_t GetPosition(); @@ -54,7 +54,7 @@ class CXFA_WideTextRead : public IFX_Stream { virtual void Lock() {} virtual void Unlock() {} - virtual IFX_Stream* CreateSharedStream(FX_DWORD dwAccess, + virtual IFX_Stream* CreateSharedStream(uint32_t dwAccess, int32_t iOffset, int32_t iLength) { return NULL; diff --git a/xfa/fxfa/parser/xfa_docdata.h b/xfa/fxfa/parser/xfa_docdata.h index b3c3edd0cc..b57b8da552 100644 --- a/xfa/fxfa/parser/xfa_docdata.h +++ b/xfa/fxfa/parser/xfa_docdata.h @@ -22,7 +22,7 @@ class IXFA_PacketExport { virtual FX_BOOL Export(IFX_FileWrite* pWrite) = 0; virtual FX_BOOL Export(IFX_FileWrite* pWrite, CXFA_Node* pNode, - FX_DWORD dwFlag = 0, + uint32_t dwFlag = 0, const FX_CHAR* pChecksum = NULL) = 0; }; class IXFA_PacketImport { diff --git a/xfa/fxfa/parser/xfa_doclayout.h b/xfa/fxfa/parser/xfa_doclayout.h index bb44868a98..8558cd0992 100644 --- a/xfa/fxfa/parser/xfa_doclayout.h +++ b/xfa/fxfa/parser/xfa_doclayout.h @@ -90,7 +90,7 @@ class CXFA_ContentLayoutItem : public CXFA_LayoutItem { CXFA_ContentLayoutItem* m_pNext; CFX_PointF m_sPos; CFX_SizeF m_sSize; - FX_DWORD m_dwStatus; + uint32_t m_dwStatus; }; CXFA_ContainerLayoutItem* CXFA_LayoutItem::AsContainerLayoutItem() { diff --git a/xfa/fxfa/parser/xfa_document.h b/xfa/fxfa/parser/xfa_document.h index affe4001ba..5938f2da56 100644 --- a/xfa/fxfa/parser/xfa_document.h +++ b/xfa/fxfa/parser/xfa_document.h @@ -82,7 +82,7 @@ class IXFA_Notify { void* pParam3 = NULL, void* pParam4 = NULL) = 0; virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender, - FX_DWORD dwEvent, + uint32_t dwEvent, void* pParam = NULL, void* pAdditional = NULL, void* pAdditional2 = NULL) = 0; @@ -123,7 +123,7 @@ class IXFA_Notify { class IXFA_ObjFactory { public: virtual ~IXFA_ObjFactory() {} - virtual CXFA_Node* CreateNode(FX_DWORD dwPacket, XFA_ELEMENT eElement) = 0; + virtual CXFA_Node* CreateNode(uint32_t dwPacket, XFA_ELEMENT eElement) = 0; virtual CXFA_Node* CreateNode(const XFA_PACKETINFO* pPacket, XFA_ELEMENT eElement) = 0; }; @@ -146,17 +146,17 @@ class CXFA_Document : public IXFA_ObjFactory { IXFA_Notify* GetNotify() const; void SetRoot(CXFA_Node* pNewRoot); CXFA_Object* GetXFAObject(const CFX_WideStringC& wsNodeName); - CXFA_Object* GetXFAObject(FX_DWORD wsNodeNameHash); + CXFA_Object* GetXFAObject(uint32_t wsNodeNameHash); void AddPurgeNode(CXFA_Node* pNode); FX_BOOL RemovePurgeNode(CXFA_Node* pNode); void PurgeNodes(); - bool HasFlag(FX_DWORD dwFlag) { return (m_dwDocFlags & dwFlag) == dwFlag; } - void SetFlag(FX_DWORD dwFlag, FX_BOOL bOn = TRUE); + bool HasFlag(uint32_t dwFlag) { return (m_dwDocFlags & dwFlag) == dwFlag; } + void SetFlag(uint32_t dwFlag, FX_BOOL bOn = TRUE); FX_BOOL IsInteractive(); XFA_VERSION GetCurVersionMode() { return m_eCurVersionMode; } XFA_VERSION RecognizeXFAVersionNumber(CFX_WideString& wsTemplateNS); CXFA_LocaleMgr* GetLocalMgr(); - virtual CXFA_Node* CreateNode(FX_DWORD dwPacket, XFA_ELEMENT eElement); + virtual CXFA_Node* CreateNode(uint32_t dwPacket, XFA_ELEMENT eElement); virtual CXFA_Node* CreateNode(const XFA_PACKETINFO* pPacket, XFA_ELEMENT eElement); void DoProtoMerge(); @@ -177,7 +177,7 @@ class CXFA_Document : public IXFA_ObjFactory { IXFA_ScriptContext* GetScriptContext(); void ClearLayoutData(); - CFX_MapPtrTemplate m_rgGlobalBinding; + CFX_MapPtrTemplate m_rgGlobalBinding; CXFA_NodeArray m_pPendingPageSet; protected: @@ -194,7 +194,7 @@ class CXFA_Document : public IXFA_ObjFactory { CScript_SignaturePseudoModel* m_pScriptSignature; CXFA_NodeSet m_rgPurgeNodes; XFA_VERSION m_eCurVersionMode; - FX_DWORD m_dwDocFlags; + uint32_t m_dwDocFlags; friend class CXFA_SimpleParser; }; diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.h b/xfa/fxfa/parser/xfa_document_datamerger_imp.h index a5583cb9b7..0749b73e47 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.h +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.h @@ -18,7 +18,7 @@ CXFA_Node* XFA_NodeMerge_CloneOrMergeContainer( CXFA_Node* XFA_DataMerge_FindDataScope(CXFA_Node* pParentFormNode); CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* pDocument, XFA_ELEMENT eClassID, - FX_DWORD dwNameHash, + uint32_t dwNameHash, CXFA_Node* pFormParent); #endif // XFA_FXFA_PARSER_XFA_DOCUMENT_DATAMERGER_IMP_H_ diff --git a/xfa/fxfa/parser/xfa_document_serialize.h b/xfa/fxfa/parser/xfa_document_serialize.h index f9253fb980..f18e163a8d 100644 --- a/xfa/fxfa/parser/xfa_document_serialize.h +++ b/xfa/fxfa/parser/xfa_document_serialize.h @@ -26,13 +26,13 @@ class CXFA_DataExporter : public IXFA_PacketExport { virtual FX_BOOL Export(IFX_FileWrite* pWrite); virtual FX_BOOL Export(IFX_FileWrite* pWrite, CXFA_Node* pNode, - FX_DWORD dwFlag = 0, + uint32_t dwFlag = 0, const FX_CHAR* pChecksum = NULL); protected: FX_BOOL Export(IFX_Stream* pStream, CXFA_Node* pNode, - FX_DWORD dwFlag, + uint32_t dwFlag, const FX_CHAR* pChecksum); CXFA_Document* m_pDocument; }; diff --git a/xfa/fxfa/parser/xfa_layout_appadapter.h b/xfa/fxfa/parser/xfa_layout_appadapter.h index f20ee9b3fe..eb4a9631d6 100644 --- a/xfa/fxfa/parser/xfa_layout_appadapter.h +++ b/xfa/fxfa/parser/xfa_layout_appadapter.h @@ -71,7 +71,7 @@ class CXFA_TraverseStrategy_ContentLayoutItem { return (CXFA_ContentLayoutItem*)pLayoutItem->m_pParent; } }; -FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant); +uint32_t XFA_GetRelevant(CXFA_Node* pFormItem, uint32_t dwParentRelvant); void XFA_ReleaseLayoutItem(CXFA_LayoutItem* pLayoutItem); #endif // XFA_FXFA_PARSER_XFA_LAYOUT_APPADAPTER_H_ diff --git a/xfa/fxfa/parser/xfa_localevalue.h b/xfa/fxfa/parser/xfa_localevalue.h index 5906858f33..bd88b0c325 100644 --- a/xfa/fxfa/parser/xfa_localevalue.h +++ b/xfa/fxfa/parser/xfa_localevalue.h @@ -27,11 +27,11 @@ class CXFA_LocaleValue { public: CXFA_LocaleValue(); CXFA_LocaleValue(const CXFA_LocaleValue& value); - CXFA_LocaleValue(FX_DWORD dwType, CXFA_LocaleMgr* pLocaleMgr); - CXFA_LocaleValue(FX_DWORD dwType, + CXFA_LocaleValue(uint32_t dwType, CXFA_LocaleMgr* pLocaleMgr); + CXFA_LocaleValue(uint32_t dwType, const CFX_WideString& wsValue, CXFA_LocaleMgr* pLocaleMgr); - CXFA_LocaleValue(FX_DWORD dwType, + CXFA_LocaleValue(uint32_t dwType, const CFX_WideString& wsValue, const CFX_WideString& wsFormat, IFX_Locale* pLocale, @@ -52,7 +52,7 @@ class CXFA_LocaleValue { IFX_Locale* pLocale, XFA_VALUEPICTURE eValueType) const; FX_BOOL ValidateCanonicalValue(const CFX_WideString& wsValue, - FX_DWORD dwVType); + uint32_t dwVType); FX_BOOL ValidateCanonicalDate(const CFX_WideString& wsDate, CFX_Unitime& unDate); FX_BOOL ValidateCanonicalTime(const CFX_WideString& wsTime); @@ -67,8 +67,8 @@ class CXFA_LocaleValue { int32_t* pos = NULL); CFX_WideString GetValue() const; - FX_DWORD GetType() const; - void SetValue(const CFX_WideString& wsValue, FX_DWORD dwType); + uint32_t GetType() const; + void SetValue(const CFX_WideString& wsValue, uint32_t dwType); CFX_WideString GetText() const; FX_FLOAT GetNum() const; FX_DOUBLE GetDoubleNum() const; @@ -105,7 +105,7 @@ class CXFA_LocaleValue { IFX_Locale* pLocale); CXFA_LocaleMgr* m_pLocaleMgr; CFX_WideString m_wsValue; - FX_DWORD m_dwType; + uint32_t m_dwType; FX_BOOL m_bValid; }; diff --git a/xfa/fxfa/parser/xfa_object.h b/xfa/fxfa/parser/xfa_object.h index e50d6ab46f..a41cf4af2a 100644 --- a/xfa/fxfa/parser/xfa_object.h +++ b/xfa/fxfa/parser/xfa_object.h @@ -41,9 +41,9 @@ enum XFA_OBJECTTYPE { }; class CXFA_Object { public: - CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags); + CXFA_Object(CXFA_Document* pDocument, uint32_t uFlags); CXFA_Document* GetDocument() const { return m_pDocument; } - FX_DWORD GetFlag() const { return m_uFlags; } + uint32_t GetFlag() const { return m_uFlags; } XFA_OBJECTTYPE GetObjectType() const { return (XFA_OBJECTTYPE)(m_uFlags & XFA_OBJECTTYPEMASK); } @@ -85,7 +85,7 @@ class CXFA_Object { protected: CXFA_Document* const m_pDocument; - FX_DWORD m_uFlags; + uint32_t m_uFlags; }; #define XFA_NODEFILTER_Children 0x01 @@ -131,9 +131,9 @@ struct XFA_MAPMODULEDATA { class CXFA_Node : public CXFA_Object { public: XFA_ELEMENT GetClassID() const { return (XFA_ELEMENT)m_eNodeClass; } - FX_DWORD GetPacketID() const { return m_ePacket; } - FX_BOOL HasFlag(FX_DWORD dwFlag) const; - void SetFlag(FX_DWORD dwFlag, FX_BOOL bOn = TRUE, FX_BOOL bNotify = TRUE); + uint32_t GetPacketID() const { return m_ePacket; } + FX_BOOL HasFlag(uint32_t dwFlag) const; + void SetFlag(uint32_t dwFlag, FX_BOOL bOn = TRUE, FX_BOOL bNotify = TRUE); FX_BOOL IsAttributeInXML(); FX_BOOL IsFormContainer() { return m_ePacket == XFA_XDPPACKET_Form && IsContainerNode(); @@ -142,7 +142,7 @@ class CXFA_Node : public CXFA_Object { IFDE_XMLNode* GetXMLMappingNode() const { return m_pXMLNode; } IFDE_XMLNode* CreateXMLMappingNode(); FX_BOOL IsNeedSavingXMLNode(); - FX_DWORD GetNameHash() const { return m_dwNameHash; } + uint32_t GetNameHash() const { return m_dwNameHash; } bool IsUnnamed() const { return m_dwNameHash == 0; } CXFA_Node* GetModelNode(); void UpdateNameHash(); @@ -268,12 +268,12 @@ class CXFA_Node : public CXFA_Object { CXFA_Node* GetNodeItem(XFA_NODEITEM eItem) const; CXFA_Node* GetNodeItem(XFA_NODEITEM eItem, XFA_OBJECTTYPE eType) const; int32_t GetNodeList(CXFA_NodeArray& nodes, - FX_DWORD dwTypeFilter = XFA_NODEFILTER_Children | + uint32_t dwTypeFilter = XFA_NODEFILTER_Children | XFA_NODEFILTER_Properties, XFA_ELEMENT eElementFilter = XFA_ELEMENT_UNKNOWN, int32_t iLevel = 1); CXFA_Node* CreateSamePacketNode(XFA_ELEMENT eElement, - FX_DWORD dwFlags = XFA_NODEFLAG_Initialized); + uint32_t dwFlags = XFA_NODEFLAG_Initialized); CXFA_Node* CloneTemplateToForm(FX_BOOL bRecursive); CXFA_Node* GetTemplateNode() const; void SetTemplateNode(CXFA_Node* pTemplateNode); @@ -289,9 +289,9 @@ class CXFA_Node : public CXFA_Object { FX_BOOL GetLocaleName(CFX_WideString& wsLocaleName); XFA_ATTRIBUTEENUM GetIntact(); CXFA_Node* GetFirstChildByName(const CFX_WideStringC& wsNodeName) const; - CXFA_Node* GetFirstChildByName(FX_DWORD dwNodeNameHash) const; + CXFA_Node* GetFirstChildByName(uint32_t dwNodeNameHash) const; CXFA_Node* GetFirstChildByClass(XFA_ELEMENT eNodeClass) const; - CXFA_Node* GetNextSameNameSibling(FX_DWORD dwNodeNameHash) const; + CXFA_Node* GetNextSameNameSibling(uint32_t dwNodeNameHash) const; CXFA_Node* GetNextSameNameSibling(const CFX_WideStringC& wsNodeName) const; CXFA_Node* GetNextSameClassSibling(XFA_ELEMENT eNodeClass) const; int32_t GetNodeSameNameIndex() const; @@ -304,7 +304,7 @@ class CXFA_Node : public CXFA_Object { void Script_TreeClass_ResolveNodes(CFXJSE_Arguments* pArguments); void Script_Som_ResolveNodeList(FXJSE_HVALUE hValue, CFX_WideString wsExpression, - FX_DWORD dwFlag, + uint32_t dwFlag, CXFA_Node* refNode = NULL); void Script_TreeClass_All(FXJSE_HVALUE hValue, FX_BOOL bSetting, @@ -641,7 +641,7 @@ class CXFA_Node : public CXFA_Object { IFDE_XMLNode* m_pXMLNode; XFA_ELEMENT m_eNodeClass; uint16_t m_ePacket; - FX_DWORD m_dwNameHash; + uint32_t m_dwNameHash; CXFA_Node* m_pAuxNode; XFA_MAPMODULEDATA* m_pMapModuleData; }; diff --git a/xfa/fxfa/parser/xfa_parser_imp.h b/xfa/fxfa/parser/xfa_parser_imp.h index f01ffa2123..6ef890857a 100644 --- a/xfa/fxfa/parser/xfa_parser_imp.h +++ b/xfa/fxfa/parser/xfa_parser_imp.h @@ -132,7 +132,7 @@ class CXFA_XMLParser : public IFDE_XMLParser { CXFA_XMLNodeStack m_NodeStack; CFX_WideString m_ws1; CFX_WideString m_ws2; - FX_DWORD m_dwStatus; + uint32_t m_dwStatus; }; #endif // XFA_FXFA_PARSER_XFA_PARSER_IMP_H_ diff --git a/xfa/fxfa/parser/xfa_script.h b/xfa/fxfa/parser/xfa_script.h index 6d8f3a0ed3..fb2960d09b 100644 --- a/xfa/fxfa/parser/xfa_script.h +++ b/xfa/fxfa/parser/xfa_script.h @@ -97,7 +97,7 @@ class IXFA_ScriptContext { virtual int32_t ResolveObjects(CXFA_Object* refNode, const CFX_WideStringC& wsExpression, XFA_RESOLVENODE_RS& resolveNodeRS, - FX_DWORD dwStyles = XFA_RESOLVENODE_Children, + uint32_t dwStyles = XFA_RESOLVENODE_Children, CXFA_Node* bindNode = NULL) = 0; virtual FXJSE_HVALUE GetJSValueFromMap(CXFA_Object* pObject) = 0; virtual void CacheList(CXFA_NodeList* pList) = 0; diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h index 54f26b2b70..1c185f5462 100644 --- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.h @@ -90,7 +90,7 @@ class CScript_EventPseudoModel : public CXFA_OrdinaryObject { protected: void Script_EventPseudoModel_Property(FXJSE_HVALUE hValue, - FX_DWORD dwFlag, + uint32_t dwFlag, FX_BOOL bSetting); }; diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h index 0f711b8948..5718074b2f 100644 --- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.h +++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.h @@ -80,7 +80,7 @@ class CScript_HostPseudoModel : public CXFA_OrdinaryObject { protected: void Script_HostPseudoModel_LoadString(FXJSE_HVALUE hValue, IXFA_Notify* pNotify, - FX_DWORD dwFlag); + uint32_t dwFlag); FX_BOOL Script_HostPseudoModel_ValidateArgsForMsg( CFXJSE_Arguments* pArguments, int32_t iArgIndex, diff --git a/xfa/fxfa/parser/xfa_script_imp.h b/xfa/fxfa/parser/xfa_script_imp.h index ab225eb54d..237192e855 100644 --- a/xfa/fxfa/parser/xfa_script_imp.h +++ b/xfa/fxfa/parser/xfa_script_imp.h @@ -35,7 +35,7 @@ class CXFA_ScriptContext : public IXFA_ScriptContext { virtual int32_t ResolveObjects(CXFA_Object* refNode, const CFX_WideStringC& wsExpression, XFA_RESOLVENODE_RS& resolveNodeRS, - FX_DWORD dwStyles = XFA_RESOLVENODE_Children, + uint32_t dwStyles = XFA_RESOLVENODE_Children, CXFA_Node* bindNode = NULL); virtual FXJSE_HVALUE GetJSValueFromMap(CXFA_Object* pObject); virtual void CacheList(CXFA_NodeList* pList) { m_CacheListArray.Add(pList); } @@ -59,7 +59,7 @@ class CXFA_ScriptContext : public IXFA_ScriptContext { FX_BOOL QueryNodeByFlag(CXFA_Node* refNode, const CFX_WideStringC& propname, FXJSE_HVALUE hValue, - FX_DWORD dwFlag, + uint32_t dwFlag, FX_BOOL bSetting); FX_BOOL QueryVariableHValue(CXFA_Node* pScriptNode, const CFX_ByteStringC& szPropName, @@ -121,7 +121,7 @@ class CXFA_ScriptContext : public IXFA_ScriptContext { CXFA_ResolveProcessor* m_pResolveProcessor; XFA_HFM2JSCONTEXT m_hFM2JSContext; CXFA_Object* m_pThisObject; - FX_DWORD m_dwBuiltInInFlags; + uint32_t m_dwBuiltInInFlags; XFA_ATTRIBUTEENUM m_eRunAtType; }; diff --git a/xfa/fxfa/parser/xfa_script_nodehelper.h b/xfa/fxfa/parser/xfa_script_nodehelper.h index b52f681447..e90db585fc 100644 --- a/xfa/fxfa/parser/xfa_script_nodehelper.h +++ b/xfa/fxfa/parser/xfa_script_nodehelper.h @@ -29,13 +29,13 @@ class CXFA_NodeHelper { XFA_LOGIC_TYPE eLogicType = XFA_LOGIC_NoTransparent); int32_t XFA_NodeAcc_TraverseSiblings(CXFA_Node* parent, - FX_DWORD dNameHash, + uint32_t dNameHash, CXFA_NodeArray* pSiblings, XFA_LOGIC_TYPE eLogicType, FX_BOOL bIsClassName = FALSE, FX_BOOL bIsFindProperty = TRUE); int32_t XFA_NodeAcc_TraverseAnySiblings(CXFA_Node* parent, - FX_DWORD dNameHash, + uint32_t dNameHash, CXFA_NodeArray* pSiblings, FX_BOOL bIsClassName = FALSE); int32_t XFA_CountSiblings(CXFA_Node* pNode, diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.h b/xfa/fxfa/parser/xfa_script_resolveprocessor.h index fa34a88038..ee0cd82b7c 100644 --- a/xfa/fxfa/parser/xfa_script_resolveprocessor.h +++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.h @@ -35,7 +35,7 @@ class CXFA_ResolveNodesData { CFX_WideString m_wsCondition; int32_t m_nLevel; CXFA_ObjArray m_Nodes; - FX_DWORD m_dwStyles; + uint32_t m_dwStyles; const XFA_SCRIPTATTRIBUTEINFO* m_pScriptAttribute; XFA_RESOVENODE_RSTYPE m_dwFlag; }; @@ -67,7 +67,7 @@ class CXFA_ResolveProcessor { void XFA_ResolveNode_FilterCondition(CXFA_ResolveNodesData& rnd, CFX_WideString wsCondition); int32_t XFA_ResolveNodes_PopStack(CFX_Int32Array& stack); - void XFA_ResolveNodes_SetStylesForChild(FX_DWORD dwParentStyles, + void XFA_ResolveNodes_SetStylesForChild(uint32_t dwParentStyles, CXFA_ResolveNodesData& rnd); int32_t XFA_ResolveNode_SetResultCreateNode(XFA_RESOLVENODE_RS& resolveNodeRS, CFX_WideString& wsLastCondition); diff --git a/xfa/fxgraphics/include/cfx_graphics.h b/xfa/fxgraphics/include/cfx_graphics.h index 0bb1e76e10..be9176ebc2 100644 --- a/xfa/fxgraphics/include/cfx_graphics.h +++ b/xfa/fxgraphics/include/cfx_graphics.h @@ -240,7 +240,7 @@ class CFX_Graphics { FX_ERR SetDIBitsWithMatrix(CFX_DIBSource* source, CFX_Matrix* matrix); FX_ERR CalcTextInfo(const CFX_WideString& text, - FX_DWORD* charCodes, + uint32_t* charCodes, FXTEXT_CHARPOS* charPos, CFX_RectF& rect); diff --git a/xfa/fxjse/include/fxjse.h b/xfa/fxjse/include/fxjse.h index cf6587e8fd..2bf4d7ea69 100644 --- a/xfa/fxjse/include/fxjse.h +++ b/xfa/fxjse/include/fxjse.h @@ -83,7 +83,7 @@ FXJSE_HVALUE FXJSE_Context_GetGlobalObject(FXJSE_HCONTEXT hContext); FXJSE_HRUNTIME FXJSE_Context_GetRuntime(FXJSE_HCONTEXT hContext); void FXJSE_Context_EnableCompatibleMode(FXJSE_HCONTEXT hContext, - FX_DWORD dwCompatibleFlags); + uint32_t dwCompatibleFlags); void FXJSE_DefineFunctions(FXJSE_HCONTEXT hContext, const FXJSE_FUNCTION* lpFunctions, diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h index 0483de0f4c..2aa05a2a3c 100644 --- a/xfa/include/fwl/lightwidget/barcode.h +++ b/xfa/include/fwl/lightwidget/barcode.h @@ -108,8 +108,8 @@ class CFWL_Barcode : public CFWL_Edit { virtual int32_t GetErrorCorrectionLevel() { return m_nECLevel; } FX_BOOL m_bTruncated; virtual FX_BOOL GetTruncated() { return m_bTruncated; } - FX_DWORD m_dwAttributeMask; - virtual FX_DWORD GetBarcodeAttributeMask() { return m_dwAttributeMask; } + uint32_t m_dwAttributeMask; + virtual uint32_t GetBarcodeAttributeMask() { return m_dwAttributeMask; } public: CFWL_BarcodeDP() : m_dwAttributeMask(0) {} diff --git a/xfa/include/fwl/lightwidget/caret.h b/xfa/include/fwl/lightwidget/caret.h index 9f84950412..0d8817d296 100644 --- a/xfa/include/fwl/lightwidget/caret.h +++ b/xfa/include/fwl/lightwidget/caret.h @@ -16,8 +16,8 @@ class CFWL_Caret : public CFWL_Widget { static CFWL_Caret* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL); FWL_ERR ShowCaret(FX_BOOL bFlag = TRUE); - FWL_ERR GetFrequency(FX_DWORD& elapse); - FWL_ERR SetFrequency(FX_DWORD elapse); + FWL_ERR GetFrequency(uint32_t& elapse); + FWL_ERR SetFrequency(uint32_t elapse); FWL_ERR SetColor(CFX_Color crFill); protected: diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h index 4229cc9a6a..c89ddb2b2a 100644 --- a/xfa/include/fwl/lightwidget/combobox.h +++ b/xfa/include/fwl/lightwidget/combobox.h @@ -64,8 +64,8 @@ class CFWL_ComboBox : public CFWL_Widget { FX_BOOL EditDelete(); FX_BOOL EditDeSelect(); FWL_ERR GetBBox(CFX_RectF& rect); - FWL_ERR EditModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); + FWL_ERR EditModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); CFWL_ComboBox(); virtual ~CFWL_ComboBox(); @@ -86,7 +86,7 @@ class CFWL_ComboBox : public CFWL_Widget { FWL_HLISTITEM hItem, int32_t nIndex); - virtual FX_DWORD GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem); + virtual uint32_t GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem); virtual FWL_ERR GetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, CFX_WideString& wsText); @@ -96,7 +96,7 @@ class CFWL_ComboBox : public CFWL_Widget { virtual void* GetItemData(IFWL_Widget* pWidget, FWL_HLISTITEM hItem); virtual FWL_ERR SetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwStyle); + uint32_t dwStyle); virtual FWL_ERR SetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText); @@ -112,11 +112,11 @@ class CFWL_ComboBox : public CFWL_Widget { virtual FWL_ERR SetItemCheckRect(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtCheck); - virtual FX_DWORD GetItemCheckState(IFWL_Widget* pWidget, + virtual uint32_t GetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem); virtual FWL_ERR SetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwCheckState); + uint32_t dwCheckState); virtual FX_FLOAT GetListHeight(IFWL_Widget* pWidget); std::vector> m_ItemArray; @@ -133,10 +133,10 @@ class CFWL_ComboBoxItem { m_pData = NULL; } CFX_RectF m_rtItem; - FX_DWORD m_dwStyles; + uint32_t m_dwStyles; CFX_WideString m_wsText; CFX_DIBitmap* m_pDIB; - FX_DWORD m_dwCheckState; + uint32_t m_dwCheckState; CFX_RectF m_rtCheckBox; void* m_pData; }; diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h index 379883fb0b..17ab11ceb2 100644 --- a/xfa/include/fwl/lightwidget/datetimepicker.h +++ b/xfa/include/fwl/lightwidget/datetimepicker.h @@ -36,8 +36,8 @@ class CFWL_DateTimePicker : public CFWL_Widget { FX_BOOL DeSelect(); FWL_ERR GetBBox(CFX_RectF& rect); FWL_ERR SetEditLimit(int32_t nLimit); - FWL_ERR ModifyEditStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); + FWL_ERR ModifyEditStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); protected: CFWL_DateTimePicker(); diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h index 24a04a35eb..a142f483d1 100644 --- a/xfa/include/fwl/lightwidget/edit.h +++ b/xfa/include/fwl/lightwidget/edit.h @@ -45,7 +45,7 @@ class CFWL_Edit : public CFWL_Widget { FX_BOOL Undo(const CFX_ByteStringC& bsRecord); FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant); FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax); - FWL_ERR SetBackColor(FX_DWORD dwColor); + FWL_ERR SetBackColor(uint32_t dwColor); FWL_ERR SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize); FX_BOOL CanUndo(); FX_BOOL CanRedo(); diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h index 69c7d208c6..6e35de738b 100644 --- a/xfa/include/fwl/lightwidget/listbox.h +++ b/xfa/include/fwl/lightwidget/listbox.h @@ -43,7 +43,7 @@ class CFWL_ListBox : public CFWL_Widget { FWL_ERR SetItemData(FWL_HLISTITEM hItem, void* pData); void* GetItemData(FWL_HLISTITEM hItem); FWL_HLISTITEM GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy); - FX_DWORD GetItemStates(FWL_HLISTITEM hItem); + uint32_t GetItemStates(FWL_HLISTITEM hItem); CFWL_ListBox(); virtual ~CFWL_ListBox(); @@ -64,7 +64,7 @@ class CFWL_ListBox : public CFWL_Widget { FX_BOOL SetItemIndex(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, int32_t nIndex) override; - FX_DWORD GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) override; + uint32_t GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) override; FWL_ERR GetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, CFX_WideString& wsText) override; @@ -74,7 +74,7 @@ class CFWL_ListBox : public CFWL_Widget { void* GetItemData(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) override; FWL_ERR SetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwStyle) override; + uint32_t dwStyle) override; FWL_ERR SetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText) override; @@ -90,11 +90,11 @@ class CFWL_ListBox : public CFWL_Widget { FWL_ERR SetItemCheckRect(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtCheck) override; - FX_DWORD GetItemCheckState(IFWL_Widget* pWidget, + uint32_t GetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) override; FWL_ERR SetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwCheckState) override; + uint32_t dwCheckState) override; std::vector> m_ItemArray; CFX_WideString m_wsData; @@ -116,11 +116,11 @@ class CFWL_ListItem { m_rtCheckBox.Reset(); } CFX_RectF m_rtItem; - FX_DWORD m_dwStates; + uint32_t m_dwStates; CFX_WideString m_wsText; CFX_DIBitmap* m_pDIB; void* m_pData; - FX_DWORD m_dwCheckState; + uint32_t m_dwCheckState; CFX_RectF m_rtCheckBox; }; diff --git a/xfa/include/fwl/lightwidget/scrollbar.h b/xfa/include/fwl/lightwidget/scrollbar.h index d78e8bec63..3d35ee651f 100644 --- a/xfa/include/fwl/lightwidget/scrollbar.h +++ b/xfa/include/fwl/lightwidget/scrollbar.h @@ -24,7 +24,7 @@ class CFWL_ScrollBar : public CFWL_Widget { FWL_ERR SetPos(FX_FLOAT fPos); FX_FLOAT GetTrackPos(); FWL_ERR SetTrackPos(FX_FLOAT fTrackPos); - FX_BOOL DoScroll(FX_DWORD dwCode, FX_FLOAT fPos = 0.0f); + FX_BOOL DoScroll(uint32_t dwCode, FX_FLOAT fPos = 0.0f); CFWL_ScrollBar(); virtual ~CFWL_ScrollBar(); }; diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h index c39b48e307..9e91236ce8 100644 --- a/xfa/include/fwl/lightwidget/theme.h +++ b/xfa/include/fwl/lightwidget/theme.h @@ -27,16 +27,16 @@ class CFWL_Theme : public IFWL_ThemeProvider { // IFWL_ThemeProvider: FX_BOOL IsValidWidget(IFWL_Widget* pWidget) override; - FX_DWORD GetThemeID(IFWL_Widget* pWidget) override; - FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + uint32_t GetThemeID(IFWL_Widget* pWidget) override; + uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE) override; FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix) override; FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget, const CFX_Matrix& matrix) override; FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams) override; FX_BOOL DrawText(CFWL_ThemeText* pParams) override; - void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity) override; + void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity) override; FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget) override; FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) override; FX_BOOL IsInPart(CFWL_ThemePart* pThemePart, diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index 2f7ea641e9..38fe777fd2 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -34,9 +34,9 @@ class CFWL_WidgetProperties { CFX_WideString m_wsWindowclass; CFX_Matrix m_ctmOnParent; CFX_RectF m_rtWidget; - FX_DWORD m_dwStyles; - FX_DWORD m_dwStyleExes; - FX_DWORD m_dwStates; + uint32_t m_dwStyles; + uint32_t m_dwStyleExes; + uint32_t m_dwStates; CFWL_Widget* m_pParent; CFWL_Widget* m_pOwner; }; @@ -46,7 +46,7 @@ class CFWL_Widget { virtual ~CFWL_Widget(); IFWL_Widget* GetWidget(); FWL_ERR GetClassName(CFX_WideString& wsClass) const; - FX_DWORD GetClassID() const; + uint32_t GetClassID() const; virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; protected: @@ -61,12 +61,12 @@ class CFWL_Widget { FWL_ERR SetParent(CFWL_Widget* pParent); CFWL_Widget* GetOwner(); FWL_ERR SetOwner(CFWL_Widget* pOwner); - FX_DWORD GetStyles(); - FWL_ERR ModifyStyles(FX_DWORD dwStylesAdded, FX_DWORD dwStylesRemoved); - FX_DWORD GetStylesEx(); - FWL_ERR ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved); - FX_DWORD GetStates(); - FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE); + uint32_t GetStyles(); + FWL_ERR ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved); + uint32_t GetStylesEx(); + FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved); + uint32_t GetStates(); + FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); FWL_ERR SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback); @@ -74,7 +74,7 @@ class CFWL_Widget { FWL_ERR Update(); FWL_ERR LockUpdate(); FWL_ERR UnlockUpdate(); - FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy); + uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); FWL_ERR TransformTo(CFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy); FWL_ERR TransformTo(CFWL_Widget* pWidget, CFX_RectF& rt); FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE); @@ -87,7 +87,7 @@ class CFWL_Widget { CFWL_Widget(); void RegisterEventTarget(CFWL_Widget* pEventSource = NULL, - FX_DWORD dwFilter = FWL_EVENT_ALL_MASK); + uint32_t dwFilter = FWL_EVENT_ALL_MASK); void DispatchEvent(CFWL_Event* pEvent); CFX_SizeF CalcTextSize(const CFX_WideString& wsText, FX_BOOL bMultiLine = FALSE, diff --git a/xfa/include/fwl/theme/carettp.h b/xfa/include/fwl/theme/carettp.h index d99f92a5f3..bd432dc401 100644 --- a/xfa/include/fwl/theme/carettp.h +++ b/xfa/include/fwl/theme/carettp.h @@ -18,7 +18,7 @@ class CFWL_CaretTP : public CFWL_WidgetTP { protected: void DrawCaretBK(CFX_Graphics* pGraphics, - FX_DWORD dwStates, + uint32_t dwStates, const CFX_RectF* pRect, CFX_Color* crFill, CFX_Matrix* pMatrix = NULL); diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h index 4208897db6..fc666d74b5 100644 --- a/xfa/include/fwl/theme/checkboxtp.h +++ b/xfa/include/fwl/theme/checkboxtp.h @@ -15,8 +15,8 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { CFWL_CheckBoxTP(); virtual ~CFWL_CheckBoxTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); @@ -27,12 +27,12 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { void DrawBoxBk(IFWL_Widget* pWidget, CFX_Graphics* pGraphics, const CFX_RectF* pRect, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix = NULL); void DrawSign(IFWL_Widget* pWidget, CFX_Graphics* pGraphics, const CFX_RectF* pRtBox, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix = NULL); void DrawSignNeutral(CFX_Graphics* pGraphics, const CFX_RectF* pRtSign, @@ -66,7 +66,7 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { const CFX_RectF* pRtBox, FX_BOOL bDisable = FALSE, CFX_Matrix* pMatrix = NULL); - void SetThemeData(FX_DWORD dwID); + void SetThemeData(uint32_t dwID); void initCheckPath(FX_FLOAT fCheckLen); struct CKBThemeData { FX_ARGB clrBoxBk[13][2]; diff --git a/xfa/include/fwl/theme/comboboxtp.h b/xfa/include/fwl/theme/comboboxtp.h index 0cf13a4c1d..74d49b45e7 100644 --- a/xfa/include/fwl/theme/comboboxtp.h +++ b/xfa/include/fwl/theme/comboboxtp.h @@ -15,14 +15,14 @@ class CFWL_ComboBoxTP : public CFWL_WidgetTP { virtual ~CFWL_ComboBoxTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); protected: void DrawDropDownButton(CFWL_ThemeBackground* pParams, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix); void DrawStrethHandler(CFWL_ThemeBackground* pParams, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix); }; diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h index d0c885bf66..90ec67387e 100644 --- a/xfa/include/fwl/theme/formtp.h +++ b/xfa/include/fwl/theme/formtp.h @@ -18,12 +18,12 @@ class CFWL_FormTP : public CFWL_WidgetTP { virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart); protected: @@ -75,7 +75,7 @@ class CFWL_FormTP : public CFWL_WidgetTP { FWLTHEME_STATE eState, CFX_Matrix* pMatrix, int32_t iActive = 0); - void SetThemeData(FX_DWORD dwID); + void SetThemeData(uint32_t dwID); void TransModeColor(FX_ARGB clrFore, FX_ARGB& clrBack); void DeactiveForm(); void InitCaption(FX_BOOL bActive); diff --git a/xfa/include/fwl/theme/listboxtp.h b/xfa/include/fwl/theme/listboxtp.h index 8b689814ff..8f5720c9fb 100644 --- a/xfa/include/fwl/theme/listboxtp.h +++ b/xfa/include/fwl/theme/listboxtp.h @@ -20,7 +20,7 @@ class CFWL_ListBoxTP : public CFWL_WidgetTP { protected: void DrawListBoxItem(CFX_Graphics* pGraphics, - FX_DWORD dwStates, + uint32_t dwStates, const CFX_RectF* prtItem, void* pData = NULL, CFX_Matrix* pMatrix = NULL); diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h index cf7f1e70b1..8321965a8b 100644 --- a/xfa/include/fwl/theme/monthcalendartp.h +++ b/xfa/include/fwl/theme/monthcalendartp.h @@ -14,12 +14,12 @@ class CFWL_MonthCalendarTP : public CFWL_WidgetTP { CFWL_MonthCalendarTP(); virtual ~CFWL_MonthCalendarTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); @@ -33,8 +33,8 @@ class CFWL_MonthCalendarTP : public CFWL_WidgetTP { FX_BOOL DrawTodayCircle(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); FX_BOOL DrawHSeperator(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); FX_BOOL DrawWeekNumSep(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); - FWLTHEME_STATE GetState(FX_DWORD dwFWLStates); - void SetThemeData(FX_DWORD dwThemeID); + FWLTHEME_STATE GetState(uint32_t dwFWLStates); + void SetThemeData(uint32_t dwThemeID); class MCThemeData { public: FX_ARGB clrCaption; diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h index 0b8cc4acf2..b951de0bed 100644 --- a/xfa/include/fwl/theme/pushbuttontp.h +++ b/xfa/include/fwl/theme/pushbuttontp.h @@ -14,24 +14,24 @@ class CFWL_PushButtonTP : public CFWL_WidgetTP { CFWL_PushButtonTP(); virtual ~CFWL_PushButtonTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); protected: - void SetThemeData(FX_DWORD dwID); - void SetTopLineColor(FX_DWORD* pData); - void SetLeftLineColor(FX_DWORD* pData); - void SetRightLineColor(FX_DWORD* pData); - void SetBottomLineColor(FX_DWORD* pData); - void SetBackgroudColor(FX_DWORD* pData); - void SetCaptionColor(FX_DWORD* pData); - void SetCornerColor(FX_DWORD* pData); - int32_t GetColorID(FX_DWORD dwStates); + void SetThemeData(uint32_t dwID); + void SetTopLineColor(uint32_t* pData); + void SetLeftLineColor(uint32_t* pData); + void SetRightLineColor(uint32_t* pData); + void SetBottomLineColor(uint32_t* pData); + void SetBackgroudColor(uint32_t* pData); + void SetCaptionColor(uint32_t* pData); + void SetCornerColor(uint32_t* pData); + int32_t GetColorID(uint32_t dwStates); struct PBThemeData { FX_ARGB clrBorder[5]; diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h index 5cfcaea95d..5b7145c155 100644 --- a/xfa/include/fwl/theme/scrollbartp.h +++ b/xfa/include/fwl/theme/scrollbartp.h @@ -14,11 +14,11 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP { CFWL_ScrollBarTP(); virtual ~CFWL_ScrollBarTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); protected: void DrawThumbBtn(CFX_Graphics* pGraphics, @@ -43,7 +43,7 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP { FX_BOOL bVert, FWLTHEME_STATE eState, CFX_Matrix* pMatrix = NULL); - void SetThemeData(FX_DWORD dwID); + void SetThemeData(uint32_t dwID); struct SBThemeData { FX_ARGB clrPawColorLight[4]; FX_ARGB clrPawColorDark[4]; diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h index 73e865076d..0a37d3274b 100644 --- a/xfa/include/fwl/theme/utils.h +++ b/xfa/include/fwl/theme/utils.h @@ -29,7 +29,7 @@ enum FWLTHEME_DIRECTION { }; struct FWLCOLOR { union { - FX_DWORD color; + uint32_t color; struct { uint8_t b; uint8_t g; @@ -39,11 +39,11 @@ struct FWLCOLOR { }; FWLCOLOR() : color(0) {} - FWLCOLOR(FX_DWORD c) : color(c) {} + FWLCOLOR(uint32_t c) : color(c) {} FWLCOLOR(const FWLCOLOR& c) : color(c.color) {} bool operator==(const FWLCOLOR& frColor) { return color == frColor.color; } - operator FX_DWORD() { return color; } + operator uint32_t() { return color; } }; #define FWLTHEME_BEZIER FX_BEZIER #define FWLTHEME_PI FX_PI diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h index 8d3f9ee79a..344f4d3034 100644 --- a/xfa/include/fwl/theme/widgettp.h +++ b/xfa/include/fwl/theme/widgettp.h @@ -32,16 +32,16 @@ class IFX_FontSourceEnum; class CFWL_WidgetTP { public: virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD GetThemeID(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t GetThemeID(IFWL_Widget* pWidget); + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix); virtual FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget, const CFX_Matrix& matrix); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget); virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart); virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart, @@ -66,7 +66,7 @@ class CFWL_WidgetTP { FX_ERR InitTTO(); FX_ERR FinalizeTTO(); void DrawEdge(CFX_Graphics* pGraphics, - FX_DWORD dwStyles, + uint32_t dwStyles, const CFX_RectF* pRect, CFX_Matrix* pMatrix = NULL); void Draw3DRect(CFX_Graphics* pGraphics, @@ -141,20 +141,20 @@ class CFWL_WidgetTP { FWLTHEME_STATE eState, CFX_Matrix* pMatrix = NULL); FWLCOLOR BlendColor(FWLCOLOR srcColor, FWLCOLOR renderColor, uint8_t scale); - FX_DWORD m_dwRefCount; + uint32_t m_dwRefCount; IFDE_TextOut* m_pTextOut; IFX_Font* m_pFDEFont; FX_FLOAT m_fValue; - FX_DWORD m_dwValue; + uint32_t m_dwValue; CFX_RectF m_rtMargin; - FX_DWORD m_dwThemeID; + uint32_t m_dwThemeID; CFX_Matrix _ctm; }; FX_BOOL FWLTHEME_Init(); void FWLTHEME_Release(); -FX_DWORD FWL_GetThemeLayout(FX_DWORD dwThemeID); -FX_DWORD FWL_GetThemeColor(FX_DWORD dwThemeID); -FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor); +uint32_t FWL_GetThemeLayout(uint32_t dwThemeID); +uint32_t FWL_GetThemeColor(uint32_t dwThemeID); +uint32_t FWL_MakeThemeID(uint32_t dwLayout, uint32_t dwColor); class CFWL_ArrowData { public: @@ -162,7 +162,7 @@ class CFWL_ArrowData { static FX_BOOL IsInstance(); static void DestroyInstance(); virtual ~CFWL_ArrowData(); - void SetColorData(FX_DWORD dwID); + void SetColorData(uint32_t dwID); class CColorData { public: @@ -182,17 +182,17 @@ class CFWL_FontData { CFWL_FontData(); virtual ~CFWL_FontData(); FX_BOOL Equal(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage); FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage); IFX_Font* GetFont() const { return m_pFont; } protected: CFX_WideString m_wsFamily; - FX_DWORD m_dwStyles; - FX_DWORD m_dwCodePage; + uint32_t m_dwStyles; + uint32_t m_dwCodePage; IFX_Font* m_pFont; IFX_FontMgr* m_pFontMgr; #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ @@ -206,7 +206,7 @@ class CFWL_FontManager { static void DestroyInstance(); IFX_Font* FindFont(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t dwCodePage); protected: diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h index 0015ae443d..c55ddf25f0 100644 --- a/xfa/include/fxfa/fxfa.h +++ b/xfa/include/fxfa/fxfa.h @@ -213,7 +213,7 @@ class IXFA_AppProvider { * @param[in] dwType The system code for the appropriate sound.0 (Error)1 * (Warning)2 (Question)3 (Status)4 (Default) */ - virtual void Beep(FX_DWORD dwType) = 0; + virtual void Beep(uint32_t dwType) = 0; /** * Displays a message box. @@ -224,8 +224,8 @@ class IXFA_AppProvider { */ virtual int32_t MsgBox(const CFX_WideStringC& wsMessage, const CFX_WideStringC& wsTitle = FX_WSTRC(L""), - FX_DWORD dwIconType = 0, - FX_DWORD dwButtonType = 0) = 0; + uint32_t dwIconType = 0, + uint32_t dwButtonType = 0) = 0; /** * Get a response from the user. @@ -295,11 +295,11 @@ class IXFA_FontMgr { virtual IFX_Font* GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) = 0; virtual IFX_Font* GetDefaultFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) = 0; }; class IXFA_App { @@ -368,7 +368,7 @@ class IXFA_DocProvider { virtual void SetChangeMark(IXFA_Doc* hDoc) = 0; virtual void InvalidateRect(IXFA_PageView* pPageView, const CFX_RectF& rt, - FX_DWORD dwFlags = 0) = 0; + uint32_t dwFlags = 0) = 0; virtual void DisplayCaret(IXFA_Widget* hWidget, FX_BOOL bVisible, const CFX_RectF* pRtAnchor) = 0; @@ -380,10 +380,10 @@ class IXFA_DocProvider { virtual FX_BOOL PopupMenu(IXFA_Widget* hWidget, CFX_PointF ptPopup, const CFX_RectF* pRectExclude = NULL) = 0; - virtual void PageViewEvent(IXFA_PageView* pPageView, FX_DWORD dwFlags) = 0; + virtual void PageViewEvent(IXFA_PageView* pPageView, uint32_t dwFlags) = 0; virtual void WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, - FX_DWORD dwEvent, + uint32_t dwEvent, void* pParam = NULL, void* pAdditional = NULL) = 0; virtual FX_BOOL RenderCustomWidget(IXFA_Widget* hWidget, @@ -413,7 +413,7 @@ class IXFA_DocProvider { virtual void Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, - FX_DWORD dwOptions) = 0; + uint32_t dwOptions) = 0; virtual int32_t AbsPageCountInBatch(IXFA_Doc* hDoc) = 0; virtual int32_t AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0; virtual int32_t SheetCountInBatch(IXFA_Doc* hDoc) = 0; @@ -478,12 +478,12 @@ class IXFA_DocHandler { virtual void ReleaseDoc(IXFA_Doc* hDoc) = 0; virtual IXFA_DocProvider* GetDocProvider(IXFA_Doc* hDoc) = 0; - virtual FX_DWORD GetDocType(IXFA_Doc* hDoc) = 0; + virtual uint32_t GetDocType(IXFA_Doc* hDoc) = 0; virtual int32_t StartLoad(IXFA_Doc* hDoc) = 0; virtual int32_t DoLoad(IXFA_Doc* hDoc, IFX_Pause* pPause = NULL) = 0; virtual void StopLoad(IXFA_Doc* hDoc) = 0; - virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, FX_DWORD dwView = 0) = 0; + virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, uint32_t dwView = 0) = 0; virtual int32_t CountPackages(IXFA_Doc* hDoc) = 0; virtual void GetPackageName(IXFA_Doc* hDoc, @@ -650,8 +650,8 @@ class IXFA_PageView { virtual void UnloadPageView() = 0; virtual IXFA_Widget* GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0; virtual IXFA_WidgetIterator* CreateWidgetIterator( - FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form, - FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible | + uint32_t dwTraverseWay = XFA_TRAVERSEWAY_Form, + uint32_t dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) = 0; }; @@ -717,10 +717,10 @@ class IXFA_WidgetHandler { IXFA_Widget* hBefore = NULL) = 0; virtual IXFA_PageView* GetPageView(IXFA_Widget* hWidget) = 0; virtual void GetRect(IXFA_Widget* hWidget, CFX_RectF& rt) = 0; - virtual FX_DWORD GetStatus(IXFA_Widget* hWidget) = 0; + virtual uint32_t GetStatus(IXFA_Widget* hWidget) = 0; virtual FX_BOOL GetBBox(IXFA_Widget* hWidget, CFX_RectF& rtBox, - FX_DWORD dwStatus, + uint32_t dwStatus, FX_BOOL bDrawFocus = FALSE) = 0; virtual CXFA_WidgetAcc* GetDataAcc(IXFA_Widget* hWidget) = 0; @@ -737,49 +737,49 @@ class IXFA_WidgetHandler { virtual FX_BOOL OnMouseEnter(IXFA_Widget* hWidget) = 0; virtual FX_BOOL OnMouseExit(IXFA_Widget* hWidget) = 0; virtual FX_BOOL OnLButtonDown(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnLButtonUp(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnLButtonDblClk(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnMouseMove(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnMouseWheel(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, int16_t zDelta, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnRButtonDown(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnRButtonUp(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnRButtonDblClk(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnKeyDown(IXFA_Widget* hWidget, - FX_DWORD dwKeyCode, - FX_DWORD dwFlags) = 0; + uint32_t dwKeyCode, + uint32_t dwFlags) = 0; virtual FX_BOOL OnKeyUp(IXFA_Widget* hWidget, - FX_DWORD dwKeyCode, - FX_DWORD dwFlags) = 0; + uint32_t dwKeyCode, + uint32_t dwFlags) = 0; virtual FX_BOOL OnChar(IXFA_Widget* hWidget, - FX_DWORD dwChar, - FX_DWORD dwFlags) = 0; - virtual FX_DWORD OnHitTest(IXFA_Widget* hWidget, + uint32_t dwChar, + uint32_t dwFlags) = 0; + virtual uint32_t OnHitTest(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnSetCursor(IXFA_Widget* hWidget, diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h index 5c0c5db935..ff151d19ab 100644 --- a/xfa/include/fxfa/fxfa_basic.h +++ b/xfa/include/fxfa/fxfa_basic.h @@ -84,11 +84,11 @@ struct XFA_PACKETINFO { const FX_WCHAR* pName; XFA_XDPPACKET eName; const FX_WCHAR* pURI; - FX_DWORD eFlags; + uint32_t eFlags; }; const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName); -const XFA_PACKETINFO* XFA_GetPacketByID(FX_DWORD dwPacket); +const XFA_PACKETINFO* XFA_GetPacketByID(uint32_t dwPacket); const XFA_PACKETINFO* XFA_GetPacketByIndex(XFA_PACKET ePacket); enum XFA_ATTRIBUTEENUM { @@ -923,8 +923,8 @@ struct XFA_ELEMENTINFO { uint32_t uHash; const FX_WCHAR* pName; XFA_ELEMENT eName; - FX_DWORD dwPackets; - FX_DWORD eObjectType; + uint32_t dwPackets; + uint32_t eObjectType; }; int32_t XFA_GetElementCount(); const XFA_ELEMENTINFO* XFA_GetElementByName(const CFX_WideStringC& wsName); @@ -942,7 +942,7 @@ struct XFA_ATTRIBUTEINFO { const FX_WCHAR* pName; XFA_ATTRIBUTE eName; XFA_ATTRIBUTETYPE eType; - FX_DWORD dwPackets; + uint32_t dwPackets; void* pDefValue; }; int32_t XFA_GetAttributeCount(); @@ -952,22 +952,22 @@ FX_BOOL XFA_GetAttributeDefaultValue(void*& pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, - FX_DWORD dwPacket); + uint32_t dwPacket); XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); int32_t XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); struct XFA_ELEMENTHIERARCHY { uint16_t wStart; uint16_t wCount; @@ -986,10 +986,10 @@ const uint16_t* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t& iCount); const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t& iCount); const XFA_ELEMENTINFO* XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, - FX_DWORD dwPacket); + uint32_t dwPacket); const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); #define XFA_PROPERTYFLAG_OneOf 0x01 #define XFA_PROPERTYFLAG_DefaultOneOf 0x02 struct XFA_PROPERTY { @@ -1001,7 +1001,7 @@ const XFA_PROPERTY* XFA_GetElementProperties(XFA_ELEMENT eElement, int32_t& iCount); const XFA_PROPERTY* XFA_GetPropertyOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eProperty, - FX_DWORD dwPacket); + uint32_t dwPacket); struct XFA_ATTRIBUTEENUMINFO { uint32_t uHash; const FX_WCHAR* pName; diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h index f390566c74..782b62f9d1 100644 --- a/xfa/include/fxfa/fxfa_objectacc.h +++ b/xfa/include/fxfa/fxfa_objectacc.h @@ -333,7 +333,7 @@ class CXFA_Stroke : public CXFA_Data { int32_t GetJoinType() const; FX_BOOL IsInverted() const; FX_FLOAT GetRadius() const; - FX_BOOL SameStyles(CXFA_Stroke stroke, FX_DWORD dwFlags = 0) const; + FX_BOOL SameStyles(CXFA_Stroke stroke, uint32_t dwFlags = 0) const; }; class CXFA_Corner : public CXFA_Stroke { @@ -434,7 +434,7 @@ class CXFA_WidgetData : public CXFA_Data { CXFA_Validate GetValidate(FX_BOOL bModified = FALSE); CXFA_Bind GetBind(FX_BOOL bModified = FALSE); CXFA_Assist GetAssist(FX_BOOL bModified = FALSE); - FX_DWORD GetRelevantStatus(); + uint32_t GetRelevantStatus(); FX_BOOL GetWidth(FX_FLOAT& fWidth); FX_BOOL GetHeight(FX_FLOAT& fHeight); FX_BOOL GetMinWidth(FX_FLOAT& fMinWidth); diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h index 7b9241832c..f1fcffefc4 100644 --- a/xfa/include/fxfa/fxfa_widget.h +++ b/xfa/include/fxfa/fxfa_widget.h @@ -65,7 +65,7 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { void SetImageImage(CFX_DIBitmap* newImage); void SetImageEditImage(CFX_DIBitmap* newImage); void UpdateUIDisplay(CXFA_FFWidget* pExcept = NULL); - void NotifyEvent(FX_DWORD dwEvent, + void NotifyEvent(uint32_t dwEvent, CXFA_FFWidget* pWidget = NULL, void* pParam = NULL, void* pAdditional = NULL); -- cgit v1.2.3