diff options
Diffstat (limited to 'xfa/fxfa')
44 files changed, 235 insertions, 235 deletions
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<CXFA_LayoutItem, CXFA_LayoutItemIterator; class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator { public: - CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView, FX_DWORD dwFilter); + CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView, uint32_t dwFilter); virtual ~CXFA_FFPageWidgetIterator(); virtual void Release() { delete this; } @@ -59,7 +59,7 @@ class CXFA_FFPageWidgetIterator : public IXFA_WidgetIterator { IXFA_Widget* GetWidget(CXFA_LayoutItem* pLayoutItem); CXFA_FFPageView* m_pPageView; IXFA_Widget* m_hCurWidget; - FX_DWORD m_dwFilter; + uint32_t m_dwFilter; FX_BOOL m_bIgnorerelevant; CXFA_LayoutItemIterator m_sIterator; }; @@ -75,7 +75,7 @@ class CXFA_TabParam { class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator { public: CXFA_FFTabOrderPageWidgetIterator(CXFA_FFPageView* pPageView, - FX_DWORD dwFilter); + uint32_t dwFilter); virtual ~CXFA_FFTabOrderPageWidgetIterator(); virtual void Release(); @@ -91,7 +91,7 @@ class CXFA_FFTabOrderPageWidgetIterator : public IXFA_WidgetIterator { protected: CXFA_WidgetArray m_TabOrderWidgetArray; CXFA_FFPageView* m_pPageView; - FX_DWORD m_dwFilter; + uint32_t m_dwFilter; int32_t m_iCurWidget; FX_BOOL m_bIgnorerelevant; CXFA_FFWidget* GetTraverseWidget(CXFA_FFWidget* pWidget); diff --git a/xfa/fxfa/app/xfa_ffpath.h b/xfa/fxfa/app/xfa_ffpath.h index 2b2c40d01b..8152810c74 100644 --- a/xfa/fxfa/app/xfa_ffpath.h +++ b/xfa/fxfa/app/xfa_ffpath.h @@ -15,7 +15,7 @@ class CXFA_FFLine : public CXFA_FFDraw { virtual ~CXFA_FFLine(); virtual void RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, - FX_DWORD dwStatus = 0, + uint32_t dwStatus = 0, int32_t iRotate = 0); private: @@ -27,7 +27,7 @@ class CXFA_FFArc : public CXFA_FFDraw { virtual ~CXFA_FFArc(); virtual void RenderWidget(CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, - FX_DWORD dwStatus = 0, + uint32_t dwStatus = 0, int32_t iRotate = 0); }; class CXFA_FFRectangle : public CXFA_FFDraw { @@ -36,7 +36,7 @@ class CXFA_FFRectangle : public CXFA_FFDraw { virtual ~CXFA_FFRectangle(); 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_ffpushbutton.h b/xfa/fxfa/app/xfa_ffpushbutton.h index 39f6bd4b7b..a37670bb30 100644 --- a/xfa/fxfa/app/xfa_ffpushbutton.h +++ b/xfa/fxfa/app/xfa_ffpushbutton.h @@ -22,7 +22,7 @@ class CXFA_FFPushButton : public CXFA_FFField { virtual ~CXFA_FFPushButton(); 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(); diff --git a/xfa/fxfa/app/xfa_ffsignature.h b/xfa/fxfa/app/xfa_ffsignature.h index f976fed102..1b5f33ccc4 100644 --- a/xfa/fxfa/app/xfa_ffsignature.h +++ b/xfa/fxfa/app/xfa_ffsignature.h @@ -16,27 +16,27 @@ class CXFA_FFSignature final : 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 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 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); }; diff --git a/xfa/fxfa/app/xfa_fftext.h b/xfa/fxfa/app/xfa_fftext.h index edf12f5bee..847805b527 100644 --- a/xfa/fxfa/app/xfa_fftext.h +++ b/xfa/fxfa/app/xfa_fftext.h @@ -13,13 +13,13 @@ class CXFA_FFText : public CXFA_FFDraw { public: CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); virtual ~CXFA_FFText(); - 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 OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy); - virtual FX_DWORD OnHitTest(FX_FLOAT fx, FX_FLOAT fy); + 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 OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy); + virtual uint32_t OnHitTest(FX_FLOAT fx, FX_FLOAT fy); 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 PerformLayout(); diff --git a/xfa/fxfa/app/xfa_fftextedit.h b/xfa/fxfa/app/xfa_fftextedit.h index d379ab1991..ecdc2da485 100644 --- a/xfa/fxfa/app/xfa_fftextedit.h +++ b/xfa/fxfa/app/xfa_fftextedit.h @@ -19,9 +19,9 @@ class CXFA_FFTextEdit : public CXFA_FFField { // CXFA_FFField: FX_BOOL LoadWidget() override; void UpdateWidgetProperty() override; - FX_BOOL OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; - FX_BOOL OnRButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; - FX_BOOL OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; + FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; + FX_BOOL OnRButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; + FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override; FX_BOOL OnSetFocus(CXFA_FFWidget* pOldWidget) override; FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget) override; FX_BOOL CanUndo() override; @@ -58,7 +58,7 @@ class CXFA_FFTextEdit : public CXFA_FFField { std::vector<CFX_ByteString>& 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<FX_FLOAT> 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_PieceLine*> 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<CXFA_FMToken> 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<FX_DWORD, CXFA_Node*> m_rgGlobalBinding; + CFX_MapPtrTemplate<uint32_t, CXFA_Node*> 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); |