Remove FX_DWORD from fpdfsdk/ and testing/

fpdfsdk/fsdk_annothandler.cpp

 // 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
 
 #include "fpdfsdk/include/fsdk_annothandler.h"
 
 #include <algorithm>
 #include <vector>
@@ skipping 123 matching lines @@
 IPDFSDK_AnnotHandler* CPDFSDK_AnnotHandlerMgr::GetAnnotHandler(
     const CFX_ByteString& sType) const {
   auto it = m_mapType2Handler.find(sType);
   return it != m_mapType2Handler.end() ? it->second : nullptr;
 }
 
 void CPDFSDK_AnnotHandlerMgr::Annot_OnDraw(CPDFSDK_PageView* pPageView,
                                            CPDFSDK_Annot* pAnnot,
                                            CFX_RenderDevice* pDevice,
                                            CFX_Matrix* pUser2Device,
-                                           FX_DWORD dwFlags) {
+                                           uint32_t dwFlags) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     pAnnotHandler->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
   } else {
 #ifdef PDF_ENABLE_XFA
     if (pAnnot->IsXFAField())
       return;
 #endif  // PDF_ENABLE_XFA
     static_cast<CPDFSDK_BAAnnot*>(pAnnot)
         ->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr);
   }
 }
 
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonDown(
     CPDFSDK_PageView* pPageView,
     CPDFSDK_Annot* pAnnot,
-    FX_DWORD nFlags,
+    uint32_t nFlags,
     const CFX_FloatPoint& point) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     return pAnnotHandler->OnLButtonDown(pPageView, pAnnot, nFlags, point);
   }
   return FALSE;
 }
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonUp(
     CPDFSDK_PageView* pPageView,
     CPDFSDK_Annot* pAnnot,
-    FX_DWORD nFlags,
+    uint32_t nFlags,
     const CFX_FloatPoint& point) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     return pAnnotHandler->OnLButtonUp(pPageView, pAnnot, nFlags, point);
   }
   return FALSE;
 }
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonDblClk(
     CPDFSDK_PageView* pPageView,
     CPDFSDK_Annot* pAnnot,
-    FX_DWORD nFlags,
+    uint32_t nFlags,
     const CFX_FloatPoint& point) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     return pAnnotHandler->OnLButtonDblClk(pPageView, pAnnot, nFlags, point);
   }
   return FALSE;
 }
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnMouseMove(
     CPDFSDK_PageView* pPageView,
     CPDFSDK_Annot* pAnnot,
-    FX_DWORD nFlags,
+    uint32_t nFlags,
     const CFX_FloatPoint& point) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     return pAnnotHandler->OnMouseMove(pPageView, pAnnot, nFlags, point);
   }
   return FALSE;
 }
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnMouseWheel(
     CPDFSDK_PageView* pPageView,
     CPDFSDK_Annot* pAnnot,
-    FX_DWORD nFlags,
+    uint32_t nFlags,
     short zDelta,
     const CFX_FloatPoint& point) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     return pAnnotHandler->OnMouseWheel(pPageView, pAnnot, nFlags, zDelta,
                                        point);
   }
   return FALSE;
 }
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnRButtonDown(
     CPDFSDK_PageView* pPageView,
     CPDFSDK_Annot* pAnnot,
-    FX_DWORD nFlags,
+    uint32_t nFlags,
     const CFX_FloatPoint& point) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     return pAnnotHandler->OnRButtonDown(pPageView, pAnnot, nFlags, point);
   }
   return FALSE;
 }
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnRButtonUp(
     CPDFSDK_PageView* pPageView,
     CPDFSDK_Annot* pAnnot,
-    FX_DWORD nFlags,
+    uint32_t nFlags,
     const CFX_FloatPoint& point) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     return pAnnotHandler->OnRButtonUp(pPageView, pAnnot, nFlags, point);
   }
   return FALSE;
 }
 
 void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseEnter(CPDFSDK_PageView* pPageView,
                                                  CPDFSDK_Annot* pAnnot,
-                                                 FX_DWORD nFlag) {
+                                                 uint32_t nFlag) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
     pAnnotHandler->OnMouseEnter(pPageView, pAnnot, nFlag);
 }
 
 void CPDFSDK_AnnotHandlerMgr::Annot_OnMouseExit(CPDFSDK_PageView* pPageView,
                                                 CPDFSDK_Annot* pAnnot,
-                                                FX_DWORD nFlag) {
+                                                uint32_t nFlag) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
     pAnnotHandler->OnMouseExit(pPageView, pAnnot, nFlag);
 }
 
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnChar(CPDFSDK_Annot* pAnnot,
-                                              FX_DWORD nChar,
-                                              FX_DWORD nFlags) {
+                                              uint32_t nChar,
+                                              uint32_t nFlags) {
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     return pAnnotHandler->OnChar(pAnnot, nChar, nFlags);
   }
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnKeyDown(CPDFSDK_Annot* pAnnot,
                                                  int nKeyCode,
                                                  int nFlag) {
   if (!m_pApp->FFI_IsCTRLKeyDown(nFlag) && !m_pApp->FFI_IsALTKeyDown(nFlag)) {
@@ skipping 16 matching lines @@
   }
   return FALSE;
 }
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnKeyUp(CPDFSDK_Annot* pAnnot,
                                                int nKeyCode,
                                                int nFlag) {
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnSetFocus(CPDFSDK_Annot* pAnnot,
-                                                  FX_DWORD nFlag) {
+                                                  uint32_t nFlag) {
   ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     if (pAnnotHandler->OnSetFocus(pAnnot, nFlag)) {
       CPDFSDK_PageView* pPage = pAnnot->GetPageView();
       pPage->GetSDKDocument();
       return TRUE;
     }
   }
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnKillFocus(CPDFSDK_Annot* pAnnot,
-                                                   FX_DWORD nFlag) {
+                                                   uint32_t nFlag) {
   ASSERT(pAnnot);
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
     return pAnnotHandler->OnKillFocus(pAnnot, nFlag);
 
   return FALSE;
 }
 
 #ifdef PDF_ENABLE_XFA
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnChangeFocus(
     CPDFSDK_Annot* pSetAnnot,
@@ skipping 80 matching lines @@
 
   int nFieldFlags = pWidget->GetFieldFlags();
   if ((nFieldFlags & FIELDFLAG_READONLY) == FIELDFLAG_READONLY)
     return FALSE;
 
   if (pWidget->GetFieldType() == FIELDTYPE_PUSHBUTTON)
     return TRUE;
 
   CPDF_Page* pPage = pWidget->GetPDFPage();
   CPDF_Document* pDocument = pPage->m_pDocument;
-  FX_DWORD dwPermissions = pDocument->GetUserPermissions();
+  uint32_t dwPermissions = pDocument->GetUserPermissions();
   return (dwPermissions & FPDFPERM_FILL_FORM) ||
          (dwPermissions & FPDFPERM_ANNOT_FORM);
 }
 
 CPDFSDK_Annot* CPDFSDK_BFAnnotHandler::NewAnnot(CPDF_Annot* pAnnot,
                                                 CPDFSDK_PageView* pPage) {
   CPDFSDK_Document* pSDKDoc = m_pApp->GetSDKDocument();
   CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pSDKDoc->GetInterForm();
   CPDF_FormControl* pCtrl = CPDFSDK_Widget::GetFormControl(
       pInterForm->GetInterForm(), pAnnot->GetAnnotDict());
@@ skipping 27 matching lines @@
   CPDF_FormControl* pCtrol = pWidget->GetFormControl();
   pInterForm->RemoveMap(pCtrol);
 
   delete pWidget;
 }
 
 void CPDFSDK_BFAnnotHandler::OnDraw(CPDFSDK_PageView* pPageView,
                                     CPDFSDK_Annot* pAnnot,
                                     CFX_RenderDevice* pDevice,
                                     CFX_Matrix* pUser2Device,
-                                    FX_DWORD dwFlags) {
+                                    uint32_t dwFlags) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
     static_cast<CPDFSDK_BAAnnot*>(pAnnot)
         ->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr);
   } else {
     if (m_pFormFiller) {
       m_pFormFiller->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
     }
   }
 }
 
 void CPDFSDK_BFAnnotHandler::OnMouseEnter(CPDFSDK_PageView* pPageView,
                                           CPDFSDK_Annot* pAnnot,
-                                          FX_DWORD nFlag) {
+                                          uint32_t nFlag) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       m_pFormFiller->OnMouseEnter(pPageView, pAnnot, nFlag);
   }
 }
 void CPDFSDK_BFAnnotHandler::OnMouseExit(CPDFSDK_PageView* pPageView,
                                          CPDFSDK_Annot* pAnnot,
-                                         FX_DWORD nFlag) {
+                                         uint32_t nFlag) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       m_pFormFiller->OnMouseExit(pPageView, pAnnot, nFlag);
   }
 }
 FX_BOOL CPDFSDK_BFAnnotHandler::OnLButtonDown(CPDFSDK_PageView* pPageView,
                                               CPDFSDK_Annot* pAnnot,
-                                              FX_DWORD nFlags,
+                                              uint32_t nFlags,
                                               const CFX_FloatPoint& point) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnLButtonDown(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::OnLButtonUp(CPDFSDK_PageView* pPageView,
                                             CPDFSDK_Annot* pAnnot,
-                                            FX_DWORD nFlags,
+                                            uint32_t nFlags,
                                             const CFX_FloatPoint& point) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnLButtonUp(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::OnLButtonDblClk(CPDFSDK_PageView* pPageView,
                                                 CPDFSDK_Annot* pAnnot,
-                                                FX_DWORD nFlags,
+                                                uint32_t nFlags,
                                                 const CFX_FloatPoint& point) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnLButtonDblClk(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::OnMouseMove(CPDFSDK_PageView* pPageView,
                                             CPDFSDK_Annot* pAnnot,
-                                            FX_DWORD nFlags,
+                                            uint32_t nFlags,
                                             const CFX_FloatPoint& point) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnMouseMove(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::OnMouseWheel(CPDFSDK_PageView* pPageView,
                                              CPDFSDK_Annot* pAnnot,
-                                             FX_DWORD nFlags,
+                                             uint32_t nFlags,
                                              short zDelta,
                                              const CFX_FloatPoint& point) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnMouseWheel(pPageView, pAnnot, nFlags, zDelta,
                                          point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::OnRButtonDown(CPDFSDK_PageView* pPageView,
                                               CPDFSDK_Annot* pAnnot,
-                                              FX_DWORD nFlags,
+                                              uint32_t nFlags,
                                               const CFX_FloatPoint& point) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnRButtonDown(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 FX_BOOL CPDFSDK_BFAnnotHandler::OnRButtonUp(CPDFSDK_PageView* pPageView,
                                             CPDFSDK_Annot* pAnnot,
-                                            FX_DWORD nFlags,
+                                            uint32_t nFlags,
                                             const CFX_FloatPoint& point) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnRButtonUp(pPageView, pAnnot, nFlags, point);
   }
 
   return FALSE;
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::OnChar(CPDFSDK_Annot* pAnnot,
-                                       FX_DWORD nChar,
-                                       FX_DWORD nFlags) {
+                                       uint32_t nChar,
+                                       uint32_t nFlags) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnChar(pAnnot, nChar, nFlags);
   }
 
   return FALSE;
 }
@@ skipping 51 matching lines @@
   if (pDoc->GetDocType() == DOCTYPE_STATIC_XFA) {
     if (!pWidget->IsAppearanceValid() && !pWidget->GetValue().IsEmpty())
       pWidget->ResetAppearance(FALSE);
   }
 #endif  // PDF_ENABLE_XFA
   if (m_pFormFiller)
     m_pFormFiller->OnLoad(pAnnot);
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::OnSetFocus(CPDFSDK_Annot* pAnnot,
-                                           FX_DWORD nFlag) {
+                                           uint32_t nFlag) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnSetFocus(pAnnot, nFlag);
   }
 
   return TRUE;
 }
 FX_BOOL CPDFSDK_BFAnnotHandler::OnKillFocus(CPDFSDK_Annot* pAnnot,
-                                            FX_DWORD nFlag) {
+                                            uint32_t nFlag) {
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
   } else {
     if (m_pFormFiller)
       return m_pFormFiller->OnKillFocus(pAnnot, nFlag);
   }
 
   return TRUE;
 }
