Remove FX_DWORD from XFA, part 2

xfa/include/fxfa/fxfa.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_INCLUDE_FXFA_FXFA_H_
 #define XFA_INCLUDE_FXFA_FXFA_H_
 
 #include <vector>
@@ skipping 195 matching lines @@
   virtual void GetAppName(CFX_WideString& wsName) = 0;
   virtual void GetFoxitAppName(CFX_WideString& wsFoxitName) {
     wsFoxitName.Empty();
   }
 
   /**
    * Causes the system to play a sound.
    * @param[in] dwType The system code for the appropriate sound.0 (Error)1
    * (Warning)2 (Question)3 (Status)4 (Default)
    */
-  virtual void Beep(FX_DWORD dwType) = 0;
+  virtual void Beep(uint32_t dwType) = 0;
 
   /**
    * Displays a message box.
    * @param[in] dwIconType    Icon type, refer to XFA_MBICON.
    * @param[in] dwButtonType  Button type, refer to XFA_MESSAGEBUTTON.
    * @return A valid integer representing the value of the button pressed by the
    * user, refer to XFA_ID.
    */
   virtual int32_t MsgBox(const CFX_WideStringC& wsMessage,
                          const CFX_WideStringC& wsTitle = FX_WSTRC(L""),
-                         FX_DWORD dwIconType = 0,
-                         FX_DWORD dwButtonType = 0) = 0;
+                         uint32_t dwIconType = 0,
+                         uint32_t dwButtonType = 0) = 0;
 
   /**
    * Get a response from the user.
    * @param[in] bMark - Mask the user input with * (asterisks) when true,
    */
   virtual void Response(CFX_WideString& wsAnswer,
                         const CFX_WideStringC& wsQuestion,
                         const CFX_WideStringC& wsTitle = FX_WSTRC(L""),
                         const CFX_WideStringC& wsDefaultAnswer = FX_WSTRC(L""),
                         FX_BOOL bMark = TRUE) = 0;
