From c3255f55954b2adc3edbd3269c0a8779f7d4b7ad Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 25 Mar 2016 14:52:27 -0700 Subject: Remove FX_DWORD from fpdfsdk/ and testing BUG= Review URL: https://codereview.chromium.org/1835693002 --- fpdfsdk/include/fpdfxfa/fpdfxfa_app.h | 6 +- fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h | 10 +-- fpdfsdk/include/fpdfxfa/fpdfxfa_util.h | 2 +- fpdfsdk/include/fsdk_annothandler.h | 126 ++++++++++++++++----------------- fpdfsdk/include/fsdk_baseannot.h | 4 +- fpdfsdk/include/fsdk_define.h | 16 ++--- fpdfsdk/include/fsdk_mgr.h | 10 +-- fpdfsdk/include/fx_systemhandler.h | 8 +-- 8 files changed, 91 insertions(+), 91 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h index 9d1b1cef62..f96ed3b177 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h @@ -50,11 +50,11 @@ class CPDFXFA_App : public IXFA_AppProvider { wsFoxitName = L"Foxit"; } - void Beep(FX_DWORD dwType) override; + void Beep(uint32_t dwType) override; int32_t MsgBox(const CFX_WideStringC& wsMessage, const CFX_WideStringC& wsTitle, - FX_DWORD dwIconType, - FX_DWORD dwButtonType) override; + uint32_t dwIconType, + uint32_t dwButtonType) override; void Response(CFX_WideString& wsAnswer, const CFX_WideStringC& wsQuestion, const CFX_WideStringC& wsTitle, diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h index 5186fe51ab..98ed6fdbe4 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h @@ -49,9 +49,9 @@ class CPDFXFA_Document : public IXFA_DocProvider { // used in dynamic xfa, dwFlags refer to XFA_INVALIDATE_XXX macros. virtual void InvalidateRect(IXFA_PageView* pPageView, const CFX_RectF& rt, - FX_DWORD dwFlags = 0); + uint32_t dwFlags = 0); // used in static xfa, dwFlags refer to XFA_INVALIDATE_XXX macros. - virtual void InvalidateRect(IXFA_Widget* hWidget, FX_DWORD dwFlags = 0); + virtual void InvalidateRect(IXFA_Widget* hWidget, uint32_t dwFlags = 0); // show or hide caret virtual void DisplayCaret(IXFA_Widget* hWidget, FX_BOOL bVisible, @@ -67,11 +67,11 @@ class CPDFXFA_Document : public IXFA_DocProvider { const CFX_RectF* pRectExclude = NULL); // dwFlags XFA_PAGEVIEWEVENT_Added, XFA_PAGEVIEWEVENT_Removing - virtual void PageViewEvent(IXFA_PageView* pPageView, FX_DWORD dwFlags); + virtual void PageViewEvent(IXFA_PageView* pPageView, uint32_t dwFlags); // dwEvent refer to XFA_WIDGETEVENT_XXX virtual void WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, - FX_DWORD dwEvent, + uint32_t dwEvent, void* pParam = NULL, void* pAdditional = NULL); @@ -104,7 +104,7 @@ class CPDFXFA_Document : public IXFA_DocProvider { virtual void Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, - FX_DWORD dwOptions); + uint32_t dwOptions); // LayoutPseudo method virtual int32_t AbsPageCountInBatch(IXFA_Doc* hDoc) { return 0; } diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h index f4c73c65c2..e0c508baa5 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h @@ -23,7 +23,7 @@ class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr { public: CXFA_FWLAdapterTimerMgr(CPDFDoc_Environment* pEnv) : m_pEnv(pEnv) {} virtual FWL_ERR Start(IFWL_Timer* pTimer, - FX_DWORD dwElapse, + uint32_t dwElapse, FWL_HTIMER& hTimer, FX_BOOL bImmediately = TRUE); virtual FWL_ERR Stop(FWL_HTIMER hTimer); diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h index f94d7d0592..637fdfc387 100644 --- a/fpdfsdk/include/fsdk_annothandler.h +++ b/fpdfsdk/include/fsdk_annothandler.h @@ -61,14 +61,14 @@ class IPDFSDK_AnnotHandler { CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - FX_DWORD dwFlags) = 0; + uint32_t dwFlags) = 0; virtual void OnDrawSleep(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, const CFX_FloatRect& rcWindow, - FX_DWORD dwFlags) = 0; + uint32_t dwFlags) = 0; virtual void OnCreate(CPDFSDK_Annot* pAnnot) = 0; @@ -80,56 +80,56 @@ class IPDFSDK_AnnotHandler { virtual void OnMouseEnter(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlag) = 0; + uint32_t nFlag) = 0; virtual void OnMouseExit(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlag) = 0; + uint32_t nFlag) = 0; virtual FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) = 0; virtual FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) = 0; virtual FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) = 0; virtual FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) = 0; virtual FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, short zDelta, const CFX_FloatPoint& point) = 0; virtual FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) = 0; virtual FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) = 0; virtual FX_BOOL OnRButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) = 0; // by wjm. virtual FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, - FX_DWORD nChar, - FX_DWORD nFlags) = 0; + uint32_t nChar, + uint32_t nFlags) = 0; virtual FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) = 0; virtual FX_BOOL OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) = 0; virtual void OnDeSelected(CPDFSDK_Annot* pAnnot) = 0; virtual void OnSelected(CPDFSDK_Annot* pAnnot) = 0; - virtual FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag) = 0; - virtual FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag) = 0; + virtual FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag) = 0; + virtual FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag) = 0; #ifdef PDF_ENABLE_XFA virtual FX_BOOL OnXFAChangedFocus(CPDFSDK_Annot* pOldAnnot, CPDFSDK_Annot* pNewAnnot) = 0; @@ -162,67 +162,67 @@ class CPDFSDK_BFAnnotHandler : public IPDFSDK_AnnotHandler { CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - FX_DWORD dwFlags) override; + uint32_t dwFlags) override; void OnDrawSleep(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, const CFX_FloatRect& rcWindow, - FX_DWORD dwFlags) override {} + uint32_t dwFlags) override {} void OnCreate(CPDFSDK_Annot* pAnnot) override; void OnLoad(CPDFSDK_Annot* pAnnot) override; void OnDelete(CPDFSDK_Annot* pAnnot) override {} void OnRelease(CPDFSDK_Annot* pAnnot) override {} void OnMouseEnter(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlag) override; + uint32_t nFlag) override; void OnMouseExit(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlag) override; + uint32_t nFlag) override; FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override; FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override; FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override; FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override; FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, short zDelta, const CFX_FloatPoint& point) override; FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override; FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override; FX_BOOL OnRButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override { return FALSE; } FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, - FX_DWORD nChar, - FX_DWORD nFlags) override; + uint32_t nChar, + uint32_t nFlags) override; FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) override; FX_BOOL OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) override; void OnDeSelected(CPDFSDK_Annot* pAnnot) override {} void OnSelected(CPDFSDK_Annot* pAnnot) override {} - FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag) override; - FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag) override; + FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag) override; + FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag) override; #ifdef PDF_ENABLE_XFA FX_BOOL OnXFAChangedFocus(CPDFSDK_Annot* pOldAnnot, CPDFSDK_Annot* pNewAnnot) override { @@ -272,14 +272,14 @@ class CPDFSDK_XFAAnnotHandler : public IPDFSDK_AnnotHandler { CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - FX_DWORD dwFlags); + uint32_t dwFlags); virtual void OnDrawSleep(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, const CFX_FloatRect& rcWindow, - FX_DWORD dwFlags) {} + uint32_t dwFlags) {} virtual void OnCreate(CPDFSDK_Annot* pAnnot) {} @@ -291,62 +291,62 @@ class CPDFSDK_XFAAnnotHandler : public IPDFSDK_AnnotHandler { virtual void OnMouseEnter(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlag); + uint32_t nFlag); virtual void OnMouseExit(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlag); + uint32_t nFlag); virtual FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, short zDelta, const CFX_FloatPoint& point); virtual FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnRButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); // by wjm. virtual FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, - FX_DWORD nChar, - FX_DWORD nFlags); + uint32_t nChar, + uint32_t nFlags); virtual FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag); virtual FX_BOOL OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag); virtual void OnDeSelected(CPDFSDK_Annot* pAnnot) {} virtual void OnSelected(CPDFSDK_Annot* pAnnot) {} - virtual FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag); - virtual FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag); + virtual FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag); + virtual FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag); virtual FX_BOOL OnXFAChangedFocus(CPDFSDK_Annot* pOldAnnot, CPDFSDK_Annot* pNewAnnot); private: IXFA_WidgetHandler* GetXFAWidgetHandler(CPDFSDK_Annot* pAnnot); - FX_DWORD GetFWLFlags(FX_DWORD dwFlag); + uint32_t GetFWLFlags(uint32_t dwFlag); private: CPDFDoc_Environment* m_pApp; @@ -381,56 +381,56 @@ class CPDFSDK_AnnotHandlerMgr { CPDFSDK_Annot* pAnnot, CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device, - FX_DWORD dwFlags); + uint32_t dwFlags); virtual void Annot_OnMouseEnter(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags); + uint32_t nFlags); virtual void Annot_OnMouseExit(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags); + uint32_t nFlags); virtual FX_BOOL Annot_OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL Annot_OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL Annot_OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL Annot_OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL Annot_OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, short zDelta, const CFX_FloatPoint& point); virtual FX_BOOL Annot_OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL Annot_OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_DWORD nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL Annot_OnChar(CPDFSDK_Annot* pAnnot, - FX_DWORD nChar, - FX_DWORD nFlags); + uint32_t nChar, + uint32_t nFlags); virtual FX_BOOL Annot_OnKeyDown(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag); virtual FX_BOOL Annot_OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag); - virtual FX_BOOL Annot_OnSetFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag); - virtual FX_BOOL Annot_OnKillFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag); + virtual FX_BOOL Annot_OnSetFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag); + virtual FX_BOOL Annot_OnKillFocus(CPDFSDK_Annot* pAnnot, uint32_t nFlag); #ifdef PDF_ENABLE_XFA virtual FX_BOOL Annot_OnChangeFocus(CPDFSDK_Annot* pSetAnnot, diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index 2024c2ca2d..dc2c1a9691 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -148,8 +148,8 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { void SetModifiedDate(const FX_SYSTEMTIME& st); FX_SYSTEMTIME GetModifiedDate() const; - void SetFlags(FX_DWORD nFlags); - FX_DWORD GetFlags() const; + void SetFlags(uint32_t nFlags); + uint32_t GetFlags() const; void SetAppState(const CFX_ByteString& str); CFX_ByteString GetAppState() const; diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 4af327fc93..706880ab72 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -25,13 +25,13 @@ // Convert a #FX_ARGB to a #FX_COLORREF. #define FX_ARGBTOCOLORREF(argb) \ - ((((FX_DWORD)argb & 0x00FF0000) >> 16) | ((FX_DWORD)argb & 0x0000FF00) | \ - (((FX_DWORD)argb & 0x000000FF) << 16)) + ((((uint32_t)argb & 0x00FF0000) >> 16) | ((uint32_t)argb & 0x0000FF00) | \ + (((uint32_t)argb & 0x000000FF) << 16)) // Convert a #FX_COLORREF to a #FX_ARGB. #define FX_COLORREFTOARGB(rgb) \ - ((FX_DWORD)0xFF000000 | (((FX_DWORD)rgb & 0x000000FF) << 16) | \ - ((FX_DWORD)rgb & 0x0000FF00) | (((FX_DWORD)rgb & 0x00FF0000) >> 16)) + ((uint32_t)0xFF000000 | (((uint32_t)rgb & 0x000000FF) << 16) | \ + ((uint32_t)rgb & 0x0000FF00) | (((uint32_t)rgb & 0x00FF0000) >> 16)) typedef unsigned int FX_UINT; class CRenderContext; @@ -49,15 +49,15 @@ class CPDF_CustomAccess final : public IFX_FileRead { #ifdef PDF_ENABLE_XFA virtual CFX_ByteString GetFullPath() { return ""; } - virtual FX_BOOL GetByte(FX_DWORD pos, uint8_t& ch); - virtual FX_BOOL GetBlock(FX_DWORD pos, uint8_t* pBuf, FX_DWORD size); + virtual FX_BOOL GetByte(uint32_t pos, uint8_t& ch); + virtual FX_BOOL GetBlock(uint32_t pos, uint8_t* pBuf, uint32_t size); #endif // PDF_ENABLE_XFA private: FPDF_FILEACCESS m_FileAccess; #ifdef PDF_ENABLE_XFA uint8_t m_Buffer[512]; - FX_DWORD m_BufferOffset; + uint32_t m_BufferOffset; #endif // PDF_ENABLE_XFA }; @@ -124,7 +124,7 @@ void FPDF_RenderPage_Retail(CRenderContext* pContext, FX_BOOL bNeedToRestore, IFSDK_PAUSE_Adapter* pause); -void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code); +void CheckUnSupportError(CPDF_Document* pDoc, uint32_t err_code); void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot); void ProcessParseError(CPDF_Parser::Error err); diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 17340753ea..3b8c951e0e 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -103,19 +103,19 @@ class CPDFDoc_Environment final { m_pInfo->FFI_OnChange(m_pInfo); } - FX_BOOL FFI_IsSHIFTKeyDown(FX_DWORD nFlag) const { + FX_BOOL FFI_IsSHIFTKeyDown(uint32_t nFlag) const { return (nFlag & FWL_EVENTFLAG_ShiftKey) != 0; } - FX_BOOL FFI_IsCTRLKeyDown(FX_DWORD nFlag) const { + FX_BOOL FFI_IsCTRLKeyDown(uint32_t nFlag) const { return (nFlag & FWL_EVENTFLAG_ControlKey) != 0; } - FX_BOOL FFI_IsALTKeyDown(FX_DWORD nFlag) const { + FX_BOOL FFI_IsALTKeyDown(uint32_t nFlag) const { return (nFlag & FWL_EVENTFLAG_AltKey) != 0; } - FX_BOOL FFI_IsINSERTKeyDown(FX_DWORD nFlag) const { return FALSE; } + FX_BOOL FFI_IsINSERTKeyDown(uint32_t nFlag) const { return FALSE; } FPDF_PAGE FFI_GetPage(FPDF_DOCUMENT document, int nPageIndex) { if (m_pInfo && m_pInfo->FFI_GetPage) @@ -398,7 +398,7 @@ class CPDFDoc_Environment final { return L""; } - void FFI_PageEvent(int iPageCount, FX_DWORD dwEventType) const { + void FFI_PageEvent(int iPageCount, uint32_t dwEventType) const { if (m_pInfo && m_pInfo->FFI_PageEvent) m_pInfo->FFI_PageEvent(m_pInfo, iPageCount, dwEventType); } diff --git a/fpdfsdk/include/fx_systemhandler.h b/fpdfsdk/include/fx_systemhandler.h index 6619f3ed04..dc225df0a2 100644 --- a/fpdfsdk/include/fx_systemhandler.h +++ b/fpdfsdk/include/fx_systemhandler.h @@ -92,10 +92,10 @@ class IFX_SystemHandler { virtual int32_t SetTimer(int32_t uElapse, TimerCallback lpTimerFunc) = 0; virtual void KillTimer(int32_t nID) = 0; - virtual FX_BOOL IsSHIFTKeyDown(FX_DWORD nFlag) = 0; - virtual FX_BOOL IsCTRLKeyDown(FX_DWORD nFlag) = 0; - virtual FX_BOOL IsALTKeyDown(FX_DWORD nFlag) = 0; - virtual FX_BOOL IsINSERTKeyDown(FX_DWORD nFlag) = 0; + virtual FX_BOOL IsSHIFTKeyDown(uint32_t nFlag) = 0; + virtual FX_BOOL IsCTRLKeyDown(uint32_t nFlag) = 0; + virtual FX_BOOL IsALTKeyDown(uint32_t nFlag) = 0; + virtual FX_BOOL IsINSERTKeyDown(uint32_t nFlag) = 0; virtual FX_SYSTEMTIME GetLocalTime() = 0; -- cgit v1.2.3