@@ skipping 40 matching lines @@
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::CanAnswer(CPDFSDK_Annot* pAnnot) {
   return pAnnot->GetXFAWidget() != NULL;
 }
 
 void CPDFSDK_XFAAnnotHandler::OnDraw(CPDFSDK_PageView* pPageView,
                                      CPDFSDK_Annot* pAnnot,
                                      CFX_RenderDevice* pDevice,
                                      CFX_Matrix* pUser2Device,
-                                     FX_DWORD dwFlags) {
+                                     uint32_t dwFlags) {
   ASSERT(pPageView != NULL);
   ASSERT(pAnnot != NULL);
 
   CPDFSDK_Document* pSDKDoc = pPageView->GetSDKDocument();
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
 
   CFX_Graphics gs;
   gs.Create(pDevice);
 
   CFX_Matrix mt;
@@ skipping 55 matching lines @@
     return FALSE;
 
   IXFA_DocView* pDocView = pDoc->GetXFADocView();
   if (!pDocView)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = pDocView->GetWidgetHandler();
   if (!pWidgetHandler)
     return FALSE;
 
-  FX_DWORD dwHitTest =
+  uint32_t dwHitTest =
       pWidgetHandler->OnHitTest(pAnnot->GetXFAWidget(), point.x, point.y);
   return (dwHitTest != FWL_WGTHITTEST_Unknown);
 }
 
 void CPDFSDK_XFAAnnotHandler::OnMouseEnter(CPDFSDK_PageView* pPageView,
                                            CPDFSDK_Annot* pAnnot,
-                                           FX_DWORD nFlag) {
+                                           uint32_t nFlag) {
   if (!pPageView || !pAnnot)
     return;
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   pWidgetHandler->OnMouseEnter(pAnnot->GetXFAWidget());
 }
 
 void CPDFSDK_XFAAnnotHandler::OnMouseExit(CPDFSDK_PageView* pPageView,
                                           CPDFSDK_Annot* pAnnot,
-                                          FX_DWORD nFlag) {
+                                          uint32_t nFlag) {
   if (!pPageView || !pAnnot)
     return;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   pWidgetHandler->OnMouseExit(pAnnot->GetXFAWidget());
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonDown(CPDFSDK_PageView* pPageView,
                                                CPDFSDK_Annot* pAnnot,
-                                               FX_DWORD nFlags,
+                                               uint32_t nFlags,
                                                const CFX_FloatPoint& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnLButtonDown(pAnnot->GetXFAWidget(),
                                        GetFWLFlags(nFlags), point.x, point.y);
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonUp(CPDFSDK_PageView* pPageView,
                                              CPDFSDK_Annot* pAnnot,
-                                             FX_DWORD nFlags,
+                                             uint32_t nFlags,
                                              const CFX_FloatPoint& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnLButtonUp(pAnnot->GetXFAWidget(),
                                      GetFWLFlags(nFlags), point.x, point.y);
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnLButtonDblClk(CPDFSDK_PageView* pPageView,
                                                  CPDFSDK_Annot* pAnnot,
-                                                 FX_DWORD nFlags,
+                                                 uint32_t nFlags,
                                                  const CFX_FloatPoint& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnLButtonDblClk(pAnnot->GetXFAWidget(),
                                          GetFWLFlags(nFlags), point.x, point.y);
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnMouseMove(CPDFSDK_PageView* pPageView,
                                              CPDFSDK_Annot* pAnnot,
-                                             FX_DWORD nFlags,
+                                             uint32_t nFlags,
                                              const CFX_FloatPoint& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnMouseMove(pAnnot->GetXFAWidget(),
                                      GetFWLFlags(nFlags), point.x, point.y);
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnMouseWheel(CPDFSDK_PageView* pPageView,
                                               CPDFSDK_Annot* pAnnot,
-                                              FX_DWORD nFlags,
+                                              uint32_t nFlags,
                                               short zDelta,
                                               const CFX_FloatPoint& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnMouseWheel(
       pAnnot->GetXFAWidget(), GetFWLFlags(nFlags), zDelta, point.x, point.y);
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonDown(CPDFSDK_PageView* pPageView,
                                                CPDFSDK_Annot* pAnnot,
-                                               FX_DWORD nFlags,
+                                               uint32_t nFlags,
                                                const CFX_FloatPoint& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnRButtonDown(pAnnot->GetXFAWidget(),
                                        GetFWLFlags(nFlags), point.x, point.y);
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonUp(CPDFSDK_PageView* pPageView,
                                              CPDFSDK_Annot* pAnnot,
-                                             FX_DWORD nFlags,
+                                             uint32_t nFlags,
                                              const CFX_FloatPoint& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnRButtonUp(pAnnot->GetXFAWidget(),
                                      GetFWLFlags(nFlags), point.x, point.y);
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnRButtonDblClk(CPDFSDK_PageView* pPageView,
                                                  CPDFSDK_Annot* pAnnot,
-                                                 FX_DWORD nFlags,
+                                                 uint32_t nFlags,
                                                  const CFX_FloatPoint& point) {
   if (!pPageView || !pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnRButtonDblClk(pAnnot->GetXFAWidget(),
                                          GetFWLFlags(nFlags), point.x, point.y);
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnChar(CPDFSDK_Annot* pAnnot,
-                                        FX_DWORD nChar,
-                                        FX_DWORD nFlags) {
+                                        uint32_t nChar,
+                                        uint32_t nFlags) {
   if (!pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnChar(pAnnot->GetXFAWidget(), nChar,
                                 GetFWLFlags(nFlags));
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnKeyDown(CPDFSDK_Annot* pAnnot,
                                            int nKeyCode,
@@ skipping 11 matching lines @@
                                          int nFlag) {
   if (!pAnnot)
     return FALSE;
 
   IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
   return pWidgetHandler->OnKeyUp(pAnnot->GetXFAWidget(), nKeyCode,
                                  GetFWLFlags(nFlag));
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnSetFocus(CPDFSDK_Annot* pAnnot,
-                                            FX_DWORD nFlag) {
+                                            uint32_t nFlag) {
   return TRUE;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnKillFocus(CPDFSDK_Annot* pAnnot,
-                                             FX_DWORD nFlag) {
+                                             uint32_t nFlag) {
   return TRUE;
 }
 
 FX_BOOL CPDFSDK_XFAAnnotHandler::OnXFAChangedFocus(CPDFSDK_Annot* pOldAnnot,
                                                    CPDFSDK_Annot* pNewAnnot) {
   IXFA_WidgetHandler* pWidgetHandler = NULL;
 
   if (pOldAnnot)
     pWidgetHandler = GetXFAWidgetHandler(pOldAnnot);
   else if (pNewAnnot)
@@ skipping 40 matching lines @@
   return pDocView->GetWidgetHandler();
 }
 
 #define FWL_KEYFLAG_Ctrl (1 << 0)
 #define FWL_KEYFLAG_Alt (1 << 1)
 #define FWL_KEYFLAG_Shift (1 << 2)
 #define FWL_KEYFLAG_LButton (1 << 3)
 #define FWL_KEYFLAG_RButton (1 << 4)
 #define FWL_KEYFLAG_MButton (1 << 5)
 
-FX_DWORD CPDFSDK_XFAAnnotHandler::GetFWLFlags(FX_DWORD dwFlag) {
-  FX_DWORD dwFWLFlag = 0;
+uint32_t CPDFSDK_XFAAnnotHandler::GetFWLFlags(uint32_t dwFlag) {
+  uint32_t dwFWLFlag = 0;
 
   if (dwFlag & FWL_EVENTFLAG_ControlKey)
     dwFWLFlag |= FWL_KEYFLAG_Ctrl;
   if (dwFlag & FWL_EVENTFLAG_LeftButtonDown)
     dwFWLFlag |= FWL_KEYFLAG_LButton;
   if (dwFlag & FWL_EVENTFLAG_MiddleButtonDown)
     dwFWLFlag |= FWL_KEYFLAG_MButton;
   if (dwFlag & FWL_EVENTFLAG_RightButtonDown)
     dwFWLFlag |= FWL_KEYFLAG_RButton;
   if (dwFlag & FWL_EVENTFLAG_ShiftKey)
@@ skipping 39 matching lines @@
 
 CPDFSDK_Annot* CPDFSDK_AnnotIterator::PrevAnnot() {
   if (m_pos < m_iteratorAnnotList.size())
     return m_iteratorAnnotList[m_iteratorAnnotList.size() - ++m_pos];
   return nullptr;
 }
 
 CPDFSDK_Annot* CPDFSDK_AnnotIterator::Next() {
   return m_bReverse ? PrevAnnot() : NextAnnot();
 }