@@ skipping 49 matching lines @@
                                  FX_BOOL bOpen = TRUE) = 0;
   virtual IFWL_AdapterTimerMgr* GetTimerMgr() = 0;
 };
 class IXFA_FontMgr {
  public:
   static IXFA_FontMgr* CreateDefault();
   virtual ~IXFA_FontMgr();
 
   virtual IFX_Font* GetFont(IXFA_Doc* hDoc,
                             const CFX_WideStringC& wsFontFamily,
-                            FX_DWORD dwFontStyles,
+                            uint32_t dwFontStyles,
                             uint16_t wCodePage = 0xFFFF) = 0;
   virtual IFX_Font* GetDefaultFont(IXFA_Doc* hDoc,
                                    const CFX_WideStringC& wsFontFamily,
-                                   FX_DWORD dwFontStyles,
+                                   uint32_t dwFontStyles,
                                    uint16_t wCodePage = 0xFFFF) = 0;
 };
 class IXFA_App {
  public:
   static IXFA_App* Create(IXFA_AppProvider* pProvider);
   virtual ~IXFA_App();
 
   virtual IXFA_DocHandler* GetDocHandler() = 0;
   virtual IXFA_Doc* CreateDoc(IXFA_DocProvider* pProvider,
                               IFX_FileRead* pStream,
@@ skipping 48 matching lines @@
 #define XFA_WIDGETEVENT_ListItemRemoved 7
 #define XFA_WIDGETEVENT_ListItemAdded 8
 #define XFA_WIDGETEVENT_AccessChanged 9
 class IXFA_DocProvider {
  public:
   virtual ~IXFA_DocProvider() {}
 
   virtual void SetChangeMark(IXFA_Doc* hDoc) = 0;
   virtual void InvalidateRect(IXFA_PageView* pPageView,
                               const CFX_RectF& rt,
-                              FX_DWORD dwFlags = 0) = 0;
+                              uint32_t dwFlags = 0) = 0;
   virtual void DisplayCaret(IXFA_Widget* hWidget,
                             FX_BOOL bVisible,
                             const CFX_RectF* pRtAnchor) = 0;
   virtual FX_BOOL GetPopupPos(IXFA_Widget* hWidget,
                               FX_FLOAT fMinPopup,
                               FX_FLOAT fMaxPopup,
                               const CFX_RectF& rtAnchor,
                               CFX_RectF& rtPopup) = 0;
   virtual FX_BOOL PopupMenu(IXFA_Widget* hWidget,
                             CFX_PointF ptPopup,
                             const CFX_RectF* pRectExclude = NULL) = 0;
-  virtual void PageViewEvent(IXFA_PageView* pPageView, FX_DWORD dwFlags) = 0;
+  virtual void PageViewEvent(IXFA_PageView* pPageView, uint32_t dwFlags) = 0;
   virtual void WidgetEvent(IXFA_Widget* hWidget,
                            CXFA_WidgetAcc* pWidgetData,
-                           FX_DWORD dwEvent,
+                           uint32_t dwEvent,
                            void* pParam = NULL,
                            void* pAdditional = NULL) = 0;
   virtual FX_BOOL RenderCustomWidget(IXFA_Widget* hWidget,
                                      CFX_Graphics* pGS,
                                      CFX_Matrix* pMatrix,
                                      const CFX_RectF& rtUI) {
     return FALSE;
   }
   virtual int32_t CountPages(IXFA_Doc* hDoc) = 0;
   virtual int32_t GetCurrentPage(IXFA_Doc* hDoc) = 0;
   virtual void SetCurrentPage(IXFA_Doc* hDoc, int32_t iCurPage) = 0;
   virtual FX_BOOL IsCalculationsEnabled(IXFA_Doc* hDoc) = 0;
   virtual void SetCalculationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;
   virtual void GetTitle(IXFA_Doc* hDoc, CFX_WideString& wsTitle) = 0;
   virtual void SetTitle(IXFA_Doc* hDoc, const CFX_WideStringC& wsTitle) = 0;
   virtual void ExportData(IXFA_Doc* hDoc,
                           const CFX_WideStringC& wsFilePath,
                           FX_BOOL bXDP = TRUE) = 0;
   virtual void ImportData(IXFA_Doc* hDoc,
                           const CFX_WideStringC& wsFilePath) = 0;
   virtual void GotoURL(IXFA_Doc* hDoc,
                        const CFX_WideStringC& bsURL,
                        FX_BOOL bAppend = TRUE) = 0;
   virtual FX_BOOL IsValidationsEnabled(IXFA_Doc* hDoc) = 0;
   virtual void SetValidationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;
   virtual void SetFocusWidget(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
   virtual void Print(IXFA_Doc* hDoc,
                      int32_t nStartPage,
                      int32_t nEndPage,
-                     FX_DWORD dwOptions) = 0;
+                     uint32_t dwOptions) = 0;
   virtual int32_t AbsPageCountInBatch(IXFA_Doc* hDoc) = 0;
   virtual int32_t AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
   virtual int32_t SheetCountInBatch(IXFA_Doc* hDoc) = 0;
   virtual int32_t SheetInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
   virtual int32_t Verify(IXFA_Doc* hDoc,
                          CXFA_Node* pSigNode,
                          FX_BOOL bUsed = TRUE) {
     return 0;
   }
   virtual FX_BOOL Sign(IXFA_Doc* hDoc,
@@ skipping 44 matching lines @@
 #define XFA_PARSESTATUS_SyntaxErr -1
 #define XFA_PARSESTATUS_Ready 0
 #define XFA_PARSESTATUS_Done 100
 class IXFA_DocHandler {
  public:
   virtual ~IXFA_DocHandler() {}
 
   virtual void ReleaseDoc(IXFA_Doc* hDoc) = 0;
   virtual IXFA_DocProvider* GetDocProvider(IXFA_Doc* hDoc) = 0;
 
-  virtual FX_DWORD GetDocType(IXFA_Doc* hDoc) = 0;
+  virtual uint32_t GetDocType(IXFA_Doc* hDoc) = 0;
   virtual int32_t StartLoad(IXFA_Doc* hDoc) = 0;
   virtual int32_t DoLoad(IXFA_Doc* hDoc, IFX_Pause* pPause = NULL) = 0;
   virtual void StopLoad(IXFA_Doc* hDoc) = 0;
 
-  virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, FX_DWORD dwView = 0) = 0;
+  virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, uint32_t dwView = 0) = 0;
 
   virtual int32_t CountPackages(IXFA_Doc* hDoc) = 0;
   virtual void GetPackageName(IXFA_Doc* hDoc,
                               int32_t iPackage,
                               CFX_WideStringC& wsPackage) = 0;
 
   virtual FX_BOOL SavePackage(IXFA_Doc* hDoc,
                               const CFX_WideStringC& wsPackage,
                               IFX_FileWrite* pFile,
                               IXFA_ChecksumContext* pCSContext = NULL) = 0;
@@ skipping 146 matching lines @@
   virtual void GetPageViewRect(CFX_RectF& rtPage) = 0;
 
   virtual void GetDisplayMatrix(CFX_Matrix& mt,
                                 const CFX_Rect& rtDisp,
                                 int32_t iRotate) = 0;
 
   virtual int32_t LoadPageView(IFX_Pause* pPause = NULL) = 0;
   virtual void UnloadPageView() = 0;
   virtual IXFA_Widget* GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0;
   virtual IXFA_WidgetIterator* CreateWidgetIterator(
-      FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form,
-      FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible |
+      uint32_t dwTraverseWay = XFA_TRAVERSEWAY_Form,
+      uint32_t dwWidgetFilter = XFA_WIDGETFILTER_Visible |
                                 XFA_WIDGETFILTER_Viewable |
                                 XFA_WIDGETFILTER_AllType) = 0;
 };
 class CXFA_RenderOptions {
  public:
   CXFA_RenderOptions() : m_bPrint(FALSE), m_bHighlight(TRUE) {}
   FX_BOOL m_bPrint;
   FX_BOOL m_bHighlight;
 };
 #define XFA_RENDERSTATUS_Ready 1
@@ skipping 45 matching lines @@
 #define XFA_WIDGETSTATUS_Focused 0x00000100
 class IXFA_WidgetHandler {
  public:
   virtual ~IXFA_WidgetHandler() {}
 
   virtual IXFA_Widget* CreateWidget(IXFA_Widget* hParent,
                                     XFA_WIDGETTYPE eType,
                                     IXFA_Widget* hBefore = NULL) = 0;
   virtual IXFA_PageView* GetPageView(IXFA_Widget* hWidget) = 0;
   virtual void GetRect(IXFA_Widget* hWidget, CFX_RectF& rt) = 0;
-  virtual FX_DWORD GetStatus(IXFA_Widget* hWidget) = 0;
+  virtual uint32_t GetStatus(IXFA_Widget* hWidget) = 0;
   virtual FX_BOOL GetBBox(IXFA_Widget* hWidget,
                           CFX_RectF& rtBox,
-                          FX_DWORD dwStatus,
+                          uint32_t dwStatus,
                           FX_BOOL bDrawFocus = FALSE) = 0;
   virtual CXFA_WidgetAcc* GetDataAcc(IXFA_Widget* hWidget) = 0;
 
   virtual void GetName(IXFA_Widget* hWidget,
                        CFX_WideString& wsName,
                        int32_t iNameType = 0) = 0;
   virtual FX_BOOL GetToolTip(IXFA_Widget* hWidget,
                              CFX_WideString& wsToolTip) = 0;
   virtual void SetPrivateData(IXFA_Widget* hWidget,
                               void* module_id,
                               void* pData,
                               PD_CALLBACK_FREEDATA callback) = 0;
   virtual void* GetPrivateData(IXFA_Widget* hWidget, void* module_id) = 0;
   virtual FX_BOOL OnMouseEnter(IXFA_Widget* hWidget) = 0;
   virtual FX_BOOL OnMouseExit(IXFA_Widget* hWidget) = 0;
   virtual FX_BOOL OnLButtonDown(IXFA_Widget* hWidget,
-                                FX_DWORD dwFlags,
+                                uint32_t dwFlags,
                                 FX_FLOAT fx,
                                 FX_FLOAT fy) = 0;
   virtual FX_BOOL OnLButtonUp(IXFA_Widget* hWidget,
-                              FX_DWORD dwFlags,
+                              uint32_t dwFlags,
                               FX_FLOAT fx,
                               FX_FLOAT fy) = 0;
   virtual FX_BOOL OnLButtonDblClk(IXFA_Widget* hWidget,
-                                  FX_DWORD dwFlags,
+                                  uint32_t dwFlags,
                                   FX_FLOAT fx,
                                   FX_FLOAT fy) = 0;
   virtual FX_BOOL OnMouseMove(IXFA_Widget* hWidget,
-                              FX_DWORD dwFlags,
+                              uint32_t dwFlags,
                               FX_FLOAT fx,
                               FX_FLOAT fy) = 0;
   virtual FX_BOOL OnMouseWheel(IXFA_Widget* hWidget,
-                               FX_DWORD dwFlags,
+                               uint32_t dwFlags,
                                int16_t zDelta,
                                FX_FLOAT fx,
                                FX_FLOAT fy) = 0;
   virtual FX_BOOL OnRButtonDown(IXFA_Widget* hWidget,
-                                FX_DWORD dwFlags,
+                                uint32_t dwFlags,
                                 FX_FLOAT fx,
                                 FX_FLOAT fy) = 0;
   virtual FX_BOOL OnRButtonUp(IXFA_Widget* hWidget,
-                              FX_DWORD dwFlags,
+                              uint32_t dwFlags,
                               FX_FLOAT fx,
                               FX_FLOAT fy) = 0;
   virtual FX_BOOL OnRButtonDblClk(IXFA_Widget* hWidget,
-                                  FX_DWORD dwFlags,
+                                  uint32_t dwFlags,
                                   FX_FLOAT fx,
                                   FX_FLOAT fy) = 0;
 
   virtual FX_BOOL OnKeyDown(IXFA_Widget* hWidget,
-                            FX_DWORD dwKeyCode,
-                            FX_DWORD dwFlags) = 0;
+                            uint32_t dwKeyCode,
+                            uint32_t dwFlags) = 0;
   virtual FX_BOOL OnKeyUp(IXFA_Widget* hWidget,
-                          FX_DWORD dwKeyCode,
-                          FX_DWORD dwFlags) = 0;
+                          uint32_t dwKeyCode,
+                          uint32_t dwFlags) = 0;
   virtual FX_BOOL OnChar(IXFA_Widget* hWidget,
-                         FX_DWORD dwChar,
-                         FX_DWORD dwFlags) = 0;
-  virtual FX_DWORD OnHitTest(IXFA_Widget* hWidget,
+                         uint32_t dwChar,
+                         uint32_t dwFlags) = 0;
+  virtual uint32_t OnHitTest(IXFA_Widget* hWidget,
                              FX_FLOAT fx,
                              FX_FLOAT fy) = 0;
   virtual FX_BOOL OnSetCursor(IXFA_Widget* hWidget,
                               FX_FLOAT fx,
                               FX_FLOAT fy) = 0;
 
   virtual void RenderWidget(IXFA_Widget* hWidget,
                             CFX_Graphics* pGS,
                             CFX_Matrix* pMatrix = NULL,
                             FX_BOOL bHighlight = FALSE) = 0;
@@ skipping 44 matching lines @@
                                  size_t size = 0) = 0;
   virtual void FinishChecksum() = 0;
   virtual void GetChecksum(CFX_ByteString& bsChecksum) = 0;
 
  protected:
   ~IXFA_ChecksumContext() {}
 };
 IXFA_ChecksumContext* XFA_Checksum_Create();
 
 #endif  // XFA_INCLUDE_FXFA_FXFA_H_