FX Bool considered harmful, part 3

Try to reland this patch after fixing underlying issues that
caused it to be reverted.

fx_system.h is the only manual edit.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1258093002 .

10 files changed, 106 insertions, 106 deletions

diff --git a/fpdfsdk/include/formfiller/FFL_CheckBox.h b/fpdfsdk/include/formfiller/FFL_CheckBox.h
index 3deeae8aa7..6880977094 100644
--- a/fpdfsdk/include/formfiller/FFL_CheckBox.h
+++ b/fpdfsdk/include/formfiller/FFL_CheckBox.h
@@ -17,11 +17,11 @@ public:
 
 	virtual CPWL_Wnd*			NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView);
 
-	virtual FX_BOOL				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
-	virtual FX_BOOL				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
-	virtual FX_BOOL				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
+	virtual bool				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
+	virtual bool				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 
-	virtual FX_BOOL				IsDataChanged(CPDFSDK_PageView* pPageView);
+	virtual bool				IsDataChanged(CPDFSDK_PageView* pPageView);
 	virtual void				SaveData(CPDFSDK_PageView* pPageView);
 };
 
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h
index e5c65c2715..957fda425f 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h
@@ -31,19 +31,19 @@ public:
 	virtual CPWL_Wnd*			NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView);
 
 
-	virtual FX_BOOL				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
+	virtual bool				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
 
-	virtual FX_BOOL				IsDataChanged(CPDFSDK_PageView* pPageView);
+	virtual bool				IsDataChanged(CPDFSDK_PageView* pPageView);
 	virtual void				SaveData(CPDFSDK_PageView* pPageView);
 
  	virtual void				GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, PDFSDK_FieldAction& fa);
  	virtual void				SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type, const PDFSDK_FieldAction& fa);
- 	virtual FX_BOOL				IsActionDataChanged(CPDF_AAction::AActionType type, const PDFSDK_FieldAction& faOld, const PDFSDK_FieldAction& faNew);
+ 	virtual bool				IsActionDataChanged(CPDF_AAction::AActionType type, const PDFSDK_FieldAction& faOld, const PDFSDK_FieldAction& faNew);
 	virtual void				SaveState(CPDFSDK_PageView* pPageView);
 	virtual void				RestoreState(CPDFSDK_PageView* pPageView);
 
-	virtual CPWL_Wnd*			ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue);
-	virtual void				OnKeyStroke(FX_BOOL bKeyDown, FX_UINT nFlag);
+	virtual CPWL_Wnd*			ResetPDFWindow(CPDFSDK_PageView* pPageView, bool bRestoreValue);
+	virtual void				OnKeyStroke(bool bKeyDown, FX_UINT nFlag);
 
 public:
 	virtual void				OnSetFocus(CPWL_Wnd* pWnd);
@@ -53,9 +53,9 @@ public:
 	virtual void				OnAddUndo(CPWL_Edit* pEdit);
 
 public:
-	virtual FX_BOOL				CanCopy(CPDFSDK_Document* pDocument);
-	virtual FX_BOOL				CanCut(CPDFSDK_Document* pDocument);
-	virtual FX_BOOL				CanPaste(CPDFSDK_Document* pDocument);
+	virtual bool				CanCopy(CPDFSDK_Document* pDocument);
+	virtual bool				CanCut(CPDFSDK_Document* pDocument);
+	virtual bool				CanPaste(CPDFSDK_Document* pDocument);
 
 private:
 	CFX_WideString				GetSelectExportText();
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h
index fc858a8822..98995c1a58 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h
@@ -39,23 +39,23 @@ public:
 	virtual void				OnMouseEnter(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
 	virtual void				OnMouseExit(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
 
-	virtual FX_BOOL				OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnLButtonDblClk(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnMouseMove(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnMouseWheel(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, const CPDF_Point& point);
-	virtual FX_BOOL				OnRButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnRButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnLButtonDblClk(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnMouseMove(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnMouseWheel(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, const CPDF_Point& point);
+	virtual bool				OnRButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnRButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 
-	virtual FX_BOOL				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
-	virtual FX_BOOL				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
+	virtual bool				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
+	virtual bool				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
 
-	virtual FX_BOOL				OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
-	virtual FX_BOOL				OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
+	virtual bool				OnSetFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
+	virtual bool				OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
 
-	virtual FX_BOOL				CanCopy(CPDFSDK_Document* pDocument);
-	virtual FX_BOOL				CanCut(CPDFSDK_Document* pDocument);
-	virtual FX_BOOL				CanPaste(CPDFSDK_Document* pDocument);
+	virtual bool				CanCopy(CPDFSDK_Document* pDocument);
+	virtual bool				CanCut(CPDFSDK_Document* pDocument);
+	virtual bool				CanPaste(CPDFSDK_Document* pDocument);
 
 	virtual void				DoCopy(CPDFSDK_Document* pDocument);
 	virtual void				DoCut(CPDFSDK_Document* pDocument);
@@ -72,15 +72,15 @@ public:
  									PDFSDK_FieldAction& fa);
  	virtual void				SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type,
  									const PDFSDK_FieldAction& fa);
- 	virtual FX_BOOL				IsActionDataChanged(CPDF_AAction::AActionType type, const PDFSDK_FieldAction& faOld,
+ 	virtual bool				IsActionDataChanged(CPDF_AAction::AActionType type, const PDFSDK_FieldAction& faOld,
  									const PDFSDK_FieldAction& faNew);
 
 	virtual void				SaveState(CPDFSDK_PageView* pPageView);
 	virtual void				RestoreState(CPDFSDK_PageView* pPageView);
 
-	virtual CPWL_Wnd* 			ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue);
+	virtual CPWL_Wnd* 			ResetPDFWindow(CPDFSDK_PageView* pPageView, bool bRestoreValue);
 
-	virtual void				OnKeyStroke(FX_BOOL bKeyDown);
+	virtual void				OnKeyStroke(bool bKeyDown);
 
 	CPDF_Matrix					GetCurMatrix();
 
@@ -95,19 +95,19 @@ public:
 	void						SetWindowRect(CPDFSDK_PageView* pPageView, const CPDF_Rect& rcWindow);
 	CPDF_Rect					GetWindowRect(CPDFSDK_PageView* pPageView);
 
-	FX_BOOL						CommitData(CPDFSDK_PageView* pPageView, FX_UINT nFlag);
-	virtual FX_BOOL				IsDataChanged(CPDFSDK_PageView* pPageView);
+	bool						CommitData(CPDFSDK_PageView* pPageView, FX_UINT nFlag);
+	virtual bool				IsDataChanged(CPDFSDK_PageView* pPageView);
 	virtual void				SaveData(CPDFSDK_PageView* pPageView);
 
-	CPWL_Wnd*					GetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bNew);
+	CPWL_Wnd*					GetPDFWindow(CPDFSDK_PageView* pPageView, bool bNew);
 	void						DestroyPDFWindow(CPDFSDK_PageView* pPageView);
-	void						EscapeFiller(CPDFSDK_PageView* pPageView, FX_BOOL bDestroyPDFWindow);
+	void						EscapeFiller(CPDFSDK_PageView* pPageView, bool bDestroyPDFWindow);
 
 	virtual	PWL_CREATEPARAM		GetCreateParam();
 	virtual CPWL_Wnd*			NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView) = 0;
 	virtual CPDF_Rect			GetFocusBox(CPDFSDK_PageView* pPageView);
 
-	FX_BOOL						IsValid() const;
+	bool						IsValid() const;
 	CPDF_Rect					GetPDFWindowRect() const;
 
 	CPDFSDK_PageView*			GetCurPageView();
@@ -124,7 +124,7 @@ protected:
     CPDFSDK_Widget* m_pWidget;
     CPDFSDK_Annot* m_pAnnot;
 
-    FX_BOOL m_bValid;
+    bool m_bValid;
     CFFL_PageView2PDFWindow m_Maps;
     CPDF_Point m_ptOldPos;
 };
@@ -137,9 +137,9 @@ public:
 
 	virtual void				OnMouseEnter(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
 	virtual void				OnMouseExit(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
-	virtual FX_BOOL				OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnMouseMove(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnMouseMove(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 	virtual void				OnDraw(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot,
 									CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
 									FX_DWORD dwFlags);
@@ -148,8 +148,8 @@ public:
 									CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
 									FX_DWORD dwFlags);
 protected:
-	FX_BOOL						m_bMouseIn;
-	FX_BOOL						m_bMouseDown;
+	bool						m_bMouseIn;
+	bool						m_bMouseDown;
 };
 
 #endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
index e553723dc3..51b0279d0a 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
@@ -20,7 +20,7 @@ public:
 	CFFL_IFormFiller(CPDFDoc_Environment* pApp);
 	virtual ~CFFL_IFormFiller();
 
-	virtual FX_BOOL				Annot_HitTest(CPDFSDK_PageView* pPageView,CPDFSDK_Annot* pAnnot, CPDF_Point point);
+	virtual bool				Annot_HitTest(CPDFSDK_PageView* pPageView,CPDFSDK_Annot* pAnnot, CPDF_Point point);
 	virtual FX_RECT				GetViewBBox(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot);
 	virtual void				OnDraw(CPDFSDK_PageView *pPageView, /*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
 									CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
@@ -34,41 +34,41 @@ public:
 	virtual void				OnMouseEnter(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
 	virtual void				OnMouseExit(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
 
-	virtual FX_BOOL				OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnLButtonDblClk(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnMouseMove(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnMouseWheel(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, const CPDF_Point& point);
-	virtual FX_BOOL				OnRButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				OnRButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnLButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnLButtonDblClk(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnMouseMove(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnMouseWheel(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, short zDelta, const CPDF_Point& point);
+	virtual bool				OnRButtonDown(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				OnRButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
 
-	virtual FX_BOOL				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
-	virtual FX_BOOL				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
+	virtual bool				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
+	virtual bool				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
 
-	virtual FX_BOOL				OnSetFocus(CPDFSDK_Annot* pAnnot,FX_UINT nFlag);
-	virtual FX_BOOL				OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
+	virtual bool				OnSetFocus(CPDFSDK_Annot* pAnnot,FX_UINT nFlag);
+	virtual bool				OnKillFocus(CPDFSDK_Annot* pAnnot, FX_UINT nFlag);
 
 	virtual void				QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX_FLOAT fPopupMax, int32_t & nRet, FX_FLOAT & fPopupRet);
-	virtual void				OnBeforeKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode,
+	virtual void				OnBeforeKeyStroke(bool bEditOrList, void* pPrivateData, int32_t nKeyCode,
 										CFX_WideString & strChange, const CFX_WideString& strChangeEx,
 										int nSelStart, int nSelEnd,
-										FX_BOOL bKeyDown, FX_BOOL & bRC, FX_BOOL & bExit, FX_DWORD nFlag);
-	virtual void				OnAfterKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, FX_BOOL & bExit, FX_DWORD nFlag) ;
+										bool bKeyDown, bool & bRC, bool & bExit, FX_DWORD nFlag);
+	virtual void				OnAfterKeyStroke(bool bEditOrList, void* pPrivateData, bool & bExit, FX_DWORD nFlag) ;
 
-	CFFL_FormFiller*			GetFormFiller(CPDFSDK_Annot* pAnnot, FX_BOOL bRegister);
+	CFFL_FormFiller*			GetFormFiller(CPDFSDK_Annot* pAnnot, bool bRegister);
 	void						RemoveFormFiller(CPDFSDK_Annot* pAnnot);
 
-	static FX_BOOL				IsVisible(CPDFSDK_Widget* pWidget);
-	static FX_BOOL				IsReadOnly(CPDFSDK_Widget* pWidget);
-	static FX_BOOL				IsFillingAllowed(CPDFSDK_Widget* pWidget);
- 	static FX_BOOL				IsValidAnnot(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot);
+	static bool				IsVisible(CPDFSDK_Widget* pWidget);
+	static bool				IsReadOnly(CPDFSDK_Widget* pWidget);
+	static bool				IsFillingAllowed(CPDFSDK_Widget* pWidget);
+ 	static bool				IsValidAnnot(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot);
 
-	void						OnKeyStrokeCommit(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bRC, FX_BOOL& bExit, FX_DWORD nFlag);
-	void						OnValidate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bRC, FX_BOOL& bExit, FX_DWORD nFlag);
+	void						OnKeyStrokeCommit(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bRC, bool& bExit, FX_DWORD nFlag);
+	void						OnValidate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bRC, bool& bExit, FX_DWORD nFlag);
 
-	void						OnCalculate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bExit, FX_DWORD nFlag);
-	void						OnFormat(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bExit, FX_DWORD nFlag);
-	void						OnButtonUp(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, FX_BOOL& bReset, FX_BOOL& bExit,FX_UINT nFlag);
+	void						OnCalculate(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bExit, FX_DWORD nFlag);
+	void						OnFormat(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bExit, FX_DWORD nFlag);
+	void						OnButtonUp(CPDFSDK_Widget* pWidget, CPDFSDK_PageView* pPageView, bool& bReset, bool& bExit,FX_UINT nFlag);
 
 private:
     using CFFL_Widget2Filler = std::map<CPDFSDK_Annot*, CFFL_FormFiller*>;
@@ -77,7 +77,7 @@ private:
 
     CPDFDoc_Environment* m_pApp;
     CFFL_Widget2Filler m_Maps;
-    FX_BOOL m_bNotifying;
+    bool m_bNotifying;
 };
 
 class CFFL_PrivateData
diff --git a/fpdfsdk/include/formfiller/FFL_ListBox.h b/fpdfsdk/include/formfiller/FFL_ListBox.h
index 4c0813f5c8..59e3d6c689 100644
--- a/fpdfsdk/include/formfiller/FFL_ListBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ListBox.h
@@ -23,10 +23,10 @@ public:
     virtual CPWL_Wnd* NewPDFWindow(const PWL_CREATEPARAM& cp,
                                    CPDFSDK_PageView* pPageView);
 
-    virtual FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar,
+    virtual bool OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar,
                            FX_UINT nFlags);
 
-    virtual FX_BOOL IsDataChanged(CPDFSDK_PageView* pPageView);
+    virtual bool IsDataChanged(CPDFSDK_PageView* pPageView);
     virtual void SaveData(CPDFSDK_PageView* pPageView);
 
     virtual void GetActionData(CPDFSDK_PageView* pPageView,
@@ -40,8 +40,8 @@ public:
     virtual void RestoreState(CPDFSDK_PageView* pPageView);
 
     virtual CPWL_Wnd* ResetPDFWindow(CPDFSDK_PageView* pPageView,
-                                     FX_BOOL bRestoreValue);
-    virtual void OnKeyStroke(FX_BOOL bKeyDown, FX_DWORD nFlag);
+                                     bool bRestoreValue);
+    virtual void OnKeyStroke(bool bKeyDown, FX_DWORD nFlag);
 
 private:
     CBA_FontMap* m_pFontMap;
diff --git a/fpdfsdk/include/formfiller/FFL_Notify.h b/fpdfsdk/include/formfiller/FFL_Notify.h
index 961d4b7a79..8a9c04c5df 100644
--- a/fpdfsdk/include/formfiller/FFL_Notify.h
+++ b/fpdfsdk/include/formfiller/FFL_Notify.h
@@ -20,35 +20,35 @@ public:
 	virtual ~CFFL_Notify();
 
 public:
-	FX_BOOL									OnSetFocus(FX_BOOL & bExit);
-	FX_BOOL									OnMouseEnter(FX_BOOL & bExit);
-	FX_BOOL									OnMouseDown(FX_BOOL & bExit);
-	FX_BOOL									OnMouseUp(FX_BOOL & bExit);
-	FX_BOOL									OnMouseExit(FX_BOOL & bExit);
-	FX_BOOL									OnKillFocus(FX_BOOL & bExit);
-
-	FX_BOOL									OnCalculate();
-	FX_BOOL									OnFormat(int iCommitKey);
-	FX_BOOL									OnValidate(CPDF_FormField* pFormField, CFX_WideString& strValue, CFX_WideString & strChange,
-											   const CFX_WideString& strChangeEx, FX_BOOL bKeyDown, FX_BOOL bModifier,
-											   FX_BOOL bShift, FX_BOOL & bRC);
-	FX_BOOL									OnKeyStroke(CPDF_FormField* pFormField, int nCommitKey, CFX_WideString& strValue, CFX_WideString& strChange,
-											   const CFX_WideString& strChangeEx, FX_BOOL bKeyDown, FX_BOOL bModifier,
-											   FX_BOOL bShift, FX_BOOL bWillCommit, FX_BOOL bFieldFull,
-											   int& nSelStart, int& nSelEnd, FX_BOOL& bRC);
+	bool									OnSetFocus(bool & bExit);
+	bool									OnMouseEnter(bool & bExit);
+	bool									OnMouseDown(bool & bExit);
+	bool									OnMouseUp(bool & bExit);
+	bool									OnMouseExit(bool & bExit);
+	bool									OnKillFocus(bool & bExit);
+
+	bool									OnCalculate();
+	bool									OnFormat(int iCommitKey);
+	bool									OnValidate(CPDF_FormField* pFormField, CFX_WideString& strValue, CFX_WideString & strChange,
+											   const CFX_WideString& strChangeEx, bool bKeyDown, bool bModifier,
+											   bool bShift, bool & bRC);
+	bool									OnKeyStroke(CPDF_FormField* pFormField, int nCommitKey, CFX_WideString& strValue, CFX_WideString& strChange,
+											   const CFX_WideString& strChangeEx, bool bKeyDown, bool bModifier,
+											   bool bShift, bool bWillCommit, bool bFieldFull,
+											   int& nSelStart, int& nSelEnd, bool& bRC);
 
 	void									BeforeNotify();
 	void									AfterNotify();
-	FX_BOOL									IsNotifying() const {return m_nNotifyFlag > 0;}
+	bool									IsNotifying() const {return m_nNotifyFlag > 0;}
 
 private:
- 	FX_BOOL									DoAAction(CPDF_AAction::AActionType eAAT, FX_BOOL & bExit);
- 	FX_BOOL									FindAAction(CPDF_AAction::AActionType eAAT,CPDF_Action & action);
- 	FX_BOOL									FindAAction(CPDF_AAction aaction,CPDF_AAction::AActionType eAAT,CPDF_Action & action);
- 	FX_BOOL									ExecuteActionTree(CPDF_AAction::AActionType eAAT, CPDF_Action & action, FX_BOOL& bExit);
- 	FX_BOOL									ExecuteAction(CPDF_AAction::AActionType eAAT,CPDF_Action & action,FX_BOOL& bExit);
+ 	bool									DoAAction(CPDF_AAction::AActionType eAAT, bool & bExit);
+ 	bool									FindAAction(CPDF_AAction::AActionType eAAT,CPDF_Action & action);
+ 	bool									FindAAction(CPDF_AAction aaction,CPDF_AAction::AActionType eAAT,CPDF_Action & action);
+ 	bool									ExecuteActionTree(CPDF_AAction::AActionType eAAT, CPDF_Action & action, bool& bExit);
+ 	bool									ExecuteAction(CPDF_AAction::AActionType eAAT,CPDF_Action & action,bool& bExit);
 
-	FX_BOOL									m_bDoActioning;
+	bool									m_bDoActioning;
 	int32_t								m_nNotifyFlag;
 };
 
diff --git a/fpdfsdk/include/formfiller/FFL_PushButton.h b/fpdfsdk/include/formfiller/FFL_PushButton.h
index 3cfaefb9bd..26de7a1b23 100644
--- a/fpdfsdk/include/formfiller/FFL_PushButton.h
+++ b/fpdfsdk/include/formfiller/FFL_PushButton.h
@@ -17,7 +17,7 @@ public:
 
 	virtual CPWL_Wnd*			NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView);
 
-	virtual FX_BOOL				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
+	virtual bool				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
 	virtual void				OnDraw(CPDFSDK_PageView *pPageView,  CPDFSDK_Annot* pAnnot,
 									CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
 									FX_DWORD dwFlags);
diff --git a/fpdfsdk/include/formfiller/FFL_RadioButton.h b/fpdfsdk/include/formfiller/FFL_RadioButton.h
index 46332e07fd..e858533c6b 100644
--- a/fpdfsdk/include/formfiller/FFL_RadioButton.h
+++ b/fpdfsdk/include/formfiller/FFL_RadioButton.h
@@ -16,10 +16,10 @@ public:
 	virtual ~CFFL_RadioButton();
 
 	virtual CPWL_Wnd*			NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView);
-  	virtual FX_BOOL				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
-	virtual FX_BOOL				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
-	virtual FX_BOOL				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
-	virtual FX_BOOL				IsDataChanged(CPDFSDK_PageView* pPageView);
+  	virtual bool				OnKeyDown(CPDFSDK_Annot* pAnnot, FX_UINT nKeyCode, FX_UINT nFlags);
+	virtual bool				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
+	virtual bool				OnLButtonUp(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, FX_UINT nFlags, const CPDF_Point& point);
+	virtual bool				IsDataChanged(CPDFSDK_PageView* pPageView);
 	virtual void				SaveData(CPDFSDK_PageView* pPageView);
 };
 
diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h
index 10bd5c0e43..105b90cba9 100644
--- a/fpdfsdk/include/formfiller/FFL_TextField.h
+++ b/fpdfsdk/include/formfiller/FFL_TextField.h
@@ -32,21 +32,21 @@ public:
 	virtual CPWL_Wnd*			NewPDFWindow(const PWL_CREATEPARAM& cp, CPDFSDK_PageView* pPageView);
 
 
-	virtual FX_BOOL				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
+	virtual bool				OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags);
 
-	virtual FX_BOOL				IsDataChanged(CPDFSDK_PageView* pPageView);
+	virtual bool				IsDataChanged(CPDFSDK_PageView* pPageView);
 	virtual void				SaveData(CPDFSDK_PageView* pPageView);
 
  	virtual void				GetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type,
  												PDFSDK_FieldAction& fa);
  	virtual void				SetActionData(CPDFSDK_PageView* pPageView, CPDF_AAction::AActionType type,
 									const PDFSDK_FieldAction& fa);
- 	virtual FX_BOOL				IsActionDataChanged(CPDF_AAction::AActionType type, const PDFSDK_FieldAction& faOld,
+ 	virtual bool				IsActionDataChanged(CPDF_AAction::AActionType type, const PDFSDK_FieldAction& faOld,
  												const PDFSDK_FieldAction& faNew);
 	virtual void				SaveState(CPDFSDK_PageView* pPageView);
 	virtual void				RestoreState(CPDFSDK_PageView* pPageView);
 
-	virtual CPWL_Wnd*			ResetPDFWindow(CPDFSDK_PageView* pPageView, FX_BOOL bRestoreValue);
+	virtual CPWL_Wnd*			ResetPDFWindow(CPDFSDK_PageView* pPageView, bool bRestoreValue);
 
 public:
 	virtual void				OnSetFocus(CPWL_Wnd* pWnd);
@@ -56,9 +56,9 @@ public:
 	virtual void				OnAddUndo(CPWL_Edit* pEdit);
 
 public:
-	virtual FX_BOOL				CanCopy(CPDFSDK_Document* pDocument);
-	virtual FX_BOOL				CanCut(CPDFSDK_Document* pDocument);
-	virtual FX_BOOL				CanPaste(CPDFSDK_Document* pDocument);
+	virtual bool				CanCopy(CPDFSDK_Document* pDocument);
+	virtual bool				CanCut(CPDFSDK_Document* pDocument);
+	virtual bool				CanPaste(CPDFSDK_Document* pDocument);
 
 private:
 	CBA_FontMap*				m_pFontMap;
diff --git a/fpdfsdk/include/formfiller/FFL_Utils.h b/fpdfsdk/include/formfiller/FFL_Utils.h
index fe025eca4b..8dfc64eab0 100644
--- a/fpdfsdk/include/formfiller/FFL_Utils.h
+++ b/fpdfsdk/include/formfiller/FFL_Utils.h
@@ -17,7 +17,7 @@ public:
                                  const FX_FLOAT& fSize);
     static CPDF_Rect DeflateRect(const CPDF_Rect& crRect,
                                  const FX_FLOAT& fSize);
-    static FX_BOOL TraceObject(CPDF_Object* pObj);
+    static bool TraceObject(CPDF_Object* pObj);
 };
 
 #endif  // FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_