Remove FX_DWORD from XFA.

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

49 files changed, 407 insertions, 407 deletions

diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp
index b9a7b50be7..4d2bdfc401 100644
--- a/xfa/fxfa/app/xfa_checksum.cpp
+++ b/xfa/fxfa/app/xfa_checksum.cpp
@@ -16,7 +16,7 @@ CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext)
 CXFA_SAXReaderHandler::~CXFA_SAXReaderHandler() {}
 void* CXFA_SAXReaderHandler::OnTagEnter(const CFX_ByteStringC& bsTagName,
                                         FX_SAXNODE eType,
-                                        FX_DWORD dwStartPos) {
+                                        uint32_t dwStartPos) {
   UpdateChecksum(TRUE);
   if (eType != FX_SAXNODE_Tag && eType != FX_SAXNODE_Instruction) {
     return NULL;
@@ -51,7 +51,7 @@ void CXFA_SAXReaderHandler::OnTagBreak(void* pTag) {
 void CXFA_SAXReaderHandler::OnTagData(void* pTag,
                                       FX_SAXNODE eType,
                                       const CFX_ByteStringC& bsData,
-                                      FX_DWORD dwStartPos) {
+                                      uint32_t dwStartPos) {
   if (pTag == NULL) {
     return;
   }
@@ -64,7 +64,7 @@ void CXFA_SAXReaderHandler::OnTagData(void* pTag,
     textBuf << "]]>";
   }
 }
-void CXFA_SAXReaderHandler::OnTagClose(void* pTag, FX_DWORD dwEndPos) {
+void CXFA_SAXReaderHandler::OnTagClose(void* pTag, uint32_t dwEndPos) {
   if (pTag == NULL) {
     return;
   }
@@ -79,7 +79,7 @@ void CXFA_SAXReaderHandler::OnTagClose(void* pTag, FX_DWORD dwEndPos) {
 }
 void CXFA_SAXReaderHandler::OnTagEnd(void* pTag,
                                      const CFX_ByteStringC& bsTagName,
-                                     FX_DWORD dwEndPos) {
+                                     uint32_t dwEndPos) {
   if (pTag == NULL) {
     return;
   }
@@ -90,7 +90,7 @@ void CXFA_SAXReaderHandler::OnTagEnd(void* pTag,
 void CXFA_SAXReaderHandler::OnTargetData(void* pTag,
                                          FX_SAXNODE eType,
                                          const CFX_ByteStringC& bsData,
-                                         FX_DWORD dwStartPos) {
+                                         uint32_t dwStartPos) {
   if (pTag == NULL && eType != FX_SAXNODE_Comment) {
     return;
   }
@@ -155,7 +155,7 @@ FX_BOOL CXFA_ChecksumContext::UpdateChecksum(IFX_FileRead* pSrcFile,
   CXFA_SAXReaderHandler handler(this);
   m_pSAXReader->SetHandler(&handler);
   if (m_pSAXReader->StartParse(
-          pSrcFile, (FX_DWORD)offset, (FX_DWORD)size,
+          pSrcFile, (uint32_t)offset, (uint32_t)size,
           FX_SAXPARSEMODE_NotSkipSpace | FX_SAXPARSEMODE_NotConvert_amp |
               FX_SAXPARSEMODE_NotConvert_lt | FX_SAXPARSEMODE_NotConvert_gt |
               FX_SAXPARSEMODE_NotConvert_sharp) < 0) {
diff --git a/xfa/fxfa/app/xfa_ffapp.cpp b/xfa/fxfa/app/xfa_ffapp.cpp
index c31538659e..1fdcc25563 100644
--- a/xfa/fxfa/app/xfa_ffapp.cpp
+++ b/xfa/fxfa/app/xfa_ffapp.cpp
@@ -24,7 +24,7 @@ CXFA_FileRead::CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*>& streams) {
   }
 }
 FX_FILESIZE CXFA_FileRead::GetSize() {
-  FX_DWORD dwSize = 0;
+  uint32_t dwSize = 0;
   int32_t iCount = m_Data.GetSize();
   for (int32_t i = 0; i < iCount; i++) {
     CPDF_StreamAcc& acc = m_Data[i];
@@ -48,7 +48,7 @@ FX_BOOL CXFA_FileRead::ReadBlock(void* buffer,
   }
   while (index < iCount) {
     CPDF_StreamAcc& acc = m_Data[index];
-    FX_DWORD dwSize = acc.GetSize();
+    uint32_t dwSize = acc.GetSize();
     size_t dwRead = std::min(size, static_cast<size_t>(dwSize - offset));
     FXSYS_memcpy(buffer, acc.GetData() + offset, dwRead);
     size -= dwRead;
diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp
index 8bc4a26931..22ab7f7cd3 100644
--- a/xfa/fxfa/app/xfa_ffbarcode.cpp
+++ b/xfa/fxfa/app/xfa_ffbarcode.cpp
@@ -141,7 +141,7 @@ FX_BOOL CXFA_FFBarcode::LoadWidget() {
 }
 void CXFA_FFBarcode::RenderWidget(CFX_Graphics* pGS,
                                   CFX_Matrix* pMatrix,
-                                  FX_DWORD dwStatus,
+                                  uint32_t dwStatus,
                                   int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -217,7 +217,7 @@ void CXFA_FFBarcode::UpdateWidgetProperty() {
     pBarCodeWidget->SetPrintChecksum(TRUE);
   }
 }
-FX_BOOL CXFA_FFBarcode::OnLButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFBarcode::OnLButtonDown(uint32_t dwFlags,
                                       FX_FLOAT fx,
                                       FX_FLOAT fy) {
   CFWL_Barcode* pBarCodeWidget = (CFWL_Barcode*)m_pNormalWidget;
@@ -229,7 +229,7 @@ FX_BOOL CXFA_FFBarcode::OnLButtonDown(FX_DWORD dwFlags,
   }
   return CXFA_FFTextEdit::OnLButtonDown(dwFlags, fx, fy);
 }
-FX_BOOL CXFA_FFBarcode::OnRButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFBarcode::OnRButtonDown(uint32_t dwFlags,
                                       FX_FLOAT fx,
                                       FX_FLOAT fy) {
   CFWL_Barcode* pBarCodeWidget = (CFWL_Barcode*)m_pNormalWidget;
diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.cpp b/xfa/fxfa/app/xfa_ffcheckbutton.cpp
index 1e7c71aa3d..c1b3099ff4 100644
--- a/xfa/fxfa/app/xfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/app/xfa_ffcheckbutton.cpp
@@ -52,7 +52,7 @@ void CXFA_FFCheckButton::UpdateWidgetProperty() {
   }
   FX_FLOAT fSize = m_pDataAcc->GetCheckButtonSize();
   pCheckBox->SetBoxSize(fSize);
-  FX_DWORD dwStyleEx = FWL_STYLEEXT_CKB_SignShapeCross;
+  uint32_t dwStyleEx = FWL_STYLEEXT_CKB_SignShapeCross;
   int32_t iCheckMark = m_pDataAcc->GetCheckButtonMark();
   switch (iCheckMark) {
     case XFA_ATTRIBUTEENUM_Check:
@@ -214,7 +214,7 @@ void CXFA_FFCheckButton::AddUIMargin(int32_t iCapPlacement) {
 }
 void CXFA_FFCheckButton::RenderWidget(CFX_Graphics* pGS,
                                       CFX_Matrix* pMatrix,
-                                      FX_DWORD dwStatus,
+                                      uint32_t dwStatus,
                                       int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -239,7 +239,7 @@ void CXFA_FFCheckButton::RenderWidget(CFX_Graphics* pGS,
   GetApp()->GetWidgetMgrDelegate()->OnDrawWidget(m_pNormalWidget->GetWidget(),
                                                  pGS, &mt);
 }
-FX_BOOL CXFA_FFCheckButton::OnLButtonUp(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFCheckButton::OnLButtonUp(uint32_t dwFlags,
                                         FX_FLOAT fx,
                                         FX_FLOAT fy) {
   if (!m_pNormalWidget) {
@@ -261,7 +261,7 @@ FX_BOOL CXFA_FFCheckButton::OnLButtonUp(FX_DWORD dwFlags,
 }
 XFA_CHECKSTATE CXFA_FFCheckButton::FWLState2XFAState() {
   XFA_CHECKSTATE eCheckState = XFA_CHECKSTATE_Off;
-  FX_DWORD dwState = m_pNormalWidget->GetStates();
+  uint32_t dwState = m_pNormalWidget->GetStates();
   if (dwState & FWL_STATE_CKB_Checked) {
     eCheckState = XFA_CHECKSTATE_On;
   } else if (dwState & FWL_STATE_CKB_Neutral) {
@@ -300,7 +300,7 @@ int32_t CXFA_FFCheckButton::OnProcessMessage(CFWL_Message* pMessage) {
 }
 FWL_ERR CXFA_FFCheckButton::OnProcessEvent(CFWL_Event* pEvent) {
   CXFA_FFField::OnProcessEvent(pEvent);
-  FX_DWORD dwEventID = pEvent->GetClassID();
+  uint32_t dwEventID = pEvent->GetClassID();
   switch (dwEventID) {
     case FWL_EVTHASH_CKB_CheckStateChanged: {
       CXFA_EventParam eParam;
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp
index f94ed1ef43..1410ad4fa5 100644
--- a/xfa/fxfa/app/xfa_ffchoicelist.cpp
+++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp
@@ -46,7 +46,7 @@ FX_BOOL CXFA_FFListBox::LoadWidget() {
   for (int32_t i = 0; i < iItems; i++) {
     pListBox->AddString(wsLabelArray[i]);
   }
-  FX_DWORD dwExtendedStyle = FWL_STYLEEXT_LTB_ShowScrollBarFocus;
+  uint32_t dwExtendedStyle = FWL_STYLEEXT_LTB_ShowScrollBarFocus;
   if (m_pDataAcc->GetChoiceListOpen() == XFA_ATTRIBUTEENUM_MultiSelect) {
     dwExtendedStyle |= FWL_STYLEEXT_LTB_MultiSelection;
   }
@@ -100,8 +100,8 @@ FX_BOOL CXFA_FFListBox::IsDataChanged() {
   }
   return TRUE;
 }
-FX_DWORD CXFA_FFListBox::GetAlignment() {
-  FX_DWORD dwExtendedStyle = 0;
+uint32_t CXFA_FFListBox::GetAlignment() {
+  uint32_t dwExtendedStyle = 0;
   if (CXFA_Para para = m_pDataAcc->GetPara()) {
     int32_t iHorz = para.GetHorizontalAlign();
     switch (iHorz) {
@@ -185,7 +185,7 @@ int32_t CXFA_FFListBox::OnProcessMessage(CFWL_Message* pMessage) {
 }
 FWL_ERR CXFA_FFListBox::OnProcessEvent(CFWL_Event* pEvent) {
   CXFA_FFField::OnProcessEvent(pEvent);
-  FX_DWORD dwEventID = pEvent->GetClassID();
+  uint32_t dwEventID = pEvent->GetClassID();
   switch (dwEventID) {
     case FWL_EVTHASH_LTB_SelChanged: {
       CFX_Int32Array arrSels;
@@ -208,7 +208,7 @@ CXFA_FFComboBox::CXFA_FFComboBox(CXFA_FFPageView* pPageView,
 CXFA_FFComboBox::~CXFA_FFComboBox() {}
 
 FX_BOOL CXFA_FFComboBox::GetBBox(CFX_RectF& rtBox,
-                                 FX_DWORD dwStatus,
+                                 uint32_t dwStatus,
                                  FX_BOOL bDrawFocus) {
   if (bDrawFocus)
     return FALSE;
@@ -261,8 +261,8 @@ void CXFA_FFComboBox::UpdateWidgetProperty() {
   if (!pComboBox) {
     return;
   }
-  FX_DWORD dwExtendedStyle = 0;
-  FX_DWORD dwEditStyles =
+  uint32_t dwExtendedStyle = 0;
+  uint32_t dwEditStyles =
       FWL_STYLEEXT_EDT_ReadOnly | FWL_STYLEEXT_EDT_LastLineHeight;
   dwExtendedStyle |= UpdateUIProperty();
   if (m_pDataAcc->IsChoiceListAllowTextEntry()) {
@@ -281,7 +281,7 @@ void CXFA_FFComboBox::UpdateWidgetProperty() {
   }
   pComboBox->EditModifyStylesEx(dwEditStyles, 0xFFFFFFFF);
 }
-FX_BOOL CXFA_FFComboBox::OnRButtonUp(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFComboBox::OnRButtonUp(uint32_t dwFlags,
                                      FX_FLOAT fx,
                                      FX_FLOAT fy) {
   if (!CXFA_FFField::OnRButtonUp(dwFlags, fx, fy))
@@ -331,8 +331,8 @@ void CXFA_FFComboBox::FWLEventSelChange(CXFA_EventParam* pParam) {
   pFWLcombobox->GetEditText(pParam->m_wsNewText);
   m_pDataAcc->ProcessEvent(XFA_ATTRIBUTEENUM_Change, pParam);
 }
-FX_DWORD CXFA_FFComboBox::GetAlignment() {
-  FX_DWORD dwExtendedStyle = 0;
+uint32_t CXFA_FFComboBox::GetAlignment() {
+  uint32_t dwExtendedStyle = 0;
   if (CXFA_Para para = m_pDataAcc->GetPara()) {
     int32_t iHorz = para.GetHorizontalAlign();
     switch (iHorz) {
@@ -500,7 +500,7 @@ int32_t CXFA_FFComboBox::OnProcessMessage(CFWL_Message* pMessage) {
 }
 FWL_ERR CXFA_FFComboBox::OnProcessEvent(CFWL_Event* pEvent) {
   CXFA_FFField::OnProcessEvent(pEvent);
-  FX_DWORD dwEventID = pEvent->GetClassID();
+  uint32_t dwEventID = pEvent->GetClassID();
   switch (dwEventID) {
     case FWL_EVTHASH_CMB_SelChanged: {
       CFWL_EvtCmbSelChanged* postEvent = (CFWL_EvtCmbSelChanged*)pEvent;
diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp
index ec2a1a215e..c130a036b5 100644
--- a/xfa/fxfa/app/xfa_ffdoc.cpp
+++ b/xfa/fxfa/app/xfa_ffdoc.cpp
@@ -32,7 +32,7 @@ CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider)
 CXFA_FFDoc::~CXFA_FFDoc() {
   CloseDoc();
 }
-FX_DWORD CXFA_FFDoc::GetDocType() {
+uint32_t CXFA_FFDoc::GetDocType() {
   return m_dwDocType;
 }
 int32_t CXFA_FFDoc::StartLoad() {
@@ -181,7 +181,7 @@ void CXFA_FFDoc::StopLoad() {
     m_dwDocType = XFA_DOCTYPE_Dynamic;
   }
 }
-IXFA_DocView* CXFA_FFDoc::CreateDocView(FX_DWORD dwView) {
+IXFA_DocView* CXFA_FFDoc::CreateDocView(uint32_t dwView) {
   CXFA_FFDocView* pDocView =
       (CXFA_FFDocView*)m_mapTypeToDocView.GetValueAt((void*)(uintptr_t)dwView);
   if (!pDocView) {
@@ -236,8 +236,8 @@ FX_BOOL CXFA_FFDoc::OpenDoc(CPDF_Document* pPDFDoc) {
   CFX_ArrayTemplate<CPDF_Stream*> xfaStreams;
   if (pElementXFA->IsArray()) {
     CPDF_Array* pXFAArray = (CPDF_Array*)pElementXFA;
-    FX_DWORD count = pXFAArray->GetCount() / 2;
-    for (FX_DWORD i = 0; i < count; i++) {
+    uint32_t count = pXFAArray->GetCount() / 2;
+    for (uint32_t i = 0; i < count; i++) {
       if (CPDF_Stream* pStream = pXFAArray->GetStreamAt(i * 2 + 1))
         xfaStreams.Add(pStream);
     }
@@ -307,7 +307,7 @@ FX_BOOL CXFA_FFDoc::CloseDoc() {
   pNoteDriver->ClearEventTargets(FALSE);
   return TRUE;
 }
-void CXFA_FFDoc::SetDocType(FX_DWORD dwType) {
+void CXFA_FFDoc::SetDocType(uint32_t dwType) {
   m_dwDocType = dwType;
 }
 CPDF_Document* CXFA_FFDoc::GetPDFDoc() {
@@ -320,7 +320,7 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName,
   if (!m_pPDFDoc)
     return nullptr;
 
-  FX_DWORD dwHash =
+  uint32_t dwHash =
       FX_HashCode_String_GetW(wsName.GetPtr(), wsName.GetLength(), FALSE);
   FX_IMAGEDIB_AND_DPI* imageDIBDpi = nullptr;
   if (m_mapNamedImages.Lookup((void*)(uintptr_t)dwHash, (void*&)imageDIBDpi)) {
@@ -379,7 +379,7 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName,
 }
 
 IFDE_XMLElement* CXFA_FFDoc::GetPackageData(const CFX_WideStringC& wsPackage) {
-  FX_DWORD packetHash =
+  uint32_t packetHash =
       FX_HashCode_String_GetW(wsPackage.GetPtr(), wsPackage.GetLength());
   CXFA_Node* pNode = ToNode(m_pDocument->GetXFAObject(packetHash));
   if (!pNode) {
@@ -397,7 +397,7 @@ FX_BOOL CXFA_FFDoc::SavePackage(const CFX_WideStringC& wsPackage,
   if (!pExport) {
     return FALSE;
   }
-  FX_DWORD packetHash =
+  uint32_t packetHash =
       FX_HashCode_String_GetW(wsPackage.GetPtr(), wsPackage.GetLength());
   CXFA_Node* pNode = NULL;
   if (packetHash == XFA_HASHCODE_Xfa) {
diff --git a/xfa/fxfa/app/xfa_ffdochandler.cpp b/xfa/fxfa/app/xfa_ffdochandler.cpp
index 5ea7884134..2019bb24df 100644
--- a/xfa/fxfa/app/xfa_ffdochandler.cpp
+++ b/xfa/fxfa/app/xfa_ffdochandler.cpp
@@ -17,7 +17,7 @@ void CXFA_FFDocHandler::ReleaseDoc(IXFA_Doc* hDoc) {
 IXFA_DocProvider* CXFA_FFDocHandler::GetDocProvider(IXFA_Doc* hDoc) {
   return static_cast<CXFA_FFDoc*>(hDoc)->GetDocProvider();
 }
-FX_DWORD CXFA_FFDocHandler::GetDocType(IXFA_Doc* hDoc) {
+uint32_t CXFA_FFDocHandler::GetDocType(IXFA_Doc* hDoc) {
   return static_cast<CXFA_FFDoc*>(hDoc)->GetDocType();
 }
 int32_t CXFA_FFDocHandler::StartLoad(IXFA_Doc* hDoc) {
@@ -31,7 +31,7 @@ void CXFA_FFDocHandler::StopLoad(IXFA_Doc* hDoc) {
 }
 
 IXFA_DocView* CXFA_FFDocHandler::CreateDocView(IXFA_Doc* hDoc,
-                                               FX_DWORD dwView) {
+                                               uint32_t dwView) {
   return static_cast<CXFA_FFDoc*>(hDoc)->CreateDocView(dwView);
 }
 int32_t CXFA_FFDocHandler::CountPackages(IXFA_Doc* hDoc) {
diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp
index ab1cafe5f4..5e814475db 100644
--- a/xfa/fxfa/app/xfa_ffdocview.cpp
+++ b/xfa/fxfa/app/xfa_ffdocview.cpp
@@ -505,7 +505,7 @@ CXFA_WidgetAcc* CXFA_FFDocView::GetWidgetAccByName(
     const CFX_WideStringC& wsName,
     CXFA_WidgetAcc* pRefWidgetAcc) {
   CFX_WideString wsExpression;
-  FX_DWORD dwStyle = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
+  uint32_t dwStyle = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
                      XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent;
   IXFA_ScriptContext* pScriptContext = m_pDoc->GetXFADoc()->GetScriptContext();
   if (!pScriptContext) {
@@ -774,7 +774,7 @@ void CXFA_FFDocView::RunBindItems() {
         pWidgetNode->GetDocument()->GetScriptContext();
     CFX_WideStringC wsRef;
     binditems.GetRef(wsRef);
-    FX_DWORD dwStyle = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
+    uint32_t dwStyle = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
                        XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent |
                        XFA_RESOLVENODE_ALL;
     XFA_RESOLVENODE_RS rs;
@@ -793,7 +793,7 @@ void CXFA_FFDocView::RunBindItems() {
     const bool bValueUseContent =
         wsValueRef.IsEmpty() || wsValueRef == FX_WSTRC(L"$");
     CFX_WideString wsValue, wsLabel;
-    FX_DWORD uValueHash = FX_HashCode_String_GetW(CFX_WideString(wsValueRef),
+    uint32_t uValueHash = FX_HashCode_String_GetW(CFX_WideString(wsValueRef),
                                                   wsValueRef.GetLength());
     for (int32_t i = 0; i < iCount; i++) {
       CXFA_Object* refObj = rs.nodes[i];
diff --git a/xfa/fxfa/app/xfa_ffexclgroup.cpp b/xfa/fxfa/app/xfa_ffexclgroup.cpp
index 4e24218470..6705ea6c0e 100644
--- a/xfa/fxfa/app/xfa_ffexclgroup.cpp
+++ b/xfa/fxfa/app/xfa_ffexclgroup.cpp
@@ -17,7 +17,7 @@ CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_FFPageView* pPageView,
 CXFA_FFExclGroup::~CXFA_FFExclGroup() {}
 void CXFA_FFExclGroup::RenderWidget(CFX_Graphics* pGS,
                                     CFX_Matrix* pMatrix,
-                                    FX_DWORD dwStatus,
+                                    uint32_t dwStatus,
                                     int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
diff --git a/xfa/fxfa/app/xfa_fffield.cpp b/xfa/fxfa/app/xfa_fffield.cpp
index 0f5874f9aa..ed81953897 100644
--- a/xfa/fxfa/app/xfa_fffield.cpp
+++ b/xfa/fxfa/app/xfa_fffield.cpp
@@ -31,7 +31,7 @@ CXFA_FFField::~CXFA_FFField() {
 }
 
 FX_BOOL CXFA_FFField::GetBBox(CFX_RectF& rtBox,
-                              FX_DWORD dwStatus,
+                              uint32_t dwStatus,
                               FX_BOOL bDrawFocus) {
   if (!bDrawFocus)
     return CXFA_FFWidget::GetBBox(rtBox, dwStatus);
@@ -51,7 +51,7 @@ FX_BOOL CXFA_FFField::GetBBox(CFX_RectF& rtBox,
 
 void CXFA_FFField::RenderWidget(CFX_Graphics* pGS,
                                 CFX_Matrix* pMatrix,
-                                FX_DWORD dwStatus,
+                                uint32_t dwStatus,
                                 int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -76,7 +76,7 @@ void CXFA_FFField::RenderWidget(CFX_Graphics* pGS,
 }
 void CXFA_FFField::DrawHighlight(CFX_Graphics* pGS,
                                  CFX_Matrix* pMatrix,
-                                 FX_DWORD dwStatus,
+                                 uint32_t dwStatus,
                                  FX_BOOL bEllipse) {
   if (m_rtUI.IsEmpty() || !m_pDataAcc->GetDoc()->GetXFADoc()->IsInteractive()) {
     return;
@@ -321,9 +321,9 @@ void CXFA_FFField::UpdateFWL() {
     m_pNormalWidget->Update();
   }
 }
-FX_DWORD CXFA_FFField::UpdateUIProperty() {
+uint32_t CXFA_FFField::UpdateUIProperty() {
   CXFA_Node* pUiNode = m_pDataAcc->GetUIChild();
-  FX_DWORD dwStyle = 0;
+  uint32_t dwStyle = 0;
   if (pUiNode && pUiNode->GetClassID() == XFA_ELEMENT_DefaultUi) {
     dwStyle = FWL_STYLEEXT_EDT_ReadOnly;
   }
@@ -376,7 +376,7 @@ void CXFA_FFField::FWLToClient(FX_FLOAT& fx, FX_FLOAT& fy) {
   fx -= rtWidget.left;
   fy -= rtWidget.top;
 }
-FX_BOOL CXFA_FFField::OnLButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFField::OnLButtonDown(uint32_t dwFlags,
                                     FX_FLOAT fx,
                                     FX_FLOAT fy) {
   if (!m_pNormalWidget) {
@@ -400,7 +400,7 @@ FX_BOOL CXFA_FFField::OnLButtonDown(FX_DWORD dwFlags,
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+FX_BOOL CXFA_FFField::OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   if (!m_pNormalWidget) {
     return FALSE;
   }
@@ -418,7 +418,7 @@ FX_BOOL CXFA_FFField::OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnLButtonDblClk(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFField::OnLButtonDblClk(uint32_t dwFlags,
                                       FX_FLOAT fx,
                                       FX_FLOAT fy) {
   if (!m_pNormalWidget) {
@@ -434,7 +434,7 @@ FX_BOOL CXFA_FFField::OnLButtonDblClk(FX_DWORD dwFlags,
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+FX_BOOL CXFA_FFField::OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   if (!m_pNormalWidget) {
     return FALSE;
   }
@@ -448,7 +448,7 @@ FX_BOOL CXFA_FFField::OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnMouseWheel(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFField::OnMouseWheel(uint32_t dwFlags,
                                    int16_t zDelta,
                                    FX_FLOAT fx,
                                    FX_FLOAT fy) {
@@ -467,7 +467,7 @@ FX_BOOL CXFA_FFField::OnMouseWheel(FX_DWORD dwFlags,
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnRButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFField::OnRButtonDown(uint32_t dwFlags,
                                     FX_FLOAT fx,
                                     FX_FLOAT fy) {
   if (!m_pNormalWidget) {
@@ -491,7 +491,7 @@ FX_BOOL CXFA_FFField::OnRButtonDown(FX_DWORD dwFlags,
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+FX_BOOL CXFA_FFField::OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   if (!m_pNormalWidget) {
     return FALSE;
   }
@@ -509,7 +509,7 @@ FX_BOOL CXFA_FFField::OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnRButtonDblClk(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFField::OnRButtonDblClk(uint32_t dwFlags,
                                       FX_FLOAT fx,
                                       FX_FLOAT fy) {
   if (!m_pNormalWidget) {
@@ -552,7 +552,7 @@ FX_BOOL CXFA_FFField::OnKillFocus(CXFA_FFWidget* pNewWidget) {
   CXFA_FFWidget::OnKillFocus(pNewWidget);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
+FX_BOOL CXFA_FFField::OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags) {
   if (!m_pNormalWidget || !m_pDataAcc->GetDoc()->GetXFADoc()->IsInteractive()) {
     return FALSE;
   }
@@ -565,7 +565,7 @@ FX_BOOL CXFA_FFField::OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
+FX_BOOL CXFA_FFField::OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags) {
   if (!m_pNormalWidget || !m_pDataAcc->GetDoc()->GetXFADoc()->IsInteractive()) {
     return FALSE;
   }
@@ -578,7 +578,7 @@ FX_BOOL CXFA_FFField::OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFField::OnChar(FX_DWORD dwChar, FX_DWORD dwFlags) {
+FX_BOOL CXFA_FFField::OnChar(uint32_t dwChar, uint32_t dwFlags) {
   if (!m_pDataAcc->GetDoc()->GetXFADoc()->IsInteractive()) {
     return FALSE;
   }
@@ -600,11 +600,11 @@ FX_BOOL CXFA_FFField::OnChar(FX_DWORD dwChar, FX_DWORD dwFlags) {
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_DWORD CXFA_FFField::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
+uint32_t CXFA_FFField::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
   if (m_pNormalWidget) {
     FX_FLOAT ffx = fx, ffy = fy;
     FWLToClient(ffx, ffy);
-    FX_DWORD dwWidgetHit = m_pNormalWidget->HitTest(ffx, ffy);
+    uint32_t dwWidgetHit = m_pNormalWidget->HitTest(ffx, ffy);
     if (dwWidgetHit != FWL_WGTHITTEST_Unknown) {
       return FWL_WGTHITTEST_Client;
     }
@@ -794,7 +794,7 @@ int32_t CXFA_FFField::OnProcessMessage(CFWL_Message* pMessage) {
   return FWL_ERR_Succeeded;
 }
 FWL_ERR CXFA_FFField::OnProcessEvent(CFWL_Event* pEvent) {
-  FX_DWORD dwEventID = pEvent->GetClassID();
+  uint32_t dwEventID = pEvent->GetClassID();
   switch (dwEventID) {
     case FWL_EVTHASH_Mouse: {
       CFWL_EvtMouse* event = (CFWL_EvtMouse*)pEvent;
diff --git a/xfa/fxfa/app/xfa_ffimage.cpp b/xfa/fxfa/app/xfa_ffimage.cpp
index c17273d5cf..306c4677d2 100644
--- a/xfa/fxfa/app/xfa_ffimage.cpp
+++ b/xfa/fxfa/app/xfa_ffimage.cpp
@@ -32,7 +32,7 @@ void CXFA_FFImage::UnloadWidget() {
 }
 void CXFA_FFImage::RenderWidget(CFX_Graphics* pGS,
                                 CFX_Matrix* pMatrix,
-                                FX_DWORD dwStatus,
+                                uint32_t dwStatus,
                                 int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp
index c2d75522c7..a90e25c919 100644
--- a/xfa/fxfa/app/xfa_ffimageedit.cpp
+++ b/xfa/fxfa/app/xfa_ffimageedit.cpp
@@ -46,7 +46,7 @@ void CXFA_FFImageEdit::UnloadWidget() {
 }
 void CXFA_FFImageEdit::RenderWidget(CFX_Graphics* pGS,
                                     CFX_Matrix* pMatrix,
-                                    FX_DWORD dwStatus,
+                                    uint32_t dwStatus,
                                     int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -82,7 +82,7 @@ void CXFA_FFImageEdit::RenderWidget(CFX_Graphics* pGS,
                   iImageYDpi, iHorzAlign, iVertAlign);
   }
 }
-FX_BOOL CXFA_FFImageEdit::OnLButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFImageEdit::OnLButtonDown(uint32_t dwFlags,
                                         FX_FLOAT fx,
                                         FX_FLOAT fy) {
   if (m_pDataAcc->GetAccess() != XFA_ATTRIBUTEENUM_Open) {
diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp
index 60fc1603aa..25e0d7d7a9 100644
--- a/xfa/fxfa/app/xfa_ffnotify.cpp
+++ b/xfa/fxfa/app/xfa_ffnotify.cpp
@@ -71,7 +71,7 @@ void CXFA_FFNotify::OnNodeEvent(CXFA_Node* pSender,
   }
 }
 void CXFA_FFNotify::OnWidgetDataEvent(CXFA_WidgetData* pSender,
-                                      FX_DWORD dwEvent,
+                                      uint32_t dwEvent,
                                       void* pParam,
                                       void* pAdditional,
                                       void* pAdditional2) {
@@ -432,7 +432,7 @@ void CXFA_FFNotify::OnValueChanging(CXFA_Node* pSender,
   if (pDocView->GetLayoutStatus() < XFA_DOCVIEW_LAYOUTSTATUS_End) {
     return;
   }
-  FX_DWORD dwPacket = pSender->GetPacketID();
+  uint32_t dwPacket = pSender->GetPacketID();
   if (dwPacket & XFA_XDPPACKET_Datasets) {
   } else if (pSender->IsFormContainer()) {
     XFA_ATTRIBUTE eAttr = (XFA_ATTRIBUTE)(uintptr_t)pParam;
@@ -460,7 +460,7 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender,
   if (!pDocView) {
     return;
   }
-  FX_DWORD dwPacket = pSender->GetPacketID();
+  uint32_t dwPacket = pSender->GetPacketID();
   XFA_ATTRIBUTE eAttr = (XFA_ATTRIBUTE)(uintptr_t)pParam;
   if (dwPacket & XFA_XDPPACKET_Form) {
     CXFA_Node* pParentNode = static_cast<CXFA_Node*>(pParam3);
@@ -575,8 +575,8 @@ void CXFA_FFNotify::OnLayoutItemAdd(CXFA_FFDocView* pDocView,
   CXFA_FFWidget* pWidget = static_cast<CXFA_FFWidget*>(pSender);
   int32_t iPageIdx = (int32_t)(uintptr_t)pParam;
   IXFA_PageView* pNewPageView = pDocView->GetPageView(iPageIdx);
-  FX_DWORD dwStatus = (FX_DWORD)(uintptr_t)pParam2;
-  FX_DWORD dwFilter = XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable |
+  uint32_t dwStatus = (uint32_t)(uintptr_t)pParam2;
+  uint32_t dwFilter = XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable |
                       XFA_WIDGETSTATUS_Printable;
   pWidget->ModifyStatus(dwStatus, dwFilter);
   IXFA_PageView* pPrePageView = pWidget->GetPageView();
@@ -628,7 +628,7 @@ void CXFA_FFNotify::OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView,
   if (!pWidget) {
     return;
   }
-  FX_DWORD dwStatus = (FX_DWORD)(uintptr_t)pParam;
+  uint32_t dwStatus = (uint32_t)(uintptr_t)pParam;
   if (dwStatus == 0) {
     CXFA_LayoutItem* pPreItem = pSender->GetPrev();
     if (pPreItem) {
@@ -638,8 +638,8 @@ void CXFA_FFNotify::OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView,
       }
     }
   }
-  FX_DWORD dwOldStatus = pWidget->GetStatus();
-  FX_DWORD dwFilter = XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable |
+  uint32_t dwOldStatus = pWidget->GetStatus();
+  uint32_t dwFilter = XFA_WIDGETSTATUS_Visible | XFA_WIDGETSTATUS_Viewable |
                       XFA_WIDGETSTATUS_Printable;
   if ((dwOldStatus & dwFilter) == dwStatus) {
     return;
diff --git a/xfa/fxfa/app/xfa_ffpageview.cpp b/xfa/fxfa/app/xfa_ffpageview.cpp
index 1bc168187c..e4841f17b2 100644
--- a/xfa/fxfa/app/xfa_ffpageview.cpp
+++ b/xfa/fxfa/app/xfa_ffpageview.cpp
@@ -76,7 +76,7 @@ IXFA_Widget* CXFA_FFPageView::GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) {
     FX_FLOAT fWidgetx = fx;
     FX_FLOAT fWidgety = fy;
     pWidget->Rotate2Normal(fWidgetx, fWidgety);
-    FX_DWORD dwFlag = pWidget->OnHitTest(fWidgetx, fWidgety);
+    uint32_t dwFlag = pWidget->OnHitTest(fWidgetx, fWidgety);
     if ((FWL_WGTHITTEST_Client == dwFlag ||
          FWL_WGTHITTEST_HyperLink == dwFlag)) {
       break;
@@ -86,8 +86,8 @@ IXFA_Widget* CXFA_FFPageView::GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) {
   return pWidget;
 }
 IXFA_WidgetIterator* CXFA_FFPageView::CreateWidgetIterator(
-    FX_DWORD dwTraverseWay,
-    FX_DWORD dwWidgetFilter) {
+    uint32_t dwTraverseWay,
+    uint32_t dwWidgetFilter) {
   switch (dwTraverseWay) {
     case XFA_TRAVERSEWAY_Tranvalse:
       return new CXFA_FFTabOrderPageWidgetIterator(this, dwWidgetFilter);
@@ -97,16 +97,16 @@ IXFA_WidgetIterator* CXFA_FFPageView::CreateWidgetIterator(
   return NULL;
 }
 static FX_BOOL XFA_PageWidgetFilter(CXFA_FFWidget* pWidget,
-                                    FX_DWORD dwFilter,
+                                    uint32_t dwFilter,
                                     FX_BOOL bTraversal,
                                     FX_BOOL bIgnorerelevant) {
   CXFA_WidgetAcc* pWidgetAcc = pWidget->GetDataAcc();
-  FX_DWORD dwType = dwFilter & XFA_WIDGETFILTER_AllType;
+  uint32_t dwType = dwFilter & XFA_WIDGETFILTER_AllType;
   if ((dwType == XFA_WIDGETFILTER_Field) &&
       (pWidgetAcc->GetClassID() != XFA_ELEMENT_Field)) {
     return FALSE;
   }
-  FX_DWORD dwStatus = pWidget->GetStatus();
+  uint32_t dwStatus = pWidget->GetStatus();
   if (bTraversal && (dwStatus & XFA_WIDGETSTATUS_Disabled)) {
     return FALSE;
   }
@@ -118,7 +118,7 @@ static FX_BOOL XFA_PageWidgetFilter(CXFA_FFWidget* pWidget,
   return (dwFilter & dwStatus) == dwFilter;
 }
 CXFA_FFPageWidgetIterator::CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView,
-                                                     FX_DWORD dwFilter) {
+                                                     uint32_t dwFilter) {
   m_pPageView = pPageView;
   m_dwFilter = dwFilter;
   m_sIterator.Init(pPageView);
@@ -186,7 +186,7 @@ IXFA_Widget* CXFA_FFPageWidgetIterator::GetWidget(
 }
 CXFA_FFTabOrderPageWidgetIterator::CXFA_FFTabOrderPageWidgetIterator(
     CXFA_FFPageView* pPageView,
-    FX_DWORD dwFilter)
+    uint32_t dwFilter)
     : m_pPageView(pPageView), m_dwFilter(dwFilter), m_iCurWidget(-1) {
   m_bIgnorerelevant = ((CXFA_FFDoc*)m_pPageView->GetDocView()->GetDoc())
                           ->GetXFADoc()
diff --git a/xfa/fxfa/app/xfa_ffpath.cpp b/xfa/fxfa/app/xfa_ffpath.cpp
index e0f6825a03..d8ece72bb0 100644
--- a/xfa/fxfa/app/xfa_ffpath.cpp
+++ b/xfa/fxfa/app/xfa_ffpath.cpp
@@ -51,7 +51,7 @@ void CXFA_FFLine::GetRectFromHand(CFX_RectF& rect,
 }
 void CXFA_FFLine::RenderWidget(CFX_Graphics* pGS,
                                CFX_Matrix* pMatrix,
-                               FX_DWORD dwStatus,
+                               uint32_t dwStatus,
                                int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -108,7 +108,7 @@ CXFA_FFArc::CXFA_FFArc(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
 CXFA_FFArc::~CXFA_FFArc() {}
 void CXFA_FFArc::RenderWidget(CFX_Graphics* pGS,
                               CFX_Matrix* pMatrix,
-                              FX_DWORD dwStatus,
+                              uint32_t dwStatus,
                               int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -136,7 +136,7 @@ CXFA_FFRectangle::CXFA_FFRectangle(CXFA_FFPageView* pPageView,
 CXFA_FFRectangle::~CXFA_FFRectangle() {}
 void CXFA_FFRectangle::RenderWidget(CFX_Graphics* pGS,
                                     CFX_Matrix* pMatrix,
-                                    FX_DWORD dwStatus,
+                                    uint32_t dwStatus,
                                     int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp
index 37472a840f..0d70143ac3 100644
--- a/xfa/fxfa/app/xfa_ffpushbutton.cpp
+++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp
@@ -31,7 +31,7 @@ CXFA_FFPushButton::~CXFA_FFPushButton() {
 }
 void CXFA_FFPushButton::RenderWidget(CFX_Graphics* pGS,
                                      CFX_Matrix* pMatrix,
-                                     FX_DWORD dwStatus,
+                                     uint32_t dwStatus,
                                      int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -70,7 +70,7 @@ FX_BOOL CXFA_FFPushButton::LoadWidget() {
   return CXFA_FFField::LoadWidget();
 }
 void CXFA_FFPushButton::UpdateWidgetProperty() {
-  FX_DWORD dwStyleEx = 0;
+  uint32_t dwStyleEx = 0;
   switch (m_pDataAcc->GetButtonHighlight()) {
     case XFA_ATTRIBUTEENUM_Inverted:
       dwStyleEx = XFA_FWL_PSBSTYLEEXT_HiliteInverted;
@@ -190,7 +190,7 @@ void CXFA_FFPushButton::RenderHighlightCaption(CFX_Graphics* pGS,
       mt.Concat(*pMatrix);
     }
     {
-      FX_DWORD dwState = m_pNormalWidget->GetStates();
+      uint32_t dwState = m_pNormalWidget->GetStates();
       if (m_pDownTextLayout && (dwState & FWL_STATE_PSB_Pressed) &&
           (dwState & FWL_STATE_PSB_Hovered)) {
         if (m_pDownTextLayout->DrawString(pRenderDevice, mt, rtClip)) {
diff --git a/xfa/fxfa/app/xfa_ffsignature.cpp b/xfa/fxfa/app/xfa_ffsignature.cpp
index 96907c50a0..ca933f8cdc 100644
--- a/xfa/fxfa/app/xfa_ffsignature.cpp
+++ b/xfa/fxfa/app/xfa_ffsignature.cpp
@@ -20,7 +20,7 @@ FX_BOOL CXFA_FFSignature::LoadWidget() {
 }
 void CXFA_FFSignature::RenderWidget(CFX_Graphics* pGS,
                                     CFX_Matrix* pMatrix,
-                                    FX_DWORD dwStatus,
+                                    uint32_t dwStatus,
                                     int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -46,61 +46,61 @@ FX_BOOL CXFA_FFSignature::OnMouseEnter() {
 FX_BOOL CXFA_FFSignature::OnMouseExit() {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnLButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFSignature::OnLButtonDown(uint32_t dwFlags,
                                         FX_FLOAT fx,
                                         FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnLButtonUp(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFSignature::OnLButtonUp(uint32_t dwFlags,
                                       FX_FLOAT fx,
                                       FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnLButtonDblClk(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFSignature::OnLButtonDblClk(uint32_t dwFlags,
                                           FX_FLOAT fx,
                                           FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnMouseMove(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFSignature::OnMouseMove(uint32_t dwFlags,
                                       FX_FLOAT fx,
                                       FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnMouseWheel(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFSignature::OnMouseWheel(uint32_t dwFlags,
                                        int16_t zDelta,
                                        FX_FLOAT fx,
                                        FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnRButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFSignature::OnRButtonDown(uint32_t dwFlags,
                                         FX_FLOAT fx,
                                         FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnRButtonUp(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFSignature::OnRButtonUp(uint32_t dwFlags,
                                       FX_FLOAT fx,
                                       FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnRButtonDblClk(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFSignature::OnRButtonDblClk(uint32_t dwFlags,
                                           FX_FLOAT fx,
                                           FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
+FX_BOOL CXFA_FFSignature::OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
+FX_BOOL CXFA_FFSignature::OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags) {
   return FALSE;
 }
-FX_BOOL CXFA_FFSignature::OnChar(FX_DWORD dwChar, FX_DWORD dwFlags) {
+FX_BOOL CXFA_FFSignature::OnChar(uint32_t dwChar, uint32_t dwFlags) {
   return FALSE;
 }
-FX_DWORD CXFA_FFSignature::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
+uint32_t CXFA_FFSignature::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
   if (m_pNormalWidget) {
     FX_FLOAT ffx = fx, ffy = fy;
     FWLToClient(ffx, ffy);
-    FX_DWORD dwWidgetHit = m_pNormalWidget->HitTest(ffx, ffy);
+    uint32_t dwWidgetHit = m_pNormalWidget->HitTest(ffx, ffy);
     if (dwWidgetHit != FWL_WGTHITTEST_Unknown) {
       return FWL_WGTHITTEST_Client;
     }
diff --git a/xfa/fxfa/app/xfa_fftext.cpp b/xfa/fxfa/app/xfa_fftext.cpp
index b35f7b4296..333f9f7f14 100644
--- a/xfa/fxfa/app/xfa_fftext.cpp
+++ b/xfa/fxfa/app/xfa_fftext.cpp
@@ -20,7 +20,7 @@ CXFA_FFText::CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
 CXFA_FFText::~CXFA_FFText() {}
 void CXFA_FFText::RenderWidget(CFX_Graphics* pGS,
                                CFX_Matrix* pMatrix,
-                               FX_DWORD dwStatus,
+                               uint32_t dwStatus,
                                int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -101,7 +101,7 @@ FX_BOOL CXFA_FFText::PerformLayout() {
   pTextLayout->m_bHasBlock = FALSE;
   return TRUE;
 }
-FX_BOOL CXFA_FFText::OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+FX_BOOL CXFA_FFText::OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   CFX_RectF rtBox;
   GetRectWithoutRotate(rtBox);
   if (!rtBox.Contains(fx, fy)) {
@@ -114,7 +114,7 @@ FX_BOOL CXFA_FFText::OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   SetButtonDown(TRUE);
   return TRUE;
 }
-FX_BOOL CXFA_FFText::OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+FX_BOOL CXFA_FFText::OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   CFX_RectF rtBox;
   GetRectWithoutRotate(rtBox);
   if (!rtBox.Contains(fx, fy)) {
@@ -126,7 +126,7 @@ FX_BOOL CXFA_FFText::OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   }
   return TRUE;
 }
-FX_BOOL CXFA_FFText::OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+FX_BOOL CXFA_FFText::OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   if (!IsButtonDown()) {
     return FALSE;
   }
@@ -139,7 +139,7 @@ FX_BOOL CXFA_FFText::OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   pDoc->GetDocProvider()->GotoURL(pDoc, CFX_WideStringC(wsURLContent), FALSE);
   return TRUE;
 }
-FX_DWORD CXFA_FFText::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
+uint32_t CXFA_FFText::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
   CFX_RectF rtBox;
   GetRectWithoutRotate(rtBox);
   if (!rtBox.Contains(fx, fy)) {
diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp
index 837054aec8..01f23ab61f 100644
--- a/xfa/fxfa/app/xfa_fftextedit.cpp
+++ b/xfa/fxfa/app/xfa_fftextedit.cpp
@@ -56,8 +56,8 @@ void CXFA_FFTextEdit::UpdateWidgetProperty() {
   if (!pWidget) {
     return;
   }
-  FX_DWORD dwStyle = 0;
-  FX_DWORD dwExtendedStyle = FWL_STYLEEXT_EDT_ShowScrollbarFocus |
+  uint32_t dwStyle = 0;
+  uint32_t dwExtendedStyle = FWL_STYLEEXT_EDT_ShowScrollbarFocus |
                              FWL_STYLEEXT_EDT_OuterScrollbar |
                              FWL_STYLEEXT_EDT_LastLineHeight;
   dwExtendedStyle |= UpdateUIProperty();
@@ -94,7 +94,7 @@ void CXFA_FFTextEdit::UpdateWidgetProperty() {
   m_pNormalWidget->ModifyStyles(dwStyle, 0xFFFFFFFF);
   m_pNormalWidget->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
 }
-FX_BOOL CXFA_FFTextEdit::OnLButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFTextEdit::OnLButtonDown(uint32_t dwFlags,
                                        FX_FLOAT fx,
                                        FX_FLOAT fy) {
   if (!PtInActiveRect(fx, fy)) {
@@ -116,7 +116,7 @@ FX_BOOL CXFA_FFTextEdit::OnLButtonDown(FX_DWORD dwFlags,
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFTextEdit::OnRButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFTextEdit::OnRButtonDown(uint32_t dwFlags,
                                        FX_FLOAT fx,
                                        FX_FLOAT fy) {
   if (m_pDataAcc->GetAccess() != XFA_ATTRIBUTEENUM_Open) {
@@ -140,7 +140,7 @@ FX_BOOL CXFA_FFTextEdit::OnRButtonDown(FX_DWORD dwFlags,
   TranslateFWLMessage(&ms);
   return TRUE;
 }
-FX_BOOL CXFA_FFTextEdit::OnRButtonUp(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFTextEdit::OnRButtonUp(uint32_t dwFlags,
                                      FX_FLOAT fx,
                                      FX_FLOAT fy) {
   if (!CXFA_FFField::OnRButtonUp(dwFlags, fx, fy))
@@ -208,8 +208,8 @@ void CXFA_FFTextEdit::ValidateNumberField(const CFX_WideString& wsText) {
 FX_BOOL CXFA_FFTextEdit::IsDataChanged() {
   return (m_dwStatus & XFA_WIDGETSTATUS_TextEditValueChanged) != 0;
 }
-FX_DWORD CXFA_FFTextEdit::GetAlignment() {
-  FX_DWORD dwExtendedStyle = 0;
+uint32_t CXFA_FFTextEdit::GetAlignment() {
+  uint32_t dwExtendedStyle = 0;
   if (CXFA_Para para = m_pDataAcc->GetPara()) {
     int32_t iHorz = para.GetHorizontalAlign();
     switch (iHorz) {
@@ -405,7 +405,7 @@ int32_t CXFA_FFTextEdit::OnProcessMessage(CFWL_Message* pMessage) {
 }
 FWL_ERR CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
   CXFA_FFField::OnProcessEvent(pEvent);
-  FX_DWORD dwEventID = pEvent->GetClassID();
+  uint32_t dwEventID = pEvent->GetClassID();
   switch (dwEventID) {
     case FWL_EVTHASH_EDT_TextChanged: {
       CFWL_EvtEdtTextChanged* event = (CFWL_EvtEdtTextChanged*)pEvent;
@@ -463,7 +463,7 @@ void CXFA_FFNumericEdit::UpdateWidgetProperty() {
   if (!pWidget) {
     return;
   }
-  FX_DWORD dwExtendedStyle =
+  uint32_t dwExtendedStyle =
       FWL_STYLEEXT_EDT_ShowScrollbarFocus | FWL_STYLEEXT_EDT_OuterScrollbar |
       FWL_STYLEEXT_EDT_Validate | FWL_STYLEEXT_EDT_Number |
       FWL_STYLEEXT_EDT_LastLineHeight;
@@ -484,7 +484,7 @@ void CXFA_FFNumericEdit::UpdateWidgetProperty() {
   m_pNormalWidget->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
 }
 FWL_ERR CXFA_FFNumericEdit::OnProcessEvent(CFWL_Event* pEvent) {
-  FX_DWORD dwEventID = pEvent->GetClassID();
+  uint32_t dwEventID = pEvent->GetClassID();
   if (dwEventID == FWL_EVTHASH_EDT_Validate) {
     CFWL_EvtEdtValidate* event = (CFWL_EvtEdtValidate*)pEvent;
     CFX_WideString wsChange = event->wsInsert;
@@ -537,7 +537,7 @@ void CXFA_FFPasswordEdit::UpdateWidgetProperty() {
   if (!pWidget) {
     return;
   }
-  FX_DWORD dwExtendedStyle =
+  uint32_t dwExtendedStyle =
       FWL_STYLEEXT_EDT_ShowScrollbarFocus | FWL_STYLEEXT_EDT_OuterScrollbar |
       FWL_STYLEEXT_EDT_Password | FWL_STYLEEXT_EDT_LastLineHeight;
   dwExtendedStyle |= UpdateUIProperty();
@@ -563,7 +563,7 @@ CXFA_FFDateTimeEdit::CXFA_FFDateTimeEdit(CXFA_FFPageView* pPageView,
 CXFA_FFDateTimeEdit::~CXFA_FFDateTimeEdit() {}
 
 FX_BOOL CXFA_FFDateTimeEdit::GetBBox(CFX_RectF& rtBox,
-                                     FX_DWORD dwStatus,
+                                     uint32_t dwStatus,
                                      FX_BOOL bDrawFocus) {
   if (bDrawFocus)
     return FALSE;
@@ -618,11 +618,11 @@ void CXFA_FFDateTimeEdit::UpdateWidgetProperty() {
   if (!pWidget) {
     return;
   }
-  FX_DWORD dwExtendedStyle = FWL_STYLEEXT_DTP_ShortDateFormat;
+  uint32_t dwExtendedStyle = FWL_STYLEEXT_DTP_ShortDateFormat;
   dwExtendedStyle |= UpdateUIProperty();
   dwExtendedStyle |= GetAlignment();
   m_pNormalWidget->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
-  FX_DWORD dwEditStyles = FWL_STYLEEXT_EDT_LastLineHeight;
+  uint32_t dwEditStyles = FWL_STYLEEXT_EDT_LastLineHeight;
   int32_t iNumCells = m_pDataAcc->GetNumberOfCells();
   if (iNumCells > 0) {
     dwEditStyles |= FWL_STYLEEXT_EDT_CombText;
@@ -637,8 +637,8 @@ void CXFA_FFDateTimeEdit::UpdateWidgetProperty() {
   }
   pWidget->ModifyEditStylesEx(dwEditStyles, 0xFFFFFFFF);
 }
-FX_DWORD CXFA_FFDateTimeEdit::GetAlignment() {
-  FX_DWORD dwExtendedStyle = 0;
+uint32_t CXFA_FFDateTimeEdit::GetAlignment() {
+  uint32_t dwExtendedStyle = 0;
   if (CXFA_Para para = m_pDataAcc->GetPara()) {
     int32_t iHorz = para.GetHorizontalAlign();
     switch (iHorz) {
@@ -786,7 +786,7 @@ void CXFA_FFDateTimeEdit::OnSelectChanged(IFWL_Widget* pWidget,
   m_pDataAcc->ProcessEvent(XFA_ATTRIBUTEENUM_Change, &eParam);
 }
 FWL_ERR CXFA_FFDateTimeEdit::OnProcessEvent(CFWL_Event* pEvent) {
-  FX_DWORD dwEventID = pEvent->GetClassID();
+  uint32_t dwEventID = pEvent->GetClassID();
   if (dwEventID == FWL_EVTHASH_DTP_SelectChanged) {
     CFWL_Event_DtpSelectChanged* event = (CFWL_Event_DtpSelectChanged*)pEvent;
     OnSelectChanged(m_pNormalWidget->GetWidget(), event->iYear, event->iMonth,
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp
index 37d363f443..027d07a9f5 100644
--- a/xfa/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -69,16 +69,16 @@ void CXFA_FFWidget::GetRectWithoutRotate(CFX_RectF& rtWidget) {
       break;
   }
 }
-FX_DWORD CXFA_FFWidget::GetStatus() {
+uint32_t CXFA_FFWidget::GetStatus() {
   return m_dwStatus;
 }
 
-void CXFA_FFWidget::ModifyStatus(FX_DWORD dwAdded, FX_DWORD dwRemoved) {
+void CXFA_FFWidget::ModifyStatus(uint32_t dwAdded, uint32_t dwRemoved) {
   m_dwStatus = (m_dwStatus & ~dwRemoved) | dwAdded;
 }
 
 FX_BOOL CXFA_FFWidget::GetBBox(CFX_RectF& rtBox,
-                               FX_DWORD dwStatus,
+                               uint32_t dwStatus,
                                FX_BOOL bDrawFocus) {
   if (bDrawFocus)
     return FALSE;
@@ -100,7 +100,7 @@ FX_BOOL CXFA_FFWidget::GetToolTip(CFX_WideString& wsToolTip) {
 }
 void CXFA_FFWidget::RenderWidget(CFX_Graphics* pGS,
                                  CFX_Matrix* pMatrix,
-                                 FX_DWORD dwStatus,
+                                 uint32_t dwStatus,
                                  int32_t iRotate) {
   if (!IsMatchVisibleStatus(dwStatus)) {
     return;
@@ -137,7 +137,7 @@ void CXFA_FFWidget::DrawBorder(CFX_Graphics* pGS,
                                CXFA_Box box,
                                const CFX_RectF& rtBorder,
                                CFX_Matrix* pMatrix,
-                               FX_DWORD dwFlags) {
+                               uint32_t dwFlags) {
   XFA_DrawBox(box, pGS, rtBorder, pMatrix, dwFlags);
 }
 void CXFA_FFWidget::InvalidateWidget(const CFX_RectF* pRect) {
@@ -179,37 +179,37 @@ FX_BOOL CXFA_FFWidget::OnMouseEnter() {
 FX_BOOL CXFA_FFWidget::OnMouseExit() {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnLButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFWidget::OnLButtonDown(uint32_t dwFlags,
                                      FX_FLOAT fx,
                                      FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+FX_BOOL CXFA_FFWidget::OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnLButtonDblClk(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFWidget::OnLButtonDblClk(uint32_t dwFlags,
                                        FX_FLOAT fx,
                                        FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+FX_BOOL CXFA_FFWidget::OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnMouseWheel(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFWidget::OnMouseWheel(uint32_t dwFlags,
                                     int16_t zDelta,
                                     FX_FLOAT fx,
                                     FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnRButtonDown(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFWidget::OnRButtonDown(uint32_t dwFlags,
                                      FX_FLOAT fx,
                                      FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
+FX_BOOL CXFA_FFWidget::OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnRButtonDblClk(FX_DWORD dwFlags,
+FX_BOOL CXFA_FFWidget::OnRButtonDblClk(uint32_t dwFlags,
                                        FX_FLOAT fx,
                                        FX_FLOAT fy) {
   return FALSE;
@@ -238,16 +238,16 @@ FX_BOOL CXFA_FFWidget::OnKillFocus(CXFA_FFWidget* pNewWidget) {
   }
   return TRUE;
 }
-FX_BOOL CXFA_FFWidget::OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
+FX_BOOL CXFA_FFWidget::OnKeyDown(uint32_t dwKeyCode, uint32_t dwFlags) {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags) {
+FX_BOOL CXFA_FFWidget::OnKeyUp(uint32_t dwKeyCode, uint32_t dwFlags) {
   return FALSE;
 }
-FX_BOOL CXFA_FFWidget::OnChar(FX_DWORD dwChar, FX_DWORD dwFlags) {
+FX_BOOL CXFA_FFWidget::OnChar(uint32_t dwChar, uint32_t dwFlags) {
   return FALSE;
 }
-FX_DWORD CXFA_FFWidget::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
+uint32_t CXFA_FFWidget::OnHitTest(FX_FLOAT fx, FX_FLOAT fy) {
   return FALSE;
 }
 FX_BOOL CXFA_FFWidget::OnSetCursor(FX_FLOAT fx, FX_FLOAT fy) {
@@ -398,7 +398,7 @@ void CXFA_FFWidget::GetMinMaxHeight(FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight) {
     m_pDataAcc->GetMaxHeight(fMaxHeight);
   }
 }
-FX_BOOL CXFA_FFWidget::IsMatchVisibleStatus(FX_DWORD dwStatus) {
+FX_BOOL CXFA_FFWidget::IsMatchVisibleStatus(uint32_t dwStatus) {
   return m_dwStatus & XFA_WIDGETSTATUS_Visible;
 }
 void CXFA_FFWidget::EventKillFocus() {
@@ -483,7 +483,7 @@ class CXFA_ImageRenderer {
                 FX_ARGB bitmap_argb,
                 int bitmap_alpha,
                 const CFX_Matrix* pImage2Device,
-                FX_DWORD flags,
+                uint32_t flags,
                 int blendType = FXDIB_BLEND_NORMAL);
   FX_BOOL Continue(IFX_Pause* pPause);
 
@@ -495,7 +495,7 @@ class CXFA_ImageRenderer {
   CFX_DIBitmap* m_pCloneConvert;
   int m_BitmapAlpha;
   FX_ARGB m_FillArgb;
-  FX_DWORD m_Flags;
+  uint32_t m_Flags;
   CFX_ImageTransformer* m_pTransformer;
   void* m_DeviceHandle;
   int32_t m_BlendType;
@@ -540,7 +540,7 @@ FX_BOOL CXFA_ImageRenderer::Start(CFX_RenderDevice* pDevice,
                                   FX_ARGB bitmap_argb,
                                   int bitmap_alpha,
                                   const CFX_Matrix* pImage2Device,
-                                  FX_DWORD flags,
+                                  uint32_t flags,
                                   int blendType) {
   m_pDevice = pDevice;
   m_pDIBSource = pDIBSource;
@@ -683,7 +683,7 @@ void CXFA_ImageRenderer::CompositeDIBitmap(CFX_DIBitmap* pDIBitmap,
         return;
       }
     } else {
-      FX_DWORD fill_argb = (mask_argb);
+      uint32_t fill_argb = (mask_argb);
       if (bitmap_alpha < 255) {
         ((uint8_t*)&fill_argb)[3] =
             ((uint8_t*)&fill_argb)[3] * bitmap_alpha / 255;
@@ -870,7 +870,7 @@ static int32_t XFA_Base64Decode(const FX_CHAR* pStr, uint8_t* pOutBuffer) {
   }
   int32_t iLen = FXSYS_strlen((FX_CHAR*)pBuffer);
   int32_t i = 0, j = 0;
-  FX_DWORD dwLimb = 0;
+  uint32_t dwLimb = 0;
   for (; i + 3 < iLen; i += 4) {
     if (pBuffer[i] == '=' || pBuffer[i + 1] == '=' || pBuffer[i + 2] == '=' ||
         pBuffer[i + 3] == '=') {
@@ -878,23 +878,23 @@ static int32_t XFA_Base64Decode(const FX_CHAR* pStr, uint8_t* pOutBuffer) {
         break;
       }
       if (pBuffer[i + 2] == '=') {
-        dwLimb = ((FX_DWORD)g_inv_base64[pBuffer[i]] << 6) |
-                 ((FX_DWORD)g_inv_base64[pBuffer[i + 1]]);
+        dwLimb = ((uint32_t)g_inv_base64[pBuffer[i]] << 6) |
+                 ((uint32_t)g_inv_base64[pBuffer[i + 1]]);
         pOutBuffer[j] = (uint8_t)(dwLimb >> 4) & 0xFF;
         j++;
       } else {
-        dwLimb = ((FX_DWORD)g_inv_base64[pBuffer[i]] << 12) |
-                 ((FX_DWORD)g_inv_base64[pBuffer[i + 1]] << 6) |
-                 ((FX_DWORD)g_inv_base64[pBuffer[i + 2]]);
+        dwLimb = ((uint32_t)g_inv_base64[pBuffer[i]] << 12) |
+                 ((uint32_t)g_inv_base64[pBuffer[i + 1]] << 6) |
+                 ((uint32_t)g_inv_base64[pBuffer[i + 2]]);
         pOutBuffer[j] = (uint8_t)(dwLimb >> 10) & 0xFF;
         pOutBuffer[j + 1] = (uint8_t)(dwLimb >> 2) & 0xFF;
         j += 2;
       }
     } else {
-      dwLimb = ((FX_DWORD)g_inv_base64[pBuffer[i]] << 18) |
-               ((FX_DWORD)g_inv_base64[pBuffer[i + 1]] << 12) |
-               ((FX_DWORD)g_inv_base64[pBuffer[i + 2]] << 6) |
-               ((FX_DWORD)g_inv_base64[pBuffer[i + 3]]);
+      dwLimb = ((uint32_t)g_inv_base64[pBuffer[i]] << 18) |
+               ((uint32_t)g_inv_base64[pBuffer[i + 1]] << 12) |
+               ((uint32_t)g_inv_base64[pBuffer[i + 2]] << 6) |
+               ((uint32_t)g_inv_base64[pBuffer[i + 3]]);
       pOutBuffer[j] = (uint8_t)(dwLimb >> 16) & 0xff;
       pOutBuffer[j + 1] = (uint8_t)(dwLimb >> 8) & 0xff;
       pOutBuffer[j + 2] = (uint8_t)(dwLimb)&0xff;
@@ -911,11 +911,11 @@ static const FX_CHAR g_base64_chars[] =
 FX_CHAR* XFA_Base64Encode(const uint8_t* buf, int32_t buf_len) {
   FX_CHAR* out = NULL;
   int i, j;
-  FX_DWORD limb;
+  uint32_t limb;
   out = FX_Alloc(FX_CHAR, ((buf_len * 8 + 5) / 6) + 5);
   for (i = 0, j = 0, limb = 0; i + 2 < buf_len; i += 3, j += 4) {
-    limb = ((FX_DWORD)buf[i] << 16) | ((FX_DWORD)buf[i + 1] << 8) |
-           ((FX_DWORD)buf[i + 2]);
+    limb = ((uint32_t)buf[i] << 16) | ((uint32_t)buf[i + 1] << 8) |
+           ((uint32_t)buf[i + 2]);
     out[j] = g_base64_chars[(limb >> 18) & 63];
     out[j + 1] = g_base64_chars[(limb >> 12) & 63];
     out[j + 2] = g_base64_chars[(limb >> 6) & 63];
@@ -925,14 +925,14 @@ FX_CHAR* XFA_Base64Encode(const uint8_t* buf, int32_t buf_len) {
     case 0:
       break;
     case 1:
-      limb = ((FX_DWORD)buf[i]);
+      limb = ((uint32_t)buf[i]);
       out[j++] = g_base64_chars[(limb >> 2) & 63];
       out[j++] = g_base64_chars[(limb << 4) & 63];
       out[j++] = '=';
       out[j++] = '=';
       break;
     case 2:
-      limb = ((FX_DWORD)buf[i] << 8) | ((FX_DWORD)buf[i + 1]);
+      limb = ((uint32_t)buf[i] << 8) | ((uint32_t)buf[i + 1]);
       out[j++] = g_base64_chars[(limb >> 10) & 63];
       out[j++] = g_base64_chars[(limb >> 4) & 63];
       out[j++] = g_base64_chars[(limb << 2) & 63];
@@ -1120,7 +1120,7 @@ FX_BOOL XFA_IsCreateWidget(XFA_ELEMENT iType) {
 static void XFA_BOX_GetPath_Arc(CXFA_Box box,
                                 CFX_RectF rtDraw,
                                 CFX_Path& fillPath,
-                                FX_DWORD dwFlags) {
+                                uint32_t dwFlags) {
   FX_FLOAT a, b;
   a = rtDraw.width / 2.0f;
   b = rtDraw.height / 2.0f;
@@ -1552,7 +1552,7 @@ static void XFA_BOX_Fill(CXFA_Box box,
                          CFX_Graphics* pGS,
                          const CFX_RectF& rtWidget,
                          CFX_Matrix* pMatrix,
-                         FX_DWORD dwFlags) {
+                         uint32_t dwFlags) {
   CXFA_Fill fill = box.GetFill();
   if (!fill || fill.GetPresence() != XFA_ATTRIBUTEENUM_Visible) {
     return;
@@ -1623,7 +1623,7 @@ static void XFA_BOX_StrokeArc(CXFA_Box box,
                               CFX_Graphics* pGS,
                               CFX_RectF rtWidget,
                               CFX_Matrix* pMatrix,
-                              FX_DWORD dwFlags) {
+                              uint32_t dwFlags) {
   CXFA_Edge edge = box.GetEdge(0);
   if (!edge || !edge.IsVisible()) {
     return;
@@ -1883,7 +1883,7 @@ static void XFA_BOX_Stroke(CXFA_Box box,
                            CFX_Graphics* pGS,
                            CFX_RectF rtWidget,
                            CFX_Matrix* pMatrix,
-                           FX_DWORD dwFlags) {
+                           uint32_t dwFlags) {
   if (box.IsArc() || (dwFlags & XFA_DRAWBOX_ForceRound) != 0) {
     XFA_BOX_StrokeArc(box, pGS, rtWidget, pMatrix, dwFlags);
     return;
@@ -1947,7 +1947,7 @@ void XFA_DrawBox(CXFA_Box box,
                  CFX_Graphics* pGS,
                  const CFX_RectF& rtWidget,
                  CFX_Matrix* pMatrix,
-                 FX_DWORD dwFlags) {
+                 uint32_t dwFlags) {
   if (!box || box.GetPresence() != XFA_ATTRIBUTEENUM_Visible) {
     return;
   }
diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
index c62256262a..e4e574b969 100644
--- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp
+++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
@@ -741,7 +741,7 @@ void CXFA_WidgetAcc::UpdateUIDisplay(CXFA_FFWidget* pExcept) {
     pWidget->AddInvalidateRect();
   }
 }
-void CXFA_WidgetAcc::NotifyEvent(FX_DWORD dwEvent,
+void CXFA_WidgetAcc::NotifyEvent(uint32_t dwEvent,
                                  CXFA_FFWidget* pWidget,
                                  void* pParam,
                                  void* pAdditional) {
@@ -899,7 +899,7 @@ void CXFA_WidgetAcc::CalculateTextContentSize(CFX_SizeF& size) {
     pTextOut->SetFontSize(fFontSize);
     pTextOut->SetLineBreakTolerance(fFontSize * 0.2f);
     pTextOut->SetLineSpace(GetLineHeight());
-    FX_DWORD dwStyles = FDE_TTOSTYLE_LastLineHeight;
+    uint32_t dwStyles = FDE_TTOSTYLE_LastLineHeight;
     if (GetUIType() == XFA_ELEMENT_TextEdit && IsMultiLine()) {
       dwStyles |= FDE_TTOSTYLE_LineWrap;
     }
@@ -1535,7 +1535,7 @@ CXFA_WidgetLayoutData* CXFA_WidgetAcc::GetWidgetLayoutData() {
 }
 IFX_Font* CXFA_WidgetAcc::GetFDEFont() {
   CFX_WideStringC wsFontName = FX_WSTRC(L"Courier");
-  FX_DWORD dwFontStyle = 0;
+  uint32_t dwFontStyle = 0;
   if (CXFA_Font font = GetFont()) {
     if (font.IsBold()) {
       dwFontStyle |= FX_FONTSTYLE_Bold;
diff --git a/xfa/fxfa/app/xfa_ffwidgethandler.cpp b/xfa/fxfa/app/xfa_ffwidgethandler.cpp
index b775643189..80d2e5acc5 100644
--- a/xfa/fxfa/app/xfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/app/xfa_ffwidgethandler.cpp
@@ -25,12 +25,12 @@ IXFA_PageView* CXFA_FFWidgetHandler::GetPageView(IXFA_Widget* hWidget) {
 void CXFA_FFWidgetHandler::GetRect(IXFA_Widget* hWidget, CFX_RectF& rt) {
   static_cast<CXFA_FFWidget*>(hWidget)->GetWidgetRect(rt);
 }
-FX_DWORD CXFA_FFWidgetHandler::GetStatus(IXFA_Widget* hWidget) {
+uint32_t CXFA_FFWidgetHandler::GetStatus(IXFA_Widget* hWidget) {
   return static_cast<CXFA_FFWidget*>(hWidget)->GetStatus();
 }
 FX_BOOL CXFA_FFWidgetHandler::GetBBox(IXFA_Widget* hWidget,
                                       CFX_RectF& rtBox,
-                                      FX_DWORD dwStatus,
+                                      uint32_t dwStatus,
                                       FX_BOOL bDrawFocus) {
   return static_cast<CXFA_FFWidget*>(hWidget)
       ->GetBBox(rtBox, dwStatus, bDrawFocus);
@@ -74,7 +74,7 @@ FX_BOOL CXFA_FFWidgetHandler::OnMouseExit(IXFA_Widget* hWidget) {
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnLButtonDown(IXFA_Widget* hWidget,
-                                            FX_DWORD dwFlags,
+                                            uint32_t dwFlags,
                                             FX_FLOAT fx,
                                             FX_FLOAT fy) {
   m_pDocView->LockUpdate();
@@ -91,7 +91,7 @@ FX_BOOL CXFA_FFWidgetHandler::OnLButtonDown(IXFA_Widget* hWidget,
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnLButtonUp(IXFA_Widget* hWidget,
-                                          FX_DWORD dwFlags,
+                                          uint32_t dwFlags,
                                           FX_FLOAT fx,
                                           FX_FLOAT fy) {
   m_pDocView->LockUpdate();
@@ -104,7 +104,7 @@ FX_BOOL CXFA_FFWidgetHandler::OnLButtonUp(IXFA_Widget* hWidget,
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnLButtonDblClk(IXFA_Widget* hWidget,
-                                              FX_DWORD dwFlags,
+                                              uint32_t dwFlags,
                                               FX_FLOAT fx,
                                               FX_FLOAT fy) {
   static_cast<CXFA_FFWidget*>(hWidget)->Rotate2Normal(fx, fy);
@@ -114,7 +114,7 @@ FX_BOOL CXFA_FFWidgetHandler::OnLButtonDblClk(IXFA_Widget* hWidget,
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnMouseMove(IXFA_Widget* hWidget,
-                                          FX_DWORD dwFlags,
+                                          uint32_t dwFlags,
                                           FX_FLOAT fx,
                                           FX_FLOAT fy) {
   static_cast<CXFA_FFWidget*>(hWidget)->Rotate2Normal(fx, fy);
@@ -124,7 +124,7 @@ FX_BOOL CXFA_FFWidgetHandler::OnMouseMove(IXFA_Widget* hWidget,
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnMouseWheel(IXFA_Widget* hWidget,
-                                           FX_DWORD dwFlags,
+                                           uint32_t dwFlags,
                                            int16_t zDelta,
                                            FX_FLOAT fx,
                                            FX_FLOAT fy) {
@@ -135,7 +135,7 @@ FX_BOOL CXFA_FFWidgetHandler::OnMouseWheel(IXFA_Widget* hWidget,
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnRButtonDown(IXFA_Widget* hWidget,
-                                            FX_DWORD dwFlags,
+                                            uint32_t dwFlags,
                                             FX_FLOAT fx,
                                             FX_FLOAT fy) {
   static_cast<CXFA_FFWidget*>(hWidget)->Rotate2Normal(fx, fy);
@@ -150,7 +150,7 @@ FX_BOOL CXFA_FFWidgetHandler::OnRButtonDown(IXFA_Widget* hWidget,
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnRButtonUp(IXFA_Widget* hWidget,
-                                          FX_DWORD dwFlags,
+                                          uint32_t dwFlags,
                                           FX_FLOAT fx,
                                           FX_FLOAT fy) {
   static_cast<CXFA_FFWidget*>(hWidget)->Rotate2Normal(fx, fy);
@@ -160,7 +160,7 @@ FX_BOOL CXFA_FFWidgetHandler::OnRButtonUp(IXFA_Widget* hWidget,
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnRButtonDblClk(IXFA_Widget* hWidget,
-                                              FX_DWORD dwFlags,
+                                              uint32_t dwFlags,
                                               FX_FLOAT fx,
                                               FX_FLOAT fy) {
   static_cast<CXFA_FFWidget*>(hWidget)->Rotate2Normal(fx, fy);
@@ -170,8 +170,8 @@ FX_BOOL CXFA_FFWidgetHandler::OnRButtonDblClk(IXFA_Widget* hWidget,
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnKeyDown(IXFA_Widget* hWidget,
-                                        FX_DWORD dwKeyCode,
-                                        FX_DWORD dwFlags) {
+                                        uint32_t dwKeyCode,
+                                        uint32_t dwFlags) {
   FX_BOOL bRet =
       static_cast<CXFA_FFWidget*>(hWidget)->OnKeyDown(dwKeyCode, dwFlags);
   m_pDocView->RunInvalidate();
@@ -179,21 +179,21 @@ FX_BOOL CXFA_FFWidgetHandler::OnKeyDown(IXFA_Widget* hWidget,
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnKeyUp(IXFA_Widget* hWidget,
-                                      FX_DWORD dwKeyCode,
-                                      FX_DWORD dwFlags) {
+                                      uint32_t dwKeyCode,
+                                      uint32_t dwFlags) {
   FX_BOOL bRet =
       static_cast<CXFA_FFWidget*>(hWidget)->OnKeyUp(dwKeyCode, dwFlags);
   m_pDocView->RunInvalidate();
   return bRet;
 }
 FX_BOOL CXFA_FFWidgetHandler::OnChar(IXFA_Widget* hWidget,
-                                     FX_DWORD dwChar,
-                                     FX_DWORD dwFlags) {
+                                     uint32_t dwChar,
+                                     uint32_t dwFlags) {
   FX_BOOL bRet = static_cast<CXFA_FFWidget*>(hWidget)->OnChar(dwChar, dwFlags);
   m_pDocView->RunInvalidate();
   return bRet;
 }
-FX_DWORD CXFA_FFWidgetHandler::OnHitTest(IXFA_Widget* hWidget,
+uint32_t CXFA_FFWidgetHandler::OnHitTest(IXFA_Widget* hWidget,
                                          FX_FLOAT fx,
                                          FX_FLOAT fy) {
   if (!(static_cast<CXFA_FFWidget*>(hWidget)->GetStatus() &
@@ -534,7 +534,7 @@ CXFA_Node* CXFA_FFWidgetHandler::CreateFontNode(CXFA_Node* pParent) const {
   return pFont;
 }
 CXFA_Node* CXFA_FFWidgetHandler::CreateMarginNode(CXFA_Node* pParent,
-                                                  FX_DWORD dwFlags,
+                                                  uint32_t dwFlags,
                                                   FX_FLOAT fInsets[4]) const {
   CXFA_Node* pMargin = CreateCopyNode(XFA_ELEMENT_Margin, pParent);
   if (dwFlags & 0x01) {
diff --git a/xfa/fxfa/app/xfa_fontmgr.cpp b/xfa/fxfa/app/xfa_fontmgr.cpp
index 6ac5f0c984..256af6cf21 100644
--- a/xfa/fxfa/app/xfa_fontmgr.cpp
+++ b/xfa/fxfa/app/xfa_fontmgr.cpp
@@ -1698,14 +1698,14 @@ void XFA_LocalFontNameToEnglishName(const CFX_WideStringC& wsLocalName,
     _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ ||   \
     _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ ||   \
     _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
-  FX_DWORD dwLocalNameHash = FX_HashCode_String_GetW(
+  uint32_t dwLocalNameHash = FX_HashCode_String_GetW(
       wsLocalName.GetPtr(), wsLocalName.GetLength(), TRUE);
   int32_t iStart = 0;
   int32_t iEnd = sizeof(g_XFAFontsMap) / sizeof(XFA_FONTINFO) - 1;
   int32_t iMid = 0;
   do {
     iMid = (iStart + iEnd) / 2;
-    FX_DWORD dwFontNameHash = g_XFAFontsMap[iMid].dwFontNameHash;
+    uint32_t dwFontNameHash = g_XFAFontsMap[iMid].dwFontNameHash;
     if (dwFontNameHash == dwLocalNameHash) {
       wsEnglishName = g_XFAFontsMap[iMid].pPsName;
       break;
@@ -1725,7 +1725,7 @@ const XFA_FONTINFO* XFA_GetFontINFOByFontName(
     _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
   CFX_WideString wsFontNameTemp = wsFontName;
   wsFontNameTemp.Remove(L' ');
-  FX_DWORD dwCurFontNameHash =
+  uint32_t dwCurFontNameHash =
       FX_HashCode_String_GetW(wsFontNameTemp, wsFontNameTemp.GetLength(), TRUE);
   int32_t iStart = 0;
   int32_t iEnd = sizeof(g_XFAFontsMap) / sizeof(XFA_FONTINFO) - 1;
@@ -1733,7 +1733,7 @@ const XFA_FONTINFO* XFA_GetFontINFOByFontName(
   const XFA_FONTINFO* pFontInfo = NULL;
   do {
     iMid = (iStart + iEnd) / 2;
-    FX_DWORD dwFontNameHash = g_XFAFontsMap[iMid].dwFontNameHash;
+    uint32_t dwFontNameHash = g_XFAFontsMap[iMid].dwFontNameHash;
     if (dwFontNameHash == dwCurFontNameHash) {
       pFontInfo = &g_XFAFontsMap[iMid];
       break;
@@ -1764,7 +1764,7 @@ CXFA_DefFontMgr::~CXFA_DefFontMgr() {
 
 IFX_Font* CXFA_DefFontMgr::GetFont(IXFA_Doc* hDoc,
                                    const CFX_WideStringC& wsFontFamily,
-                                   FX_DWORD dwFontStyles,
+                                   uint32_t dwFontStyles,
                                    uint16_t wCodePage) {
   CFX_WideString wsFontName = wsFontFamily;
   IFX_FontMgr* pFDEFontMgr =
@@ -1773,7 +1773,7 @@ IFX_Font* CXFA_DefFontMgr::GetFont(IXFA_Doc* hDoc,
   if (!pFont) {
     const XFA_FONTINFO* pCurFont = XFA_GetFontINFOByFontName(wsFontName);
     if (pCurFont && pCurFont->pReplaceFont) {
-      FX_DWORD dwStyle = 0;
+      uint32_t dwStyle = 0;
       if (dwFontStyles & FX_FONTSTYLE_Bold) {
         dwStyle |= FX_FONTSTYLE_Bold;
       }
@@ -1808,7 +1808,7 @@ IFX_Font* CXFA_DefFontMgr::GetFont(IXFA_Doc* hDoc,
 
 IFX_Font* CXFA_DefFontMgr::GetDefaultFont(IXFA_Doc* hDoc,
                                           const CFX_WideStringC& wsFontFamily,
-                                          FX_DWORD dwFontStyles,
+                                          uint32_t dwFontStyles,
                                           uint16_t wCodePage) {
   IFX_FontMgr* pFDEFontMgr = ((CXFA_FFDoc*)hDoc)->GetApp()->GetFDEFontMgr();
   IFX_Font* pFont =
@@ -1891,10 +1891,10 @@ IFX_Font* CXFA_PDFFontMgr::FindFont(CFX_ByteString strPsName,
   return NULL;
 }
 IFX_Font* CXFA_PDFFontMgr::GetFont(const CFX_WideStringC& wsFontFamily,
-                                   FX_DWORD dwFontStyles,
+                                   uint32_t dwFontStyles,
                                    CPDF_Font** pPDFFont,
                                    FX_BOOL bStrictMatch) {
-  FX_DWORD dwHashCode =
+  uint32_t dwHashCode =
       FX_HashCode_String_GetW(wsFontFamily.GetPtr(), wsFontFamily.GetLength());
   CFX_ByteString strKey;
   strKey.Format("%u%u", dwHashCode, dwFontStyles);
@@ -2020,9 +2020,9 @@ CXFA_FontMgr::~CXFA_FontMgr() {
 }
 IFX_Font* CXFA_FontMgr::GetFont(IXFA_Doc* hDoc,
                                 const CFX_WideStringC& wsFontFamily,
-                                FX_DWORD dwFontStyles,
+                                uint32_t dwFontStyles,
                                 uint16_t wCodePage) {
-  FX_DWORD dwHash = FX_HashCode_String_GetW(wsFontFamily.GetPtr(),
+  uint32_t dwHash = FX_HashCode_String_GetW(wsFontFamily.GetPtr(),
                                             wsFontFamily.GetLength(), FALSE);
   CFX_ByteString bsKey;
   bsKey.Format("%u%u%u", dwHash, dwFontStyles, wCodePage);
diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp
index 3c0d100488..9c55b27652 100644
--- a/xfa/fxfa/app/xfa_fwltheme.cpp
+++ b/xfa/fxfa/app/xfa_fwltheme.cpp
@@ -112,11 +112,11 @@ FWL_ERR CXFA_FWLTheme::Finalize() {
 FX_BOOL CXFA_FWLTheme::IsValidWidget(IFWL_Widget* pWidget) {
   return TRUE;
 }
-FX_DWORD CXFA_FWLTheme::GetThemeID(IFWL_Widget* pWidget) {
+uint32_t CXFA_FWLTheme::GetThemeID(IFWL_Widget* pWidget) {
   return 0;
 }
-FX_DWORD CXFA_FWLTheme::SetThemeID(IFWL_Widget* pWidget,
-                                   FX_DWORD dwThemeID,
+uint32_t CXFA_FWLTheme::SetThemeID(IFWL_Widget* pWidget,
+                                   uint32_t dwThemeID,
                                    FX_BOOL bChildren) {
   return 0;
 }
@@ -191,7 +191,7 @@ FX_BOOL CXFA_FWLTheme::DrawText(CFWL_ThemeText* pParams) {
   return TRUE;
 }
 void* CXFA_FWLTheme::GetCapacity(CFWL_ThemePart* pThemePart,
-                                 FX_DWORD dwCapacity) {
+                                 uint32_t dwCapacity) {
   switch (dwCapacity) {
     case FWL_WGTCAPACITY_Font: {
       if (CXFA_FFWidget* pWidget =
@@ -377,12 +377,12 @@ void CXFA_FWLCheckBoxTP::DrawCheckSign(IFWL_Widget* pWidget,
                                        int32_t iState,
                                        CFX_Matrix* pMatrix) {
   CFX_RectF rtSign(*pRtBox);
-  FX_DWORD dwColor = 0xFF000000;
+  uint32_t dwColor = 0xFF000000;
   if ((iState & FWL_PARTSTATE_CKB_Mask2) == FWL_PARTSTATE_CKB_Neutral) {
     dwColor = 0xFFA9A9A9;
   }
   {
-    FX_DWORD dwStyle = pWidget->GetStylesEx();
+    uint32_t dwStyle = pWidget->GetStylesEx();
     rtSign.Deflate(rtSign.width / 4, rtSign.height / 4);
     switch (dwStyle & FWL_STYLEEXT_CKB_SignShapeMask) {
       case FWL_STYLEEXT_CKB_SignShapeCheck:
diff --git a/xfa/fxfa/app/xfa_rendercontext.cpp b/xfa/fxfa/app/xfa_rendercontext.cpp
index c9ca92bd6c..ec9a3f88f4 100644
--- a/xfa/fxfa/app/xfa_rendercontext.cpp
+++ b/xfa/fxfa/app/xfa_rendercontext.cpp
@@ -41,7 +41,7 @@ int32_t CXFA_RenderContext::StartRender(IXFA_PageView* pPageView,
   m_rtClipRect.Set(rtPage.left, rtPage.top, rtPage.width, rtPage.height);
   mtRes.TransformRect(m_rtClipRect);
   m_dwStatus = m_options.m_bHighlight ? XFA_WIDGETSTATUS_Highlight : 0;
-  FX_DWORD dwFilterType = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_AllType |
+  uint32_t dwFilterType = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_AllType |
                           (m_options.m_bPrint ? XFA_WIDGETSTATUS_Printable
                                               : XFA_WIDGETSTATUS_Viewable);
   m_pWidgetIterator =
diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp
index 6a17122149..ddd9809f91 100644
--- a/xfa/fxfa/app/xfa_textlayout.cpp
+++ b/xfa/fxfa/app/xfa_textlayout.cpp
@@ -170,7 +170,7 @@ IFDE_CSSComputedStyle* CXFA_TextParser::CreateRootStyle(
     FDE_CSSLENGTH letterSpacing;
     letterSpacing.Set(FDE_CSSLENGTHUNIT_Point, font.GetLetterSpacing());
     pParaStyle->SetLetterSpacing(letterSpacing);
-    FX_DWORD dwDecoration = 0;
+    uint32_t dwDecoration = 0;
     if (font.GetLineThrough() > 0) {
       dwDecoration |= FDE_CSSTEXTDECORATION_LineThrough;
     }
@@ -192,7 +192,7 @@ IFDE_CSSComputedStyle* CXFA_TextParser::CreateStyle(
   FXSYS_assert(pNewStyle);
   if (pParentStyle) {
     IFDE_CSSParagraphStyle* pParaStyle = pParentStyle->GetParagraphStyles();
-    FX_DWORD dwDecoration = pParaStyle->GetTextDecoration();
+    uint32_t dwDecoration = pParaStyle->GetTextDecoration();
     FX_FLOAT fBaseLine = 0;
     if (pParaStyle->GetVerticalAlign() == FDE_CSSVERTICALALIGN_Number) {
       fBaseLine = pParaStyle->GetNumberVerticalAlign();
@@ -289,7 +289,7 @@ void CXFA_TextParser::ParseRichText(IFDE_XMLNode* pXMLNode,
 }
 void CXFA_TextParser::ParseTagInfo(IFDE_XMLNode* pXMLNode,
                                    CXFA_CSSTagProvider& tagProvider) {
-  static const FX_DWORD s_XFATagName[] = {
+  static const uint32_t s_XFATagName[] = {
       0x61,       0x62,       0x69,       0x70,       0x0001f714,
       0x00022a55, 0x000239bb, 0x00025881, 0x0bd37faa, 0x0bd37fb8,
       0xa73e3af2, 0xb182eaae, 0xdb8ac455,
@@ -299,10 +299,10 @@ void CXFA_TextParser::ParseTagInfo(IFDE_XMLNode* pXMLNode,
     IFDE_XMLElement* pXMLElement = (IFDE_XMLElement*)pXMLNode;
     pXMLElement->GetLocalTagName(wsName);
     tagProvider.SetTagNameObj(wsName);
-    FX_DWORD dwHashCode =
+    uint32_t dwHashCode =
         FX_HashCode_String_GetW(wsName, wsName.GetLength(), TRUE);
-    static const int32_t s_iCount = sizeof(s_XFATagName) / sizeof(FX_DWORD);
-    CFX_DSPATemplate<FX_DWORD> lookup;
+    static const int32_t s_iCount = sizeof(s_XFATagName) / sizeof(uint32_t);
+    CFX_DSPATemplate<uint32_t> lookup;
     tagProvider.m_bTagAviliable =
         lookup.Lookup(dwHashCode, s_XFATagName, s_iCount) > -1;
     CFX_WideString wsValue;
@@ -349,7 +349,7 @@ FX_BOOL CXFA_TextParser::IsSpaceRun(IFDE_CSSComputedStyle* pStyle) const {
 IFX_Font* CXFA_TextParser::GetFont(IXFA_TextProvider* pTextProvider,
                                    IFDE_CSSComputedStyle* pStyle) const {
   CFX_WideStringC wsFamily = FX_WSTRC(L"Courier");
-  FX_DWORD dwStyle = 0;
+  uint32_t dwStyle = 0;
   CXFA_Font font = pTextProvider->GetFontNode();
   if (font) {
     font.GetTypeface(wsFamily);
@@ -434,7 +434,7 @@ void CXFA_TextParser::GetUnderline(IXFA_TextProvider* pTextProvider,
   iUnderline = 0;
   iPeriod = XFA_ATTRIBUTEENUM_All;
   if (pStyle) {
-    FX_DWORD dwDecoration = pStyle->GetParagraphStyles()->GetTextDecoration();
+    uint32_t dwDecoration = pStyle->GetParagraphStyles()->GetTextDecoration();
     if (dwDecoration & FDE_CSSTEXTDECORATION_Double) {
       iUnderline = 2;
     } else if (dwDecoration & FDE_CSSTEXTDECORATION_Underline) {
@@ -460,7 +460,7 @@ void CXFA_TextParser::GetLinethrough(IXFA_TextProvider* pTextProvider,
                                      IFDE_CSSComputedStyle* pStyle,
                                      int32_t& iLinethrough) const {
   if (pStyle) {
-    FX_DWORD dwDecoration = pStyle->GetParagraphStyles()->GetTextDecoration();
+    uint32_t dwDecoration = pStyle->GetParagraphStyles()->GetTextDecoration();
     iLinethrough = (dwDecoration & FDE_CSSTEXTDECORATION_LineThrough) ? 1 : 0;
   } else {
     CXFA_Font font = pTextProvider->GetFontNode();
@@ -640,7 +640,7 @@ FX_BOOL CXFA_TextParser::GetTabstops(
         break;
       case XFA_TABSTOPSSTATUS_Location:
         if (ch == ' ') {
-          FX_DWORD dwHashCode =
+          uint32_t dwHashCode =
               FX_HashCode_String_GetW(wsAlign, wsAlign.GetLength(), TRUE);
           CXFA_Measurement ms(CFX_WideStringC(pTabStops + iLast, iCur - iLast));
           FX_FLOAT fPos = ms.ToUnit(XFA_UNIT_Pt);
@@ -655,7 +655,7 @@ FX_BOOL CXFA_TextParser::GetTabstops(
     }
   }
   if (!wsAlign.IsEmpty()) {
-    FX_DWORD dwHashCode =
+    uint32_t dwHashCode =
         FX_HashCode_String_GetW(wsAlign, wsAlign.GetLength(), TRUE);
     CXFA_Measurement ms(CFX_WideStringC(pTabStops + iLast, iCur - iLast));
     FX_FLOAT fPos = ms.ToUnit(XFA_UNIT_Pt);
@@ -737,7 +737,7 @@ IFDE_XMLNode* CXFA_TextLayout::GetXMLContainerNode() {
   return pXMLContainer;
 }
 IFX_RTFBreak* CXFA_TextLayout::CreateBreak(FX_BOOL bDefault) {
-  FX_DWORD dwStyle = FX_RTFLAYOUTSTYLE_ExpandTab;
+  uint32_t dwStyle = FX_RTFLAYOUTSTYLE_ExpandTab;
   if (!bDefault) {
     dwStyle |= FX_RTFLAYOUTSTYLE_Pagination;
   }
@@ -1535,7 +1535,7 @@ FX_BOOL CXFA_TextLayout::LoadRichText(IFDE_XMLNode* pXMLNode,
   }
   if (m_bBlockContinue) {
     if (pContext && !bContentNode) {
-      FX_DWORD dwStatus = (eDisplay == FDE_CSSDISPLAY_Block)
+      uint32_t dwStatus = (eDisplay == FDE_CSSDISPLAY_Block)
                               ? FX_RTFBREAK_ParagraphBreak
                               : FX_RTFBREAK_PieceBreak;
       EndBreak(dwStatus, fLinePos, bSavePieces);
@@ -1572,7 +1572,7 @@ FX_BOOL CXFA_TextLayout::AppendChar(const CFX_WideString& wsText,
                                     FX_FLOAT& fLinePos,
                                     FX_FLOAT fSpaceAbove,
                                     FX_BOOL bSavePieces) {
-  FX_DWORD dwStatus = 0;
+  uint32_t dwStatus = 0;
   int32_t iChar = 0;
   if (m_pLoader) {
     iChar = m_pLoader->m_iChar;
@@ -1631,7 +1631,7 @@ void CXFA_TextLayout::ProcessText(CFX_WideString& wsText) {
   wsText.ReleaseBuffer(iLen);
   wsText = wsText.Left(iTrimLeft);
 }
-void CXFA_TextLayout::EndBreak(FX_DWORD dwStatus,
+void CXFA_TextLayout::EndBreak(uint32_t dwStatus,
                                FX_FLOAT& fLinePos,
                                FX_BOOL bSavePieces) {
   dwStatus = m_pBreak->EndBreak(dwStatus);
@@ -1672,7 +1672,7 @@ void CXFA_TextLayout::DoTabstops(IFDE_CSSComputedStyle* pStyle,
     if (m_pTabstopContext->m_bTabstops) {
       XFA_TABSTOPS* pTabstops =
           m_pTabstopContext->m_tabstops.GetDataPtr(iTabstopsIndex);
-      FX_DWORD dwAlgin = pTabstops->dwAlign;
+      uint32_t dwAlgin = pTabstops->dwAlign;
       if (dwAlgin == FX_HashCode_String_GetW(L"center", 6)) {
         fLeft = pPiece->rtPiece.width / 2.0f;
       } else if (dwAlgin == FX_HashCode_String_GetW(L"right", 5) ||
@@ -1695,7 +1695,7 @@ void CXFA_TextLayout::DoTabstops(IFDE_CSSComputedStyle* pStyle,
     pPiece->rtPiece.left -= m_pTabstopContext->m_fLeft;
   }
 }
-void CXFA_TextLayout::AppendTextLine(FX_DWORD dwStatus,
+void CXFA_TextLayout::AppendTextLine(uint32_t dwStatus,
                                      FX_FLOAT& fLinePos,
                                      FX_BOOL bSavePieces,
                                      FX_BOOL bEndBreak) {
diff --git a/xfa/fxfa/fm2js/xfa_expression.cpp b/xfa/fxfa/fm2js/xfa_expression.cpp
index a97e777256..0166fa609f 100644
--- a/xfa/fxfa/fm2js/xfa_expression.cpp
+++ b/xfa/fxfa/fm2js/xfa_expression.cpp
@@ -18,10 +18,10 @@ const CFX_WideStringC RUNTIMEBLOCKTEMPARRAYINDEX =
 
 }  // namespace
 
-CXFA_FMExpression::CXFA_FMExpression(FX_DWORD line)
+CXFA_FMExpression::CXFA_FMExpression(uint32_t line)
     : m_type(XFA_FM_EXPTYPE_UNKNOWN), m_line(line) {}
 
-CXFA_FMExpression::CXFA_FMExpression(FX_DWORD line, XFA_FM_EXPTYPE type)
+CXFA_FMExpression::CXFA_FMExpression(uint32_t line, XFA_FM_EXPTYPE type)
     : m_type(type), m_line(line) {}
 
 void CXFA_FMExpression::ToJavaScript(CFX_WideTextBuf& javascript) {}
@@ -29,7 +29,7 @@ void CXFA_FMExpression::ToJavaScript(CFX_WideTextBuf& javascript) {}
 void CXFA_FMExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {}
 
 CXFA_FMFunctionDefinition::CXFA_FMFunctionDefinition(
-    FX_DWORD line,
+    uint32_t line,
     FX_BOOL isGlobal,
     const CFX_WideStringC& wsName,
     CFX_WideStringCArray* pArguments,
@@ -118,7 +118,7 @@ void CXFA_FMFunctionDefinition::ToJavaScript(CFX_WideTextBuf& javascript) {
 
 void CXFA_FMFunctionDefinition::ToImpliedReturnJS(CFX_WideTextBuf&) {}
 
-CXFA_FMVarExpression::CXFA_FMVarExpression(FX_DWORD line,
+CXFA_FMVarExpression::CXFA_FMVarExpression(uint32_t line,
                                            const CFX_WideStringC& wsName,
                                            CXFA_FMExpression* pInit)
     : CXFA_FMExpression(line, XFA_FM_EXPTYPE_VAR),
@@ -171,7 +171,7 @@ void CXFA_FMVarExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L";\n");
 }
 
-CXFA_FMExpExpression::CXFA_FMExpExpression(FX_DWORD line,
+CXFA_FMExpExpression::CXFA_FMExpExpression(uint32_t line,
                                            CXFA_FMSimpleExpression* pExpression)
     : CXFA_FMExpression(line, XFA_FM_EXPTYPE_EXP), m_pExpression(pExpression) {}
 
@@ -208,7 +208,7 @@ void CXFA_FMExpExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   }
 }
 
-CXFA_FMBlockExpression::CXFA_FMBlockExpression(FX_DWORD line,
+CXFA_FMBlockExpression::CXFA_FMBlockExpression(uint32_t line,
                                                CFX_PtrArray* pExpressionList)
     : CXFA_FMExpression(line, XFA_FM_EXPTYPE_BLOCK),
       m_pExpressionList(pExpressionList) {}
@@ -251,7 +251,7 @@ void CXFA_FMBlockExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"}\n");
 }
 
-CXFA_FMDoExpression::CXFA_FMDoExpression(FX_DWORD line,
+CXFA_FMDoExpression::CXFA_FMDoExpression(uint32_t line,
                                          CXFA_FMExpression* pList)
     : CXFA_FMExpression(line), m_pList(pList) {}
 
@@ -263,7 +263,7 @@ void CXFA_FMDoExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   m_pList->ToImpliedReturnJS(javascript);
 }
 
-CXFA_FMIfExpression::CXFA_FMIfExpression(FX_DWORD line,
+CXFA_FMIfExpression::CXFA_FMIfExpression(uint32_t line,
                                          CXFA_FMSimpleExpression* pExpression,
                                          CXFA_FMExpression* pIfExpression,
                                          CXFA_FMExpression* pElseExpression)
@@ -331,7 +331,7 @@ void CXFA_FMLoopExpression::ToJavaScript(CFX_WideTextBuf& javascript) {}
 void CXFA_FMLoopExpression::ToImpliedReturnJS(CFX_WideTextBuf&) {}
 
 CXFA_FMWhileExpression::CXFA_FMWhileExpression(
-    FX_DWORD line,
+    uint32_t line,
     CXFA_FMSimpleExpression* pCondition,
     CXFA_FMExpression* pExpression)
     : CXFA_FMLoopExpression(line),
@@ -354,7 +354,7 @@ void CXFA_FMWhileExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   m_pExpression->ToImpliedReturnJS(javascript);
 }
 
-CXFA_FMBreakExpression::CXFA_FMBreakExpression(FX_DWORD line)
+CXFA_FMBreakExpression::CXFA_FMBreakExpression(uint32_t line)
     : CXFA_FMExpression(line, XFA_FM_EXPTYPE_BREAK) {}
 
 CXFA_FMBreakExpression::~CXFA_FMBreakExpression() {}
@@ -371,7 +371,7 @@ void CXFA_FMBreakExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"break;\n");
 }
 
-CXFA_FMContinueExpression::CXFA_FMContinueExpression(FX_DWORD line)
+CXFA_FMContinueExpression::CXFA_FMContinueExpression(uint32_t line)
     : CXFA_FMExpression(line, XFA_FM_EXPTYPE_CONTINUE) {}
 
 CXFA_FMContinueExpression::~CXFA_FMContinueExpression() {}
@@ -388,7 +388,7 @@ void CXFA_FMContinueExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"continue;\n");
 }
 
-CXFA_FMForExpression::CXFA_FMForExpression(FX_DWORD line,
+CXFA_FMForExpression::CXFA_FMForExpression(uint32_t line,
                                            const CFX_WideStringC& wsVariant,
                                            CXFA_FMSimpleExpression* pAssignment,
                                            CXFA_FMSimpleExpression* pAccessor,
@@ -504,7 +504,7 @@ void CXFA_FMForExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMForeachExpression::CXFA_FMForeachExpression(
-    FX_DWORD line,
+    uint32_t line,
     const CFX_WideStringC& wsIdentifier,
     CFX_PtrArray* pAccessors,
     CXFA_FMExpression* pList)
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
index 7b3573f36e..3acae67bc3 100644
--- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp
@@ -4288,7 +4288,7 @@ FX_BOOL CXFA_FM2JSContext::HTMLCode2STR(uint32_t iCode,
   return FALSE;
 }
 static FX_BOOL XFA_PATTERN_STRING_Type(const CFX_ByteStringC& szPattern,
-                                       FX_DWORD& patternType) {
+                                       uint32_t& patternType) {
   CFX_WideString wsPattern =
       CFX_WideString::FromUTF8(szPattern.GetCStr(), szPattern.GetLength());
   if (FX_WSTRC(L"datetime") == wsPattern.Left(8)) {
@@ -4391,7 +4391,7 @@ void CXFA_FM2JSContext::Format(FXJSE_HOBJECT hThis,
     FXSYS_assert(pThisNode);
     CXFA_WidgetData widgetData(pThisNode);
     IFX_Locale* pLocale = widgetData.GetLocal();
-    FX_DWORD patternType;
+    uint32_t patternType;
     FX_BOOL bCompelte = XFA_PATTERN_STRING_Type(szPattern, patternType);
     CFX_WideString wsPattern =
         CFX_WideString::FromUTF8(szPattern, szPattern.GetLength());
@@ -4603,7 +4603,7 @@ void CXFA_FM2JSContext::Parse(FXJSE_HOBJECT hThis,
       FXSYS_assert(pThisNode);
       CXFA_WidgetData widgetData(pThisNode);
       IFX_Locale* pLocale = widgetData.GetLocal();
-      FX_DWORD patternType;
+      uint32_t patternType;
       FX_BOOL bCompletePattern =
           XFA_PATTERN_STRING_Type(szPattern, patternType);
       CFX_WideString wsPattern =
@@ -6837,7 +6837,7 @@ FX_BOOL CXFA_FM2JSContext::GetObjectByName(
   }
   IXFA_ScriptContext* pScriptContext = pDoc->GetScriptContext();
   XFA_RESOLVENODE_RS resoveNodeRS;
-  FX_DWORD dwFlags = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
+  uint32_t dwFlags = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
                      XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent;
   int32_t iRet = pScriptContext->ResolveObjects(
       pScriptContext->GetThisObject(),
@@ -6868,7 +6868,7 @@ int32_t CXFA_FM2JSContext::ResolveObjects(FXJSE_HOBJECT hThis,
   }
   IXFA_ScriptContext* pScriptContext = pDoc->GetScriptContext();
   CXFA_Object* pNode = NULL;
-  FX_DWORD dFlags = 0UL;
+  uint32_t dFlags = 0UL;
   if (bdotAccessor) {
     if (FXJSE_Value_IsNull(hRefValue)) {
       pNode = pScriptContext->GetThisObject();
diff --git a/xfa/fxfa/fm2js/xfa_fmparse.cpp b/xfa/fxfa/fm2js/xfa_fmparse.cpp
index 6e30d95f1a..e66a42f471 100644
--- a/xfa/fxfa/fm2js/xfa_fmparse.cpp
+++ b/xfa/fxfa/fm2js/xfa_fmparse.cpp
@@ -36,7 +36,7 @@ void CXFA_FMParse::Check(XFA_FM_TOKEN op) {
   NextToken();
 }
 
-void CXFA_FMParse::Error(FX_DWORD lineNum, XFA_FM_ERRMSG msg, ...) {
+void CXFA_FMParse::Error(uint32_t lineNum, XFA_FM_ERRMSG msg, ...) {
   m_pErrorInfo->linenum = lineNum;
   const FX_WCHAR* lpMessageInfo = XFA_FM_ErrorMsg(msg);
   va_list ap;
@@ -79,7 +79,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseFunction() {
   CFX_WideStringC ident;
   std::unique_ptr<CFX_WideStringCArray> pArguments;
   std::unique_ptr<CFX_PtrArray> pExpressions;
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   NextToken();
   if (m_pToken->m_type != TOKidentifier) {
     CFX_WideString ws_TempString = m_pToken->m_wstring;
@@ -142,7 +142,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseFunction() {
 
 CXFA_FMExpression* CXFA_FMParse::ParseExpression() {
   std::unique_ptr<CXFA_FMExpression> e;
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   switch (m_pToken->m_type) {
     case TOKvar:
       e.reset(ParseVarExpression());
@@ -193,7 +193,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseExpression() {
 CXFA_FMExpression* CXFA_FMParse::ParseVarExpression() {
   std::unique_ptr<CXFA_FMExpression> e;
   CFX_WideStringC ident;
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   NextToken();
   if (m_pToken->m_type != TOKidentifier) {
     CFX_WideString ws_TempString = m_pToken->m_wstring;
@@ -216,7 +216,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseVarExpression() {
 }
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParseSimpleExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   std::unique_ptr<CXFA_FMSimpleExpression> pExp1(ParseLogicalOrExpression());
   while (m_pToken->m_type == TOKassign) {
     NextToken();
@@ -232,7 +232,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseSimpleExpression() {
 }
 
 CXFA_FMExpression* CXFA_FMParse::ParseExpExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   std::unique_ptr<CXFA_FMSimpleExpression> pExp1(ParseSimpleExpression());
   std::unique_ptr<CXFA_FMExpression> e;
   if (m_pErrorInfo->message.IsEmpty()) {
@@ -244,7 +244,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseExpExpression() {
 }
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalOrExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   std::unique_ptr<CXFA_FMSimpleExpression> e1(ParseLogicalAndExpression());
   for (;;) {
     switch (m_pToken->m_type) {
@@ -270,7 +270,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalOrExpression() {
 }
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalAndExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   std::unique_ptr<CXFA_FMSimpleExpression> e1(ParseEqualityExpression());
   for (;;) {
     switch (m_pToken->m_type) {
@@ -295,7 +295,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseLogicalAndExpression() {
 }
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParseEqualityExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   std::unique_ptr<CXFA_FMSimpleExpression> e1(ParseRelationalExpression());
   for (;;) {
     std::unique_ptr<CXFA_FMSimpleExpression> e2;
@@ -331,7 +331,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseEqualityExpression() {
 }
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParseRelationalExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   std::unique_ptr<CXFA_FMSimpleExpression> e1(ParseAddtiveExpression());
   for (;;) {
     std::unique_ptr<CXFA_FMSimpleExpression> e2;
@@ -389,7 +389,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseRelationalExpression() {
 }
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParseAddtiveExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   std::unique_ptr<CXFA_FMSimpleExpression> e1(ParseMultiplicativeExpression());
   for (;;) {
     std::unique_ptr<CXFA_FMSimpleExpression> e2;
@@ -423,7 +423,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseAddtiveExpression() {
 }
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParseMultiplicativeExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   std::unique_ptr<CXFA_FMSimpleExpression> e1(ParseUnaryExpression());
   for (;;) {
     std::unique_ptr<CXFA_FMSimpleExpression> e2;
@@ -458,7 +458,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseMultiplicativeExpression() {
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParseUnaryExpression() {
   std::unique_ptr<CXFA_FMSimpleExpression> e;
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   switch (m_pToken->m_type) {
     case TOKplus:
       NextToken();
@@ -496,7 +496,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseUnaryExpression() {
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParsePrimaryExpression() {
   std::unique_ptr<CXFA_FMSimpleExpression> e;
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   switch (m_pToken->m_type) {
     case TOKnumber:
       e.reset(new CXFA_FMNumberExpression(line, m_pToken->m_wstring));
@@ -546,7 +546,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePrimaryExpression() {
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression(
     CXFA_FMSimpleExpression* e) {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   while (1) {
     switch (m_pToken->m_type) {
       case TOKlparen: {
@@ -599,7 +599,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression(
         NextToken();
         if (m_pToken->m_type == TOKidentifier) {
           CFX_WideStringC tempStr = m_pToken->m_wstring;
-          FX_DWORD tempLine = m_pToken->m_uLinenum;
+          uint32_t tempLine = m_pToken->m_uLinenum;
           NextToken();
           if (m_pToken->m_type == TOKlparen) {
             CXFA_FMSimpleExpression* pExpAccessor;
@@ -678,7 +678,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression(
         NextToken();
         if (m_pToken->m_type == TOKidentifier) {
           CFX_WideStringC tempStr = m_pToken->m_wstring;
-          FX_DWORD tempLine = m_pToken->m_uLinenum;
+          uint32_t tempLine = m_pToken->m_uLinenum;
           NextToken();
           if (m_pToken->m_type == TOKlbracket) {
             std::unique_ptr<CXFA_FMSimpleExpression> s(ParseIndexExpression());
@@ -706,7 +706,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression(
         NextToken();
         if (m_pToken->m_type == TOKidentifier) {
           CFX_WideStringC tempStr = m_pToken->m_wstring;
-          FX_DWORD tempLine = m_pToken->m_uLinenum;
+          uint32_t tempLine = m_pToken->m_uLinenum;
           NextToken();
           if (m_pToken->m_type == TOKlbracket) {
             std::unique_ptr<CXFA_FMSimpleExpression> s(ParseIndexExpression());
@@ -746,7 +746,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParsePostExpression(
 
 CXFA_FMSimpleExpression* CXFA_FMParse::ParseIndexExpression() {
   std::unique_ptr<CXFA_FMSimpleExpression> pExp;
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   NextToken();
   std::unique_ptr<CXFA_FMSimpleExpression> s;
   XFA_FM_AccessorIndex accessorIndex = ACCESSOR_NO_RELATIVEINDEX;
@@ -790,7 +790,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseParenExpression() {
     return nullptr;
   }
 
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   std::unique_ptr<CXFA_FMSimpleExpression> pExp1(ParseLogicalOrExpression());
 
   while (m_pToken->m_type == TOKassign) {
@@ -808,7 +808,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseParenExpression() {
 }
 
 CXFA_FMExpression* CXFA_FMParse::ParseBlockExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   CXFA_FMExpression* e = nullptr;
   std::unique_ptr<CFX_PtrArray> expression(new CFX_PtrArray());
   while (1) {
@@ -849,7 +849,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseBlockExpression() {
 }
 
 CXFA_FMExpression* CXFA_FMParse::ParseIfExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   const FX_WCHAR* pStartPos = m_lexer->SavePos();
   NextToken();
   Check(TOKlparen);
@@ -906,7 +906,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseIfExpression() {
 }
 
 CXFA_FMExpression* CXFA_FMParse::ParseWhileExpression() {
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   NextToken();
   std::unique_ptr<CXFA_FMSimpleExpression> pCondition(ParseParenExpression());
   Check(TOKdo);
@@ -938,7 +938,7 @@ CXFA_FMSimpleExpression* CXFA_FMParse::ParseSubassignmentInForExpression() {
 
 CXFA_FMExpression* CXFA_FMParse::ParseForExpression() {
   CFX_WideStringC wsVariant;
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   NextToken();
   if (m_pToken->m_type != TOKidentifier) {
     CFX_WideString ws_TempString = m_pToken->m_wstring;
@@ -990,7 +990,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseForeachExpression() {
   CFX_WideStringC wsIdentifier;
   std::unique_ptr<CFX_PtrArray> pAccessors;
   std::unique_ptr<CXFA_FMExpression> pList;
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   NextToken();
   if (m_pToken->m_type != TOKidentifier) {
     CFX_WideString ws_TempString = m_pToken->m_wstring;
@@ -1038,7 +1038,7 @@ CXFA_FMExpression* CXFA_FMParse::ParseForeachExpression() {
 
 CXFA_FMExpression* CXFA_FMParse::ParseDoExpression() {
   std::unique_ptr<CXFA_FMExpression> e;
-  FX_DWORD line = m_pToken->m_uLinenum;
+  uint32_t line = m_pToken->m_uLinenum;
   NextToken();
   e.reset(ParseBlockExpression());
   Check(TOKend);
diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/xfa_lexer.cpp
index 7c9682de8b..20b1320f70 100644
--- a/xfa/fxfa/fm2js/xfa_lexer.cpp
+++ b/xfa/fxfa/fm2js/xfa_lexer.cpp
@@ -160,7 +160,7 @@ const FX_WCHAR* XFA_FM_KeywordToString(XFA_FM_TOKEN op) {
 
 CXFA_FMToken::CXFA_FMToken() : m_type(TOKreserver), m_uLinenum(1) {}
 
-CXFA_FMToken::CXFA_FMToken(FX_DWORD uLineNum)
+CXFA_FMToken::CXFA_FMToken(uint32_t uLineNum)
     : m_type(TOKreserver), m_uLinenum(uLineNum) {}
 
 CXFA_FMLexer::CXFA_FMLexer(const CFX_WideStringC& wsFormCalc,
@@ -404,7 +404,7 @@ CXFA_FMToken* CXFA_FMLexer::Scan() {
   }
 }
 
-FX_DWORD CXFA_FMLexer::Number(CXFA_FMToken* t,
+uint32_t CXFA_FMLexer::Number(CXFA_FMToken* t,
                               const FX_WCHAR* p,
                               const FX_WCHAR*& pEnd) {
   FX_DOUBLE number = 0;
@@ -418,7 +418,7 @@ FX_DWORD CXFA_FMLexer::Number(CXFA_FMToken* t,
   return 0;
 }
 
-FX_DWORD CXFA_FMLexer::String(CXFA_FMToken* t,
+uint32_t CXFA_FMLexer::String(CXFA_FMToken* t,
                               const FX_WCHAR* p,
                               const FX_WCHAR*& pEnd) {
   const FX_WCHAR* pStart = p;
@@ -458,7 +458,7 @@ FX_DWORD CXFA_FMLexer::String(CXFA_FMToken* t,
   return 0;
 }
 
-FX_DWORD CXFA_FMLexer::Identifiers(CXFA_FMToken* t,
+uint32_t CXFA_FMLexer::Identifiers(CXFA_FMToken* t,
                                    const FX_WCHAR* p,
                                    const FX_WCHAR*& pEnd) {
   const FX_WCHAR* pStart = p;
diff --git a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
index ece1cde7ae..113fbfb536 100644
--- a/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
+++ b/xfa/fxfa/fm2js/xfa_simpleexpression.cpp
@@ -81,7 +81,7 @@ const XFA_FMBuildInFunc g_BuildInFuncs[] = {
 struct XFA_FMSOMMethod {
   uint32_t m_uHash;
   const FX_WCHAR* m_wsSomMethodName;
-  FX_DWORD m_dParameters;
+  uint32_t m_dParameters;
 };
 const XFA_FMSOMMethod gs_FMSomMethods[] = {
     {0x00000068, L"h", 0x01},
@@ -114,7 +114,7 @@ CFX_WideStringC XFA_FM_EXPTypeToString(
   return gs_lpStrExpFuncName[simpleExpType];
 }
 
-CXFA_FMSimpleExpression::CXFA_FMSimpleExpression(FX_DWORD line, XFA_FM_TOKEN op)
+CXFA_FMSimpleExpression::CXFA_FMSimpleExpression(uint32_t line, XFA_FM_TOKEN op)
     : m_line(line), m_op(op) {}
 
 void CXFA_FMSimpleExpression::ToJavaScript(CFX_WideTextBuf& javascript) {}
@@ -125,14 +125,14 @@ XFA_FM_TOKEN CXFA_FMSimpleExpression::GetOperatorToken() const {
   return m_op;
 }
 
-CXFA_FMNullExpression::CXFA_FMNullExpression(FX_DWORD line)
+CXFA_FMNullExpression::CXFA_FMNullExpression(uint32_t line)
     : CXFA_FMSimpleExpression(line, TOKnull) {}
 
 void CXFA_FMNullExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L"null");
 }
 
-CXFA_FMNumberExpression::CXFA_FMNumberExpression(FX_DWORD line,
+CXFA_FMNumberExpression::CXFA_FMNumberExpression(uint32_t line,
                                                  CFX_WideStringC wsNumber)
     : CXFA_FMSimpleExpression(line, TOKnumber), m_wsNumber(wsNumber) {}
 
@@ -140,7 +140,7 @@ void CXFA_FMNumberExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << m_wsNumber;
 }
 
-CXFA_FMStringExpression::CXFA_FMStringExpression(FX_DWORD line,
+CXFA_FMStringExpression::CXFA_FMStringExpression(uint32_t line,
                                                  CFX_WideStringC wsString)
     : CXFA_FMSimpleExpression(line, TOKstring), m_wsString(wsString) {}
 
@@ -171,7 +171,7 @@ void CXFA_FMStringExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMIdentifierExpressionn::CXFA_FMIdentifierExpressionn(
-    FX_DWORD line,
+    uint32_t line,
     CFX_WideStringC wsIdentifier)
     : CXFA_FMSimpleExpression(line, TOKidentifier),
       m_wsIdentifier(wsIdentifier) {}
@@ -200,14 +200,14 @@ void CXFA_FMIdentifierExpressionn::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << tempStr;
 }
 
-CXFA_FMUnaryExpression::CXFA_FMUnaryExpression(FX_DWORD line,
+CXFA_FMUnaryExpression::CXFA_FMUnaryExpression(uint32_t line,
                                                XFA_FM_TOKEN op,
                                                CXFA_FMSimpleExpression* pExp)
     : CXFA_FMSimpleExpression(line, op), m_pExp(pExp) {}
 
 void CXFA_FMUnaryExpression::ToJavaScript(CFX_WideTextBuf& javascript) {}
 
-CXFA_FMBinExpression::CXFA_FMBinExpression(FX_DWORD line,
+CXFA_FMBinExpression::CXFA_FMBinExpression(uint32_t line,
                                            XFA_FM_TOKEN op,
                                            CXFA_FMSimpleExpression* pExp1,
                                            CXFA_FMSimpleExpression* pExp2)
@@ -215,7 +215,7 @@ CXFA_FMBinExpression::CXFA_FMBinExpression(FX_DWORD line,
 
 void CXFA_FMBinExpression::ToJavaScript(CFX_WideTextBuf& javascript) {}
 
-CXFA_FMAssignExpression::CXFA_FMAssignExpression(FX_DWORD line,
+CXFA_FMAssignExpression::CXFA_FMAssignExpression(uint32_t line,
                                                  XFA_FM_TOKEN op,
                                                  CXFA_FMSimpleExpression* pExp1,
                                                  CXFA_FMSimpleExpression* pExp2)
@@ -282,7 +282,7 @@ void CXFA_FMAssignExpression::ToImpliedReturnJS(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMLogicalOrExpression::CXFA_FMLogicalOrExpression(
-    FX_DWORD line,
+    uint32_t line,
     XFA_FM_TOKEN op,
     CXFA_FMSimpleExpression* pExp1,
     CXFA_FMSimpleExpression* pExp2)
@@ -298,7 +298,7 @@ void CXFA_FMLogicalOrExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMLogicalAndExpression::CXFA_FMLogicalAndExpression(
-    FX_DWORD line,
+    uint32_t line,
     XFA_FM_TOKEN op,
     CXFA_FMSimpleExpression* pExp1,
     CXFA_FMSimpleExpression* pExp2)
@@ -314,7 +314,7 @@ void CXFA_FMLogicalAndExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMEqualityExpression::CXFA_FMEqualityExpression(
-    FX_DWORD line,
+    uint32_t line,
     XFA_FM_TOKEN op,
     CXFA_FMSimpleExpression* pExp1,
     CXFA_FMSimpleExpression* pExp2)
@@ -342,7 +342,7 @@ void CXFA_FMEqualityExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMRelationalExpression::CXFA_FMRelationalExpression(
-    FX_DWORD line,
+    uint32_t line,
     XFA_FM_TOKEN op,
     CXFA_FMSimpleExpression* pExp1,
     CXFA_FMSimpleExpression* pExp2)
@@ -378,7 +378,7 @@ void CXFA_FMRelationalExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMAdditiveExpression::CXFA_FMAdditiveExpression(
-    FX_DWORD line,
+    uint32_t line,
     XFA_FM_TOKEN op,
     CXFA_FMSimpleExpression* pExp1,
     CXFA_FMSimpleExpression* pExp2)
@@ -404,7 +404,7 @@ void CXFA_FMAdditiveExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMMultiplicativeExpression::CXFA_FMMultiplicativeExpression(
-    FX_DWORD line,
+    uint32_t line,
     XFA_FM_TOKEN op,
     CXFA_FMSimpleExpression* pExp1,
     CXFA_FMSimpleExpression* pExp2)
@@ -430,7 +430,7 @@ void CXFA_FMMultiplicativeExpression::ToJavaScript(
   javascript << FX_WSTRC(L")");
 }
 
-CXFA_FMPosExpression::CXFA_FMPosExpression(FX_DWORD line,
+CXFA_FMPosExpression::CXFA_FMPosExpression(uint32_t line,
                                            CXFA_FMSimpleExpression* pExp)
     : CXFA_FMUnaryExpression(line, TOKplus, pExp) {}
 
@@ -441,7 +441,7 @@ void CXFA_FMPosExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L")");
 }
 
-CXFA_FMNegExpression::CXFA_FMNegExpression(FX_DWORD line,
+CXFA_FMNegExpression::CXFA_FMNegExpression(uint32_t line,
                                            CXFA_FMSimpleExpression* pExp)
     : CXFA_FMUnaryExpression(line, TOKminus, pExp) {}
 
@@ -452,7 +452,7 @@ void CXFA_FMNegExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L")");
 }
 
-CXFA_FMNotExpression::CXFA_FMNotExpression(FX_DWORD line,
+CXFA_FMNotExpression::CXFA_FMNotExpression(uint32_t line,
                                            CXFA_FMSimpleExpression* pExp)
     : CXFA_FMUnaryExpression(line, TOKksnot, pExp) {}
 
@@ -463,7 +463,7 @@ void CXFA_FMNotExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
   javascript << FX_WSTRC(L")");
 }
 
-CXFA_FMCallExpression::CXFA_FMCallExpression(FX_DWORD line,
+CXFA_FMCallExpression::CXFA_FMCallExpression(uint32_t line,
                                              CXFA_FMSimpleExpression* pExp,
                                              CFX_PtrArray* pArguments,
                                              FX_BOOL bIsSomMethod)
@@ -498,12 +498,12 @@ bool CXFA_FMCallExpression::IsBuildInFunc(CFX_WideTextBuf* funcName) {
   return false;
 }
 
-FX_DWORD CXFA_FMCallExpression::IsMethodWithObjParam(
+uint32_t CXFA_FMCallExpression::IsMethodWithObjParam(
     const CFX_WideStringC& methodName) {
   int32_t iLength = methodName.GetLength();
   uint32_t uHash = FX_HashCode_String_GetW(methodName.GetPtr(), iLength);
   XFA_FMSOMMethod somMethodWithObjPara;
-  FX_DWORD parameters = 0x00;
+  uint32_t parameters = 0x00;
   int32_t iStart = 0,
           iEnd = (sizeof(gs_FMSomMethods) / sizeof(gs_FMSomMethods[0])) - 1;
   int32_t iMid = (iStart + iEnd) / 2;
@@ -529,7 +529,7 @@ void CXFA_FMCallExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
     javascript << funcName;
     javascript << FX_WSTRC(L"(");
     if (m_pArguments) {
-      FX_DWORD methodPara = IsMethodWithObjParam(funcName.GetWideString());
+      uint32_t methodPara = IsMethodWithObjParam(funcName.GetWideString());
       if (methodPara > 0) {
         for (int i = 0; i < m_pArguments->GetSize(); ++i) {
           if ((methodPara & (0x01 << i)) > 0) {
@@ -615,7 +615,7 @@ void CXFA_FMCallExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMDotAccessorExpression::CXFA_FMDotAccessorExpression(
-    FX_DWORD line,
+    uint32_t line,
     CXFA_FMSimpleExpression* pAccessor,
     XFA_FM_TOKEN op,
     CFX_WideStringC wsIdentifier,
@@ -655,7 +655,7 @@ void CXFA_FMDotAccessorExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMIndexExpression::CXFA_FMIndexExpression(
-    FX_DWORD line,
+    uint32_t line,
     XFA_FM_AccessorIndex accessorIndex,
     CXFA_FMSimpleExpression* pIndexExp,
     FX_BOOL bIsStarIndex)
@@ -691,7 +691,7 @@ void CXFA_FMIndexExpression::ToJavaScript(CFX_WideTextBuf& javascript) {
 }
 
 CXFA_FMDotDotAccessorExpression::CXFA_FMDotDotAccessorExpression(
-    FX_DWORD line,
+    uint32_t line,
     CXFA_FMSimpleExpression* pAccessor,
     XFA_FM_TOKEN op,
     CFX_WideStringC wsIdentifier,
@@ -718,7 +718,7 @@ void CXFA_FMDotDotAccessorExpression::ToJavaScript(
 }
 
 CXFA_FMMethodCallExpression::CXFA_FMMethodCallExpression(
-    FX_DWORD line,
+    uint32_t line,
     CXFA_FMSimpleExpression* pAccessorExp1,
     CXFA_FMSimpleExpression* pCallExp)
     : CXFA_FMBinExpression(line, TOKdot, pAccessorExp1, pCallExp) {}
diff --git a/xfa/fxfa/parser/xfa_basic_imp.cpp b/xfa/fxfa/parser/xfa_basic_imp.cpp
index ae5e5e8939..a126cd6d1f 100644
--- a/xfa/fxfa/parser/xfa_basic_imp.cpp
+++ b/xfa/fxfa/parser/xfa_basic_imp.cpp
@@ -42,11 +42,11 @@ const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName) {
   return NULL;
 }
 
-const XFA_PACKETINFO* XFA_GetPacketByID(FX_DWORD dwPacket) {
+const XFA_PACKETINFO* XFA_GetPacketByID(uint32_t dwPacket) {
   int32_t iStart = 0, iEnd = g_iXFAPacketCount - 1;
   do {
     int32_t iMid = (iStart + iEnd) / 2;
-    FX_DWORD dwFind = (g_XFAPacketData + iMid)->eName;
+    uint32_t dwFind = (g_XFAPacketData + iMid)->eName;
     if (dwPacket == dwFind) {
       return g_XFAPacketData + iMid;
     } else if (dwPacket < dwFind) {
@@ -116,7 +116,7 @@ FX_BOOL XFA_GetAttributeDefaultValue(void*& pValue,
                                      XFA_ELEMENT eElement,
                                      XFA_ATTRIBUTE eAttribute,
                                      XFA_ATTRIBUTETYPE eType,
-                                     FX_DWORD dwPacket) {
+                                     uint32_t dwPacket) {
   const XFA_ATTRIBUTEINFO* pInfo = XFA_GetAttributeByID(eAttribute);
   if (pInfo == NULL) {
     return FALSE;
@@ -139,7 +139,7 @@ FX_BOOL XFA_GetAttributeDefaultValue(void*& pValue,
 }
 XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement,
                                                     XFA_ATTRIBUTE eAttribute,
-                                                    FX_DWORD dwPacket) {
+                                                    uint32_t dwPacket) {
   void* pValue;
   if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute,
                                    XFA_ATTRIBUTETYPE_Enum, dwPacket)) {
@@ -149,7 +149,7 @@ XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement,
 }
 CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement,
                                                    XFA_ATTRIBUTE eAttribute,
-                                                   FX_DWORD dwPacket) {
+                                                   uint32_t dwPacket) {
   void* pValue;
   if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute,
                                    XFA_ATTRIBUTETYPE_Cdata, dwPacket)) {
@@ -159,7 +159,7 @@ CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement,
 }
 FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement,
                                              XFA_ATTRIBUTE eAttribute,
-                                             FX_DWORD dwPacket) {
+                                             uint32_t dwPacket) {
   void* pValue;
   if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute,
                                    XFA_ATTRIBUTETYPE_Boolean, dwPacket)) {
@@ -169,7 +169,7 @@ FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement,
 }
 int32_t XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement,
                                              XFA_ATTRIBUTE eAttribute,
-                                             FX_DWORD dwPacket) {
+                                             uint32_t dwPacket) {
   void* pValue;
   if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute,
                                    XFA_ATTRIBUTETYPE_Integer, dwPacket)) {
@@ -179,7 +179,7 @@ int32_t XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement,
 }
 CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement,
                                                       XFA_ATTRIBUTE eAttribute,
-                                                      FX_DWORD dwPacket) {
+                                                      uint32_t dwPacket) {
   void* pValue;
   if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute,
                                    XFA_ATTRIBUTETYPE_Measure, dwPacket)) {
@@ -231,7 +231,7 @@ const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t& iCount) {
 }
 const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement,
                                                    XFA_ATTRIBUTE eAttribute,
-                                                   FX_DWORD dwPacket) {
+                                                   uint32_t dwPacket) {
   int32_t iCount = 0;
   const uint8_t* pAttr = XFA_GetElementAttributes(eElement, iCount);
   if (pAttr == NULL || iCount < 1) {
@@ -250,7 +250,7 @@ const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement,
 }
 const XFA_ELEMENTINFO* XFA_GetChildOfElement(XFA_ELEMENT eElement,
                                              XFA_ELEMENT eChild,
-                                             FX_DWORD dwPacket) {
+                                             uint32_t dwPacket) {
   int32_t iCount = 0;
   const uint16_t* pChild = XFA_GetElementChildren(eElement, iCount);
   if (pChild == NULL || iCount < 1) {
@@ -278,7 +278,7 @@ const XFA_PROPERTY* XFA_GetElementProperties(XFA_ELEMENT eElement,
 }
 const XFA_PROPERTY* XFA_GetPropertyOfElement(XFA_ELEMENT eElement,
                                              XFA_ELEMENT eProperty,
-                                             FX_DWORD dwPacket) {
+                                             uint32_t dwPacket) {
   int32_t iCount = 0;
   const XFA_PROPERTY* pProperty = XFA_GetElementProperties(eElement, iCount);
   if (pProperty == NULL || iCount < 1) {
@@ -560,7 +560,7 @@ IFX_Stream* CXFA_WideTextRead::Retain() {
   m_iRefCount++;
   return this;
 }
-FX_DWORD CXFA_WideTextRead::GetAccessModes() const {
+uint32_t CXFA_WideTextRead::GetAccessModes() const {
   return FX_STREAMACCESS_Read | FX_STREAMACCESS_Text;
 }
 int32_t CXFA_WideTextRead::GetLength() const {
diff --git a/xfa/fxfa/parser/xfa_document_datadescription_imp.cpp b/xfa/fxfa/parser/xfa_document_datadescription_imp.cpp
index 8cc8d01644..1a6ca1b5fe 100644
--- a/xfa/fxfa/parser/xfa_document_datadescription_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datadescription_imp.cpp
@@ -34,7 +34,7 @@ void XFA_DataDescription_UpdateDataRelation(CXFA_Node* pDataNode,
   for (CXFA_Node* pDataChild = pDataNode->GetNodeItem(XFA_NODEITEM_FirstChild);
        pDataChild;
        pDataChild = pDataChild->GetNodeItem(XFA_NODEITEM_NextSibling)) {
-    FX_DWORD dwNameHash = pDataChild->GetNameHash();
+    uint32_t dwNameHash = pDataChild->GetNameHash();
     XFA_ELEMENT eType = pDataChild->GetClassID();
     if (!dwNameHash) {
       continue;
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index 317610e8b3..8872400bb5 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -340,13 +340,13 @@ static void XFA_DataMerge_CreateDataBinding(CXFA_Node* pFormNode,
   }
 }
 static CXFA_Node* XFA_DataMerge_GetGlobalBinding(CXFA_Document* pDocument,
-                                                 FX_DWORD dwNameHash) {
+                                                 uint32_t dwNameHash) {
   CXFA_Node* pNode = NULL;
   pDocument->m_rgGlobalBinding.Lookup(dwNameHash, pNode);
   return pNode;
 }
 static void XFA_DataMerge_RegisterGlobalBinding(CXFA_Document* pDocument,
-                                                FX_DWORD dwNameHash,
+                                                uint32_t dwNameHash,
                                                 CXFA_Node* pDataNode) {
   pDocument->m_rgGlobalBinding.SetAt(dwNameHash, pDataNode);
 }
@@ -355,7 +355,7 @@ static void XFA_DataMerge_ClearGlobalBinding(CXFA_Document* pDocument) {
 }
 static CXFA_Node* XFA_DataMerge_ScopeMatchGlobalBinding(
     CXFA_Node* pDataScope,
-    FX_DWORD dwNameHash,
+    uint32_t dwNameHash,
     XFA_ELEMENT eMatchDataNodeType,
     FX_BOOL bUpLevel = TRUE) {
   for (CXFA_Node *pCurDataScope = pDataScope, *pLastDataScope = NULL;
@@ -394,7 +394,7 @@ static CXFA_Node* XFA_DataMerge_FindGlobalDataNode(CXFA_Document* pDocument,
                                                    CFX_WideStringC wsName,
                                                    CXFA_Node* pDataScope,
                                                    XFA_ELEMENT eMatchNodeType) {
-  FX_DWORD dwNameHash =
+  uint32_t dwNameHash =
       wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.GetPtr(),
                                                      wsName.GetLength());
   if (dwNameHash != 0) {
@@ -414,7 +414,7 @@ static CXFA_Node* XFA_DataMerge_FindOnceDataNode(CXFA_Document* pDocument,
                                                  CFX_WideStringC wsName,
                                                  CXFA_Node* pDataScope,
                                                  XFA_ELEMENT eMatchNodeType) {
-  FX_DWORD dwNameHash =
+  uint32_t dwNameHash =
       wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.GetPtr(),
                                                      wsName.GetLength());
   if (dwNameHash != 0) {
@@ -447,7 +447,7 @@ static CXFA_Node* XFA_DataMerge_FindDataRefDataNode(CXFA_Document* pDocument,
                                                     CXFA_Node* pTemplateNode,
                                                     FX_BOOL bForceBind,
                                                     FX_BOOL bUpLevel = TRUE) {
-  FX_DWORD dFlags = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_BindNew;
+  uint32_t dFlags = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_BindNew;
   if (bUpLevel || wsRef != FX_WSTRC(L"name")) {
     dFlags |= (XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings);
   }
@@ -471,7 +471,7 @@ static CXFA_Node* XFA_DataMerge_FindDataRefDataNode(CXFA_Document* pDocument,
 }
 CXFA_Node* XFA_DataMerge_FindFormDOMInstance(CXFA_Document* pDocument,
                                              XFA_ELEMENT eClassID,
-                                             FX_DWORD dwNameHash,
+                                             uint32_t dwNameHash,
                                              CXFA_Node* pFormParent) {
   CXFA_Node* pFormChild = pFormParent->GetNodeItem(XFA_NODEITEM_FirstChild);
   for (; pFormChild;
@@ -558,12 +558,12 @@ static CXFA_Node* XFA_NodeMerge_CloneOrMergeInstanceManager(
     CXFA_NodeArray& subforms) {
   CFX_WideStringC wsSubformName = pTemplateNode->GetCData(XFA_ATTRIBUTE_Name);
   CFX_WideString wsInstMgrNodeName = FX_WSTRC(L"_") + wsSubformName;
-  FX_DWORD dwInstNameHash =
+  uint32_t dwInstNameHash =
       FX_HashCode_String_GetW(wsInstMgrNodeName, wsInstMgrNodeName.GetLength());
   CXFA_Node* pExistingNode = XFA_DataMerge_FindFormDOMInstance(
       pDocument, XFA_ELEMENT_InstanceManager, dwInstNameHash, pFormParent);
   if (pExistingNode) {
-    FX_DWORD dwNameHash = pTemplateNode->GetNameHash();
+    uint32_t dwNameHash = pTemplateNode->GetNameHash();
     for (CXFA_Node* pNode =
              pExistingNode->GetNodeItem(XFA_NODEITEM_NextSibling);
          pNode;) {
@@ -1152,7 +1152,7 @@ static void XFA_DataMerge_UpdateBindingRelations(CXFA_Document* pDocument,
         break;
       case XFA_ATTRIBUTEENUM_Global:
         if (!bDataRef || bParentDataRef) {
-          FX_DWORD dwNameHash = pFormNode->GetNameHash();
+          uint32_t dwNameHash = pFormNode->GetNameHash();
           if (dwNameHash != 0 && !pDataNode) {
             pDataNode = XFA_DataMerge_GetGlobalBinding(pDocument, dwNameHash);
             if (!pDataNode) {
@@ -1185,7 +1185,7 @@ static void XFA_DataMerge_UpdateBindingRelations(CXFA_Document* pDocument,
         if (!pDataNode && bDataRef) {
           CFX_WideStringC wsRef =
               pTemplateNodeBind->GetCData(XFA_ATTRIBUTE_Ref);
-          FX_DWORD dFlags =
+          uint32_t dFlags =
               XFA_RESOLVENODE_Children | XFA_RESOLVENODE_CreateNode;
           XFA_RESOLVENODE_RS rs;
           pDocument->GetScriptContext()->ResolveObjects(pDataScope, wsRef, rs,
@@ -1315,7 +1315,7 @@ void CXFA_Document::DoDataMerge() {
   }
   CXFA_Node* pDataTopLevel =
       pDataRoot->GetFirstChildByClass(XFA_ELEMENT_DataGroup);
-  FX_DWORD dwNameHash = pDataTopLevel ? pDataTopLevel->GetNameHash() : 0;
+  uint32_t dwNameHash = pDataTopLevel ? pDataTopLevel->GetNameHash() : 0;
   CXFA_Node* pTemplateRoot =
       m_pRootNode->GetFirstChildByClass(XFA_ELEMENT_Template);
   if (!pTemplateRoot) {
diff --git a/xfa/fxfa/parser/xfa_document_imp.cpp b/xfa/fxfa/parser/xfa_document_imp.cpp
index 3c07c4822d..6f08489c17 100644
--- a/xfa/fxfa/parser/xfa_document_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_imp.cpp
@@ -95,7 +95,7 @@ CXFA_Object* CXFA_Document::GetXFAObject(const CFX_WideStringC& wsNodeName) {
   return GetXFAObject(
       FX_HashCode_String_GetW(wsNodeName.GetPtr(), wsNodeName.GetLength()));
 }
-CXFA_Object* CXFA_Document::GetXFAObject(FX_DWORD dwNodeNameHash) {
+CXFA_Object* CXFA_Document::GetXFAObject(uint32_t dwNodeNameHash) {
   switch (dwNodeNameHash) {
     case XFA_HASHCODE_Data: {
       CXFA_Node* pDatasetsNode = ToNode(GetXFAObject(XFA_HASHCODE_Datasets));
@@ -168,7 +168,7 @@ CXFA_Object* CXFA_Document::GetXFAObject(FX_DWORD dwNodeNameHash) {
       return m_pRootNode->GetFirstChildByName(dwNodeNameHash);
   }
 }
-CXFA_Node* CXFA_Document::CreateNode(FX_DWORD dwPacket, XFA_ELEMENT eElement) {
+CXFA_Node* CXFA_Document::CreateNode(uint32_t dwPacket, XFA_ELEMENT eElement) {
   return CreateNode(XFA_GetPacketByID(dwPacket), eElement);
 }
 CXFA_Node* CXFA_Document::CreateNode(const XFA_PACKETINFO* pPacket,
@@ -201,7 +201,7 @@ void CXFA_Document::PurgeNodes() {
   }
   m_rgPurgeNodes.RemoveAll();
 }
-void CXFA_Document::SetFlag(FX_DWORD dwFlag, FX_BOOL bOn) {
+void CXFA_Document::SetFlag(uint32_t dwFlag, FX_BOOL bOn) {
   if (bOn) {
     m_dwDocFlags |= dwFlag;
   } else {
@@ -359,7 +359,7 @@ void CXFA_Document::DoProtoMerge() {
   if (!pTemplateRoot) {
     return;
   }
-  CFX_MapPtrTemplate<FX_DWORD, CXFA_Node*> mIDMap;
+  CFX_MapPtrTemplate<uint32_t, CXFA_Node*> mIDMap;
   CXFA_NodeSet sUseNodes;
   CXFA_NodeIterator sIterator(pTemplateRoot);
   for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode;
@@ -417,7 +417,7 @@ void CXFA_Document::DoProtoMerge() {
     }
     CXFA_Node* pProtoNode = NULL;
     if (!wsSOM.IsEmpty()) {
-      FX_DWORD dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Attributes |
+      uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Attributes |
                         XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Parent |
                         XFA_RESOLVENODE_Siblings;
       XFA_RESOLVENODE_RS resoveNodeRS;
diff --git a/xfa/fxfa/parser/xfa_document_serialize.cpp b/xfa/fxfa/parser/xfa_document_serialize.cpp
index 858effff60..3df82e38f1 100644
--- a/xfa/fxfa/parser/xfa_document_serialize.cpp
+++ b/xfa/fxfa/parser/xfa_document_serialize.cpp
@@ -477,7 +477,7 @@ FX_BOOL CXFA_DataExporter::Export(IFX_FileWrite* pWrite) {
 }
 FX_BOOL CXFA_DataExporter::Export(IFX_FileWrite* pWrite,
                                   CXFA_Node* pNode,
-                                  FX_DWORD dwFlag,
+                                  uint32_t dwFlag,
                                   const FX_CHAR* pChecksum) {
   if (!pWrite) {
     ASSERT(false);
@@ -496,7 +496,7 @@ FX_BOOL CXFA_DataExporter::Export(IFX_FileWrite* pWrite,
 }
 FX_BOOL CXFA_DataExporter::Export(IFX_Stream* pStream,
                                   CXFA_Node* pNode,
-                                  FX_DWORD dwFlag,
+                                  uint32_t dwFlag,
                                   const FX_CHAR* pChecksum) {
   IFDE_XMLDoc* pXMLDoc = m_pDocument->GetParser()->GetXMLDoc();
   if (pNode->GetObjectType() == XFA_OBJECTTYPE_ModelNode) {
diff --git a/xfa/fxfa/parser/xfa_layout_appadapter.cpp b/xfa/fxfa/parser/xfa_layout_appadapter.cpp
index 3515dee1ee..b175cad9c6 100644
--- a/xfa/fxfa/parser/xfa_layout_appadapter.cpp
+++ b/xfa/fxfa/parser/xfa_layout_appadapter.cpp
@@ -19,8 +19,8 @@
 #include "xfa/fxfa/parser/xfa_script.h"
 #include "xfa/fxfa/parser/xfa_utils.h"
 
-FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant) {
-  FX_DWORD dwRelevant = XFA_LAYOUTSTATUS_Viewable | XFA_LAYOUTSTATUS_Printable;
+uint32_t XFA_GetRelevant(CXFA_Node* pFormItem, uint32_t dwParentRelvant) {
+  uint32_t dwRelevant = XFA_LAYOUTSTATUS_Viewable | XFA_LAYOUTSTATUS_Printable;
   CFX_WideStringC wsRelevant;
   if (pFormItem->TryCData(XFA_ATTRIBUTE_Relevant, wsRelevant)) {
     if (wsRelevant == FX_WSTRC(L"+print") || wsRelevant == FX_WSTRC(L"print")) {
diff --git a/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp b/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
index b46d882b54..61c0715f1a 100644
--- a/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
+++ b/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
@@ -1516,7 +1516,7 @@ void CXFA_LayoutPageMgr::SaveLayoutItem(CXFA_LayoutItem* pParentLayoutItem) {
   while (pCurLayoutItem) {
     pNextLayoutItem = pCurLayoutItem->m_pNextSibling;
     if (pCurLayoutItem->IsContentLayoutItem()) {
-      FX_DWORD dwFlag = pCurLayoutItem->m_pFormNode->GetFlag();
+      uint32_t dwFlag = pCurLayoutItem->m_pFormNode->GetFlag();
       if (dwFlag & (XFA_NODEFLAG_HasRemoved)) {
         IXFA_Notify* pNotify =
             m_pTemplatePageSetRoot->GetDocument()->GetParser()->GetNotify();
@@ -1793,12 +1793,12 @@ void CXFA_LayoutPageMgr::LayoutPageSetContents() {
 void XFA_SyncContainer(IXFA_Notify* pNotify,
                        IXFA_DocLayout* pDocLayout,
                        CXFA_LayoutItem* pContainerItem,
-                       FX_DWORD dwRelevant,
+                       uint32_t dwRelevant,
                        FX_BOOL bVisible,
                        int32_t nPageIndex) {
   FX_BOOL bVisibleItem = FALSE;
-  FX_DWORD dwStatus = 0;
-  FX_DWORD dwRelevantContainer = 0;
+  uint32_t dwStatus = 0;
+  uint32_t dwRelevantContainer = 0;
   if (bVisible) {
     XFA_ATTRIBUTEENUM eAttributeValue =
         pContainerItem->m_pFormNode->GetEnum(XFA_ATTRIBUTE_Presence);
@@ -1841,7 +1841,7 @@ void CXFA_LayoutPageMgr::SyncLayoutData() {
       switch (pContainerItem->m_pFormNode->GetClassID()) {
         case XFA_ELEMENT_PageArea: {
           nPageIdx++;
-          FX_DWORD dwRelevant =
+          uint32_t dwRelevant =
               XFA_LAYOUTSTATUS_Viewable | XFA_LAYOUTSTATUS_Printable;
           CXFA_NodeIteratorTemplate<CXFA_LayoutItem,
                                     CXFA_TraverseStrategy_LayoutItem>
@@ -1857,7 +1857,7 @@ void CXFA_LayoutPageMgr::SyncLayoutData() {
             FX_BOOL bVisible =
                 (pContentItem->m_pFormNode->GetEnum(XFA_ATTRIBUTE_Presence) ==
                  XFA_ATTRIBUTEENUM_Visible);
-            FX_DWORD dwRelevantChild =
+            uint32_t dwRelevantChild =
                 XFA_GetRelevant(pContentItem->m_pFormNode, dwRelevant);
             XFA_SyncContainer(pNotify, m_pLayoutProcessor, pContentItem,
                               dwRelevantChild, bVisible, nPageIdx);
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp
index dc511abf7c..ce638a3b97 100644
--- a/xfa/fxfa/parser/xfa_localemgr.cpp
+++ b/xfa/fxfa/parser/xfa_localemgr.cpp
@@ -1048,7 +1048,7 @@ static IFX_Locale* XFA_GetLocaleFromBuffer(const uint8_t* pBuf, int nBufLen) {
   }
   CXML_Element* pLocale = NULL;
   uint8_t* pOut = NULL;
-  FX_DWORD dwSize;
+  uint32_t dwSize;
   pCodecMgr->GetFlateModule()->FlateOrLZWDecode(FALSE, pBuf, nBufLen, TRUE, 0,
                                                 0, 0, 0, 0, pOut, dwSize);
   if (pOut) {
@@ -1066,8 +1066,8 @@ static uint16_t XFA_GetLanguage(CFX_WideString wsLanguage) {
     return dwLangueID;
   }
   wsLanguage.MakeLower();
-  FX_DWORD dwIDFirst = wsLanguage.GetAt(0) << 8 | wsLanguage.GetAt(1);
-  FX_DWORD dwIDSecond = wsLanguage.GetLength() >= 5
+  uint32_t dwIDFirst = wsLanguage.GetAt(0) << 8 | wsLanguage.GetAt(1);
+  uint32_t dwIDSecond = wsLanguage.GetLength() >= 5
                             ? wsLanguage.GetAt(3) << 8 | wsLanguage.GetAt(4)
                             : 0;
   switch (dwIDFirst) {
diff --git a/xfa/fxfa/parser/xfa_localevalue.cpp b/xfa/fxfa/parser/xfa_localevalue.cpp
index b7ee9d48ad..3c85622b0d 100644
--- a/xfa/fxfa/parser/xfa_localevalue.cpp
+++ b/xfa/fxfa/parser/xfa_localevalue.cpp
@@ -43,13 +43,13 @@ CXFA_LocaleValue::CXFA_LocaleValue(const CXFA_LocaleValue& value) {
   m_pLocaleMgr = NULL;
   *this = value;
 }
-CXFA_LocaleValue::CXFA_LocaleValue(FX_DWORD dwType,
+CXFA_LocaleValue::CXFA_LocaleValue(uint32_t dwType,
                                    CXFA_LocaleMgr* pLocaleMgr) {
   m_dwType = dwType;
   m_bValid = (m_dwType != XFA_VT_NULL);
   m_pLocaleMgr = pLocaleMgr;
 }
-CXFA_LocaleValue::CXFA_LocaleValue(FX_DWORD dwType,
+CXFA_LocaleValue::CXFA_LocaleValue(uint32_t dwType,
                                    const CFX_WideString& wsValue,
                                    CXFA_LocaleMgr* pLocaleMgr) {
   m_wsValue = wsValue;
@@ -57,7 +57,7 @@ CXFA_LocaleValue::CXFA_LocaleValue(FX_DWORD dwType,
   m_pLocaleMgr = pLocaleMgr;
   m_bValid = ValidateCanonicalValue(wsValue, dwType);
 }
-CXFA_LocaleValue::CXFA_LocaleValue(FX_DWORD dwType,
+CXFA_LocaleValue::CXFA_LocaleValue(uint32_t dwType,
                                    const CFX_WideString& wsValue,
                                    const CFX_WideString& wsFormat,
                                    IFX_Locale* pLocale,
@@ -76,7 +76,7 @@ CXFA_LocaleValue& CXFA_LocaleValue::operator=(const CXFA_LocaleValue& value) {
 }
 CXFA_LocaleValue::~CXFA_LocaleValue() {}
 static FX_LOCALECATEGORY XFA_ValugeCategory(FX_LOCALECATEGORY eCategory,
-                                            FX_DWORD dwValueType) {
+                                            uint32_t dwValueType) {
   if (eCategory == FX_LOCALECATEGORY_Unknown) {
     switch (dwValueType) {
       case XFA_VT_BOOLEAN:
@@ -193,11 +193,11 @@ FX_BOOL CXFA_LocaleValue::ValidateValue(const CFX_WideString& wsValue,
 CFX_WideString CXFA_LocaleValue::GetValue() const {
   return m_wsValue;
 }
-FX_DWORD CXFA_LocaleValue::GetType() const {
+uint32_t CXFA_LocaleValue::GetType() const {
   return m_dwType;
 }
 void CXFA_LocaleValue::SetValue(const CFX_WideString& wsValue,
-                                FX_DWORD dwType) {
+                                uint32_t dwType) {
   m_wsValue = wsValue;
   m_dwType = dwType;
 }
@@ -211,7 +211,7 @@ FX_FLOAT CXFA_LocaleValue::GetNum() const {
   if (m_bValid && (m_dwType == XFA_VT_BOOLEAN || m_dwType == XFA_VT_INTEGER ||
                    m_dwType == XFA_VT_DECIMAL || m_dwType == XFA_VT_FLOAT)) {
     int64_t nIntegral = 0;
-    FX_DWORD dwFractional = 0;
+    uint32_t dwFractional = 0;
     int32_t nExponent = 0;
     int cc = 0;
     FX_BOOL bNegative = FALSE, bExpSign = FALSE;
@@ -252,7 +252,7 @@ FX_FLOAT CXFA_LocaleValue::GetNum() const {
           break;
         }
       }
-      dwFractional = (FX_DWORD)(fraction * 4294967296.0);
+      dwFractional = (uint32_t)(fraction * 4294967296.0);
     }
     if (cc < len && (str[cc] == 'E' || str[cc] == 'e')) {
       cc++;
@@ -286,7 +286,7 @@ FX_DOUBLE CXFA_LocaleValue::GetDoubleNum() const {
   if (m_bValid && (m_dwType == XFA_VT_BOOLEAN || m_dwType == XFA_VT_INTEGER ||
                    m_dwType == XFA_VT_DECIMAL || m_dwType == XFA_VT_FLOAT)) {
     int64_t nIntegral = 0;
-    FX_DWORD dwFractional = 0;
+    uint32_t dwFractional = 0;
     int32_t nExponent = 0;
     int32_t cc = 0;
     FX_BOOL bNegative = FALSE, bExpSign = FALSE;
@@ -327,7 +327,7 @@ FX_DOUBLE CXFA_LocaleValue::GetDoubleNum() const {
           break;
         }
       }
-      dwFractional = (FX_DWORD)(fraction * 4294967296.0);
+      dwFractional = (uint32_t)(fraction * 4294967296.0);
     }
     if (cc < len && (str[cc] == 'E' || str[cc] == 'e')) {
       cc++;
@@ -551,7 +551,7 @@ static FX_BOOL XFA_ValueSplitDateTime(const CFX_WideString& wsDateTime,
   return TRUE;
 }
 FX_BOOL CXFA_LocaleValue::ValidateCanonicalValue(const CFX_WideString& wsValue,
-                                                 FX_DWORD dwVType) {
+                                                 uint32_t dwVType) {
   if (wsValue.IsEmpty()) {
     return TRUE;
   }
diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
index 1010a19102..fad2b26d4e 100644
--- a/xfa/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/fxfa/parser/xfa_object_imp.cpp
@@ -21,7 +21,7 @@
 #include "xfa/fxfa/parser/xfa_utils.h"
 #include "xfa/fxjse/cfxjse_arguments.h"
 
-CXFA_Object::CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags)
+CXFA_Object::CXFA_Object(CXFA_Document* pDocument, uint32_t uFlags)
     : m_pDocument(pDocument), m_uFlags(uFlags) {}
 void CXFA_Object::GetClassName(CFX_WideStringC& wsName) const {
   wsName = XFA_GetElementByID(GetClassID())->pName;
@@ -222,7 +222,7 @@ CXFA_Node* CXFA_Node::GetNodeItem(XFA_NODEITEM eItem,
   return pNode;
 }
 int32_t CXFA_Node::GetNodeList(CXFA_NodeArray& nodes,
-                               FX_DWORD dwTypeFilter,
+                               uint32_t dwTypeFilter,
                                XFA_ELEMENT eElementFilter,
                                int32_t iLevel) {
   if (--iLevel < 0) {
@@ -303,7 +303,7 @@ int32_t CXFA_Node::GetNodeList(CXFA_NodeArray& nodes,
   return nodes.GetSize();
 }
 CXFA_Node* CXFA_Node::CreateSamePacketNode(XFA_ELEMENT eElement,
-                                           FX_DWORD dwFlags) {
+                                           uint32_t dwFlags) {
   IXFA_ObjFactory* pFactory = m_pDocument->GetParser()->GetFactory();
   CXFA_Node* pNode = pFactory->CreateNode(m_ePacket, eElement);
   pNode->SetFlag(dwFlags);
@@ -638,7 +638,7 @@ void CXFA_Node::Script_TreeClass_ResolveNode(CFXJSE_Arguments* pArguments) {
   if (refNode->GetClassID() == XFA_ELEMENT_Xfa) {
     refNode = ToNode(pScriptContext->GetThisObject());
   }
-  FX_DWORD dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Attributes |
+  uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Attributes |
                     XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Parent |
                     XFA_RESOLVENODE_Siblings;
   XFA_RESOLVENODE_RS resoveNodeRS;
@@ -681,7 +681,7 @@ void CXFA_Node::Script_TreeClass_ResolveNodes(CFXJSE_Arguments* pArguments) {
   if (!hValue) {
     return;
   }
-  FX_DWORD dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Attributes |
+  uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Attributes |
                     XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Parent |
                     XFA_RESOLVENODE_Siblings;
   CXFA_Node* refNode = this;
@@ -692,7 +692,7 @@ void CXFA_Node::Script_TreeClass_ResolveNodes(CFXJSE_Arguments* pArguments) {
 }
 void CXFA_Node::Script_Som_ResolveNodeList(FXJSE_HVALUE hValue,
                                            CFX_WideString wsExpression,
-                                           FX_DWORD dwFlag,
+                                           uint32_t dwFlag,
                                            CXFA_Node* refNode) {
   IXFA_ScriptContext* pScriptContext = m_pDocument->GetScriptContext();
   if (!pScriptContext) {
@@ -729,7 +729,7 @@ void CXFA_Node::Script_TreeClass_All(FXJSE_HVALUE hValue,
   if (bSetting) {
     ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
   } else {
-    FX_DWORD dwFlag = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_ALL;
+    uint32_t dwFlag = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_ALL;
     CFX_WideString wsName;
     GetAttribute(XFA_ATTRIBUTE_Name, wsName);
     CFX_WideString wsExpression = wsName + FX_WSTRC(L"[*]");
@@ -761,7 +761,7 @@ void CXFA_Node::Script_TreeClass_ClassAll(FXJSE_HVALUE hValue,
   if (bSetting) {
     ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
   } else {
-    FX_DWORD dwFlag = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_ALL;
+    uint32_t dwFlag = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_ALL;
     CFX_WideStringC wsName;
     GetClassName(wsName);
     CFX_WideString wsExpression = FX_WSTRC(L"#") + wsName + FX_WSTRC(L"[*]");
@@ -1311,7 +1311,7 @@ void CXFA_Node::Script_Attribute_SendAttributeChangeMessage(
   if (!pNotify) {
     return;
   }
-  FX_DWORD dwPacket = GetPacketID();
+  uint32_t dwPacket = GetPacketID();
   if (dwPacket & XFA_XDPPACKET_Form) {
     FX_BOOL bNeedFindContainer = FALSE;
     XFA_ELEMENT eType = GetClassID();
@@ -1492,7 +1492,7 @@ void CXFA_Node::Script_Attribute_String(FXJSE_HVALUE hValue,
       }
       CXFA_Node* pProtoNode = NULL;
       if (!wsSOM.IsEmpty()) {
-        FX_DWORD dwFlag = XFA_RESOLVENODE_Children |
+        uint32_t dwFlag = XFA_RESOLVENODE_Children |
                           XFA_RESOLVENODE_Attributes |
                           XFA_RESOLVENODE_Properties | XFA_RESOLVENODE_Parent |
                           XFA_RESOLVENODE_Siblings;
@@ -2491,7 +2491,7 @@ static CXFA_Node* XFA_ScriptInstanceManager_GetItem(CXFA_Node* pInstMgrNode,
                                                     int32_t iIndex) {
   ASSERT(pInstMgrNode);
   int32_t iCount = 0;
-  FX_DWORD dwNameHash = 0;
+  uint32_t dwNameHash = 0;
   for (CXFA_Node* pNode = pInstMgrNode->GetNodeItem(XFA_NODEITEM_NextSibling);
        pNode; pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
     XFA_ELEMENT eCurType = pNode->GetClassID();
@@ -2821,7 +2821,7 @@ void CXFA_Node::Script_InstanceManager_Min(FXJSE_HVALUE hValue,
 static int32_t XFA_ScriptInstanceManager_GetCount(CXFA_Node* pInstMgrNode) {
   ASSERT(pInstMgrNode);
   int32_t iCount = 0;
-  FX_DWORD dwNameHash = 0;
+  uint32_t dwNameHash = 0;
   for (CXFA_Node* pNode = pInstMgrNode->GetNodeItem(XFA_NODEITEM_NextSibling);
        pNode; pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
     XFA_ELEMENT eCurType = pNode->GetClassID();
@@ -2883,7 +2883,7 @@ static void XFA_ScriptInstanceManager_ReorderDataNodes(CXFA_NodeSet& sSet1,
                                                        CXFA_NodeSet& sSet2,
                                                        FX_BOOL bInsertBefore) {
   CFX_MapPtrTemplate<CXFA_Node*,
-                     CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>*>
+                     CFX_MapPtrTemplate<uint32_t, CXFA_DualNodeArray*>*>
       rgNodeListMap;
   FX_POSITION pos;
   pos = sSet1.GetStartPosition();
@@ -2891,15 +2891,15 @@ static void XFA_ScriptInstanceManager_ReorderDataNodes(CXFA_NodeSet& sSet1,
     CXFA_Node* pNode = NULL;
     sSet1.GetNextAssoc(pos, pNode);
     CXFA_Node* pParentNode = pNode->GetNodeItem(XFA_NODEITEM_Parent);
-    FX_DWORD dwNameHash = pNode->GetNameHash();
+    uint32_t dwNameHash = pNode->GetNameHash();
     if (!pParentNode || !dwNameHash) {
       continue;
     }
-    CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>* pNodeListChildMap =
+    CFX_MapPtrTemplate<uint32_t, CXFA_DualNodeArray*>* pNodeListChildMap =
         rgNodeListMap[pParentNode];
     if (!pNodeListChildMap) {
       rgNodeListMap[pParentNode] = pNodeListChildMap =
-          new CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>;
+          new CFX_MapPtrTemplate<uint32_t, CXFA_DualNodeArray*>;
     }
     CXFA_DualNodeArray* pDualNodeArray = (*pNodeListChildMap)[dwNameHash];
     if (!pDualNodeArray) {
@@ -2913,15 +2913,15 @@ static void XFA_ScriptInstanceManager_ReorderDataNodes(CXFA_NodeSet& sSet1,
     CXFA_Node* pNode = NULL;
     sSet2.GetNextAssoc(pos, pNode);
     CXFA_Node* pParentNode = pNode->GetNodeItem(XFA_NODEITEM_Parent);
-    FX_DWORD dwNameHash = pNode->GetNameHash();
+    uint32_t dwNameHash = pNode->GetNameHash();
     if (!pParentNode || !dwNameHash) {
       continue;
     }
-    CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>* pNodeListChildMap =
+    CFX_MapPtrTemplate<uint32_t, CXFA_DualNodeArray*>* pNodeListChildMap =
         rgNodeListMap[pParentNode];
     if (!pNodeListChildMap) {
       rgNodeListMap[pParentNode] = pNodeListChildMap =
-          new CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>;
+          new CFX_MapPtrTemplate<uint32_t, CXFA_DualNodeArray*>;
     }
     CXFA_DualNodeArray* pDualNodeArray = (*pNodeListChildMap)[dwNameHash];
     if (!pDualNodeArray) {
@@ -2937,14 +2937,14 @@ static void XFA_ScriptInstanceManager_ReorderDataNodes(CXFA_NodeSet& sSet1,
   pos = rgNodeListMap.GetStartPosition();
   while (pos) {
     CXFA_Node* pParentNode = NULL;
-    CFX_MapPtrTemplate<FX_DWORD, CXFA_DualNodeArray*>* pNodeListChildMap = NULL;
+    CFX_MapPtrTemplate<uint32_t, CXFA_DualNodeArray*>* pNodeListChildMap = NULL;
     rgNodeListMap.GetNextAssoc(pos, pParentNode, pNodeListChildMap);
     if (!pNodeListChildMap) {
       continue;
     }
     FX_POSITION childpos = pNodeListChildMap->GetStartPosition();
     while (childpos) {
-      FX_DWORD dwNameHash = 0;
+      uint32_t dwNameHash = 0;
       CXFA_DualNodeArray* pDualNodeArray = NULL;
       pNodeListChildMap->GetNextAssoc(childpos, dwNameHash, pDualNodeArray);
       if (!pDualNodeArray) {
@@ -3294,7 +3294,7 @@ int32_t CXFA_Node::InstanceManager_SetInstances(int32_t iDesired) {
     CFX_WideString wsInstanceName = wsInstManagerName.IsEmpty()
                                         ? wsInstManagerName
                                         : wsInstManagerName.Mid(1);
-    FX_DWORD dInstanceNameHash =
+    uint32_t dInstanceNameHash =
         wsInstanceName.IsEmpty() ? 0 : FX_HashCode_String_GetW(
                                            wsInstanceName,
                                            wsInstanceName.GetLength());
@@ -3733,7 +3733,7 @@ enum XFA_KEYTYPE {
   XFA_KEYTYPE_Element,
 };
 void* XFA_GetMapKey_Custom(const CFX_WideStringC& wsKey) {
-  FX_DWORD dwKey = FX_HashCode_String_GetW(wsKey.GetPtr(), wsKey.GetLength());
+  uint32_t dwKey = FX_HashCode_String_GetW(wsKey.GetPtr(), wsKey.GetLength());
   return (void*)(uintptr_t)((dwKey << 1) | XFA_KEYTYPE_Custom);
 }
 void* XFA_GetMapKey_Element(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute) {
@@ -4495,7 +4495,7 @@ CXFA_Node* CXFA_Node::GetProperty(int32_t index,
                                   XFA_ELEMENT eProperty,
                                   FX_BOOL bCreateProperty) {
   XFA_ELEMENT eElement = GetClassID();
-  FX_DWORD dwPacket = GetPacketID();
+  uint32_t dwPacket = GetPacketID();
   const XFA_PROPERTY* pProperty =
       XFA_GetPropertyOfElement(eElement, eProperty, dwPacket);
   if (pProperty == NULL || index >= pProperty->uOccur) {
@@ -4737,7 +4737,7 @@ CXFA_Node* CXFA_Node::GetFirstChildByName(const CFX_WideStringC& wsName) const {
       wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.GetPtr(),
                                                      wsName.GetLength()));
 }
-CXFA_Node* CXFA_Node::GetFirstChildByName(FX_DWORD dwNameHash) const {
+CXFA_Node* CXFA_Node::GetFirstChildByName(uint32_t dwNameHash) const {
   for (CXFA_Node* pNode = GetNodeItem(XFA_NODEITEM_FirstChild); pNode;
        pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
     if (pNode->GetNameHash() == dwNameHash) {
@@ -4755,7 +4755,7 @@ CXFA_Node* CXFA_Node::GetFirstChildByClass(XFA_ELEMENT eElement) const {
   }
   return NULL;
 }
-CXFA_Node* CXFA_Node::GetNextSameNameSibling(FX_DWORD dwNameHash) const {
+CXFA_Node* CXFA_Node::GetNextSameNameSibling(uint32_t dwNameHash) const {
   for (CXFA_Node* pNode = GetNodeItem(XFA_NODEITEM_NextSibling); pNode;
        pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
     if (pNode->GetNameHash() == dwNameHash) {
@@ -4831,7 +4831,7 @@ CXFA_Node* CXFA_Node::GetInstanceMgrOfSubform() {
 CXFA_Node* CXFA_Node::GetOccurNode() {
   return GetFirstChildByClass(XFA_ELEMENT_Occur);
 }
-FX_BOOL CXFA_Node::HasFlag(FX_DWORD dwFlag) const {
+FX_BOOL CXFA_Node::HasFlag(uint32_t dwFlag) const {
   if (m_uFlags & dwFlag) {
     return TRUE;
   }
@@ -4843,7 +4843,7 @@ FX_BOOL CXFA_Node::HasFlag(FX_DWORD dwFlag) const {
   }
   return FALSE;
 }
-void CXFA_Node::SetFlag(FX_DWORD dwFlag, FX_BOOL bOn, FX_BOOL bNotify) {
+void CXFA_Node::SetFlag(uint32_t dwFlag, FX_BOOL bOn, FX_BOOL bNotify) {
   if (bOn) {
     switch (dwFlag) {
       case XFA_NODEFLAG_Initialized:
@@ -5241,7 +5241,7 @@ CXFA_NodeList::CXFA_NodeList(CXFA_Document* pDocument)
 }
 CXFA_Node* CXFA_NodeList::NamedItem(const CFX_WideStringC& wsName) {
   int32_t iCount = GetLength();
-  FX_DWORD dwHashCode =
+  uint32_t dwHashCode =
       FX_HashCode_String_GetW(wsName.GetPtr(), wsName.GetLength());
   for (int32_t i = 0; i < iCount; i++) {
     CXFA_Node* ret = Item(i);
diff --git a/xfa/fxfa/parser/xfa_objectacc_imp.cpp b/xfa/fxfa/parser/xfa_objectacc_imp.cpp
index d729eef028..72a18bcd3a 100644
--- a/xfa/fxfa/parser/xfa_objectacc_imp.cpp
+++ b/xfa/fxfa/parser/xfa_objectacc_imp.cpp
@@ -829,7 +829,7 @@ FX_FLOAT CXFA_Stroke::GetRadius() const {
   return m_pNode ? m_pNode->GetMeasure(XFA_ATTRIBUTE_Radius).ToUnit(XFA_UNIT_Pt)
                  : 0;
 }
-FX_BOOL CXFA_Stroke::SameStyles(CXFA_Stroke stroke, FX_DWORD dwFlags) const {
+FX_BOOL CXFA_Stroke::SameStyles(CXFA_Stroke stroke, uint32_t dwFlags) const {
   if (m_pNode == stroke.GetNode()) {
     return TRUE;
   }
@@ -1236,7 +1236,7 @@ CXFA_Node* CXFA_WidgetData::GetSelectedMember() {
 CXFA_Node* CXFA_WidgetData::SetSelectedMember(const CFX_WideStringC& wsName,
                                               FX_BOOL bNotify) {
   CXFA_Node* pSelectedMember = NULL;
-  FX_DWORD nameHash =
+  uint32_t nameHash =
       FX_HashCode_String_GetW(wsName.GetPtr(), wsName.GetLength());
   for (CXFA_Node* pNode = ToNode(m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild));
        pNode; pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
@@ -2189,7 +2189,7 @@ FX_BOOL CXFA_WidgetData::GetPictureContent(CFX_WideString& wsPicture,
       if (!pLocale) {
         return FALSE;
       }
-      FX_DWORD dwType = widgetValue.GetType();
+      uint32_t dwType = widgetValue.GetType();
       switch (dwType) {
         case XFA_VT_DATE:
           pLocale->GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY_Medium,
@@ -2229,7 +2229,7 @@ FX_BOOL CXFA_WidgetData::GetPictureContent(CFX_WideString& wsPicture,
         if (!pLocale) {
           return FALSE;
         }
-        FX_DWORD dwType = widgetValue.GetType();
+        uint32_t dwType = widgetValue.GetType();
         switch (dwType) {
           case XFA_VT_DATE:
             pLocale->GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY_Short,
diff --git a/xfa/fxfa/parser/xfa_parser_imp.cpp b/xfa/fxfa/parser/xfa_parser_imp.cpp
index 638ce8b248..efddc427a6 100644
--- a/xfa/fxfa/parser/xfa_parser_imp.cpp
+++ b/xfa/fxfa/parser/xfa_parser_imp.cpp
@@ -245,7 +245,7 @@ static FX_BOOL XFA_FDEExtension_MatchNodeName(
     IFDE_XMLNode* pNode,
     const CFX_WideStringC& wsLocalTagName,
     const CFX_WideStringC& wsNamespaceURIPrefix,
-    FX_DWORD eMatchFlags = XFA_XDPPACKET_FLAGS_NOMATCH) {
+    uint32_t eMatchFlags = XFA_XDPPACKET_FLAGS_NOMATCH) {
   if (!pNode || pNode->GetType() != FDE_XMLNODE_Element) {
     return FALSE;
   }
diff --git a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp
index 5282019f70..3f415e2a75 100644
--- a/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp
@@ -53,7 +53,7 @@ void Script_EventPseudoModel_BooleanProperty(FXJSE_HVALUE hValue,
 }
 void CScript_EventPseudoModel::Script_EventPseudoModel_Property(
     FXJSE_HVALUE hValue,
-    FX_DWORD dwFlag,
+    uint32_t dwFlag,
     FX_BOOL bSetting) {
   IXFA_ScriptContext* pScriptContext = m_pDocument->GetScriptContext();
   if (!pScriptContext) {
diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
index 4165790ed7..e2bc9dc857 100644
--- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
@@ -25,7 +25,7 @@ CScript_HostPseudoModel::~CScript_HostPseudoModel() {}
 void CScript_HostPseudoModel::Script_HostPseudoModel_LoadString(
     FXJSE_HVALUE hValue,
     IXFA_Notify* pNotify,
-    FX_DWORD dwFlag) {
+    uint32_t dwFlag) {
   CFX_WideString wsValue;
   pNotify->GetAppProvider()->LoadString(dwFlag, wsValue);
   FXJSE_Value_SetUTF8String(hValue, FX_UTF8Encode(wsValue));
@@ -323,7 +323,7 @@ void CScript_HostPseudoModel::Script_HostPseudoModel_OpenList(
         FXJSE_Value_Release(hValue);
         return;
       }
-      FX_DWORD dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Parent |
+      uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Parent |
                         XFA_RESOLVENODE_Siblings;
       XFA_RESOLVENODE_RS resoveNodeRS;
       int32_t iRet = pScriptContext->ResolveObjects(pObject, wsExpression,
@@ -457,7 +457,7 @@ void CScript_HostPseudoModel::Script_HostPseudoModel_ResetData(
     if (!pObject) {
       return;
     }
-    FX_DWORD dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Parent |
+    uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Parent |
                       XFA_RESOLVENODE_Siblings;
     XFA_RESOLVENODE_RS resoveNodeRS;
     int32_t iRet =
@@ -486,7 +486,7 @@ void CScript_HostPseudoModel::Script_HostPseudoModel_Beep(
   if (!pNotify) {
     return;
   }
-  FX_DWORD dwType = 4;
+  uint32_t dwType = 4;
   if (iLength >= 1) {
     dwType = pArguments->GetInt32(0);
   }
@@ -526,7 +526,7 @@ void CScript_HostPseudoModel::Script_HostPseudoModel_SetFocus(
         FXJSE_Value_Release(hValue);
         return;
       }
-      FX_DWORD dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Parent |
+      uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Parent |
                         XFA_RESOLVENODE_Siblings;
       XFA_RESOLVENODE_RS resoveNodeRS;
       int32_t iRet = pScriptContext->ResolveObjects(pObject, wsExpression,
@@ -570,8 +570,8 @@ void CScript_HostPseudoModel::Script_HostPseudoModel_MessageBox(
   }
   CFX_WideString wsMessage;
   CFX_WideString bsTitle;
-  FX_DWORD dwMessageType = XFA_MBICON_Error;
-  FX_DWORD dwButtonType = XFA_MB_OK;
+  uint32_t dwMessageType = XFA_MBICON_Error;
+  uint32_t dwButtonType = XFA_MB_OK;
   if (iLength >= 1) {
     if (!Script_HostPseudoModel_ValidateArgsForMsg(pArguments, 0, wsMessage)) {
       return;
@@ -656,7 +656,7 @@ void CScript_HostPseudoModel::Script_HostPseudoModel_Print(
     return;
   }
   IXFA_Doc* hDoc = pNotify->GetHDOC();
-  FX_DWORD dwOptions = 0;
+  uint32_t dwOptions = 0;
   FX_BOOL bShowDialog = TRUE;
   if (iLength >= 1) {
     bShowDialog = pArguments->GetInt32(0) == 0 ? FALSE : TRUE;
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index 48ae6b4923..e20a4e0b2a 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -116,7 +116,7 @@ void CXFA_ScriptContext::GlobalPropertySetter(FXJSE_HOBJECT hObject,
   CXFA_Object* lpCurNode = lpScriptContext->GetVariablesThis(lpOrginalNode);
   CFX_WideString wsPropName = CFX_WideString::FromUTF8(
       (const FX_CHAR*)szPropName.GetPtr(), szPropName.GetLength());
-  FX_DWORD dwFlag = XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings |
+  uint32_t dwFlag = XFA_RESOLVENODE_Parent | XFA_RESOLVENODE_Siblings |
                     XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
                     XFA_RESOLVENODE_Attributes;
   CXFA_Node* pRefNode = ToNode(lpScriptContext->GetThisObject());
@@ -143,7 +143,7 @@ void CXFA_ScriptContext::GlobalPropertySetter(FXJSE_HOBJECT hObject,
 FX_BOOL CXFA_ScriptContext::QueryNodeByFlag(CXFA_Node* refNode,
                                             const CFX_WideStringC& propname,
                                             FXJSE_HVALUE hValue,
-                                            FX_DWORD dwFlag,
+                                            uint32_t dwFlag,
                                             FX_BOOL bSetting) {
   if (!refNode)
     return false;
@@ -191,7 +191,7 @@ void CXFA_ScriptContext::GlobalPropertyGetter(FXJSE_HOBJECT hObject,
       }
     }
   }
-  FX_DWORD dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
+  uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
                     XFA_RESOLVENODE_Attributes;
   CXFA_Node* pRefNode = ToNode(lpScriptContext->GetThisObject());
   if (pOrginalObject->GetObjectType() == XFA_OBJECTTYPE_VariablesThis) {
@@ -240,7 +240,7 @@ void CXFA_ScriptContext::NormalPropertyGetter(FXJSE_HOBJECT hObject,
     FXJSE_Value_Set(hValue, pValue);
     return;
   }
-  FX_DWORD dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
+  uint32_t dwFlag = XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties |
                     XFA_RESOLVENODE_Attributes;
   FX_BOOL bRet = lpScriptContext->QueryNodeByFlag(ToNode(pObject), wsPropName,
                                                   hValue, dwFlag, FALSE);
@@ -563,7 +563,7 @@ FXJSE_HCLASS CXFA_ScriptContext::GetJseNormalClass() {
 int32_t CXFA_ScriptContext::ResolveObjects(CXFA_Object* refNode,
                                            const CFX_WideStringC& wsExpression,
                                            XFA_RESOLVENODE_RS& resolveNodeRS,
-                                           FX_DWORD dwStyles,
+                                           uint32_t dwStyles,
                                            CXFA_Node* bindNode) {
   if (wsExpression.IsEmpty()) {
     return 0;
diff --git a/xfa/fxfa/parser/xfa_script_nodehelper.cpp b/xfa/fxfa/parser/xfa_script_nodehelper.cpp
index 6d106e9d64..d7a1e29d9d 100644
--- a/xfa/fxfa/parser/xfa_script_nodehelper.cpp
+++ b/xfa/fxfa/parser/xfa_script_nodehelper.cpp
@@ -69,7 +69,7 @@ int32_t CXFA_NodeHelper::XFA_CountSiblings(CXFA_Node* pNode,
 }
 int32_t CXFA_NodeHelper::XFA_NodeAcc_TraverseAnySiblings(
     CXFA_Node* parent,
-    FX_DWORD dNameHash,
+    uint32_t dNameHash,
     CXFA_NodeArray* pSiblings,
     FX_BOOL bIsClassName) {
   if (parent == NULL || pSiblings == NULL) {
@@ -128,7 +128,7 @@ int32_t CXFA_NodeHelper::XFA_NodeAcc_TraverseAnySiblings(
   return nCount;
 }
 int32_t CXFA_NodeHelper::XFA_NodeAcc_TraverseSiblings(CXFA_Node* parent,
-                                                      FX_DWORD dNameHash,
+                                                      uint32_t dNameHash,
                                                       CXFA_NodeArray* pSiblings,
                                                       XFA_LOGIC_TYPE eLogicType,
                                                       FX_BOOL bIsClassName,
@@ -242,7 +242,7 @@ int32_t CXFA_NodeHelper::XFA_GetIndex(CXFA_Node* pNode,
       return 0;
     }
   }
-  FX_DWORD dwHashName = pNode->GetNameHash();
+  uint32_t dwHashName = pNode->GetNameHash();
   if (bIsClassIndex) {
     dwHashName = pNode->GetClassHashCode();
   }
diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
index 6573c0676f..3467471c5f 100644
--- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
@@ -122,7 +122,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Dollar(
   if (rnd.m_nLevel > 0) {
     return -1;
   }
-  FX_DWORD dwNameHash =
+  uint32_t dwNameHash =
       FX_HashCode_String_GetW((const FX_WCHAR*)wsName + 1, iNameLen - 1);
   if (dwNameHash == XFA_HASHCODE_Xfa) {
     nodes.Add(rnd.m_pSC->GetDocument()->GetRoot());
@@ -218,7 +218,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(
   CXFA_Node* curNode = ToNode(rnd.m_CurNode);
   CXFA_ObjArray& nodes = rnd.m_Nodes;
   int32_t nNum = nodes.GetSize();
-  FX_DWORD dwStyles = rnd.m_dwStyles;
+  uint32_t dwStyles = rnd.m_dwStyles;
   CFX_WideString& wsName = rnd.m_wsName;
   uint32_t uNameHash = rnd.m_uHashName;
   CFX_WideString& wsCondition = rnd.m_wsCondition;
@@ -391,7 +391,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(
   }
   if (dwStyles & XFA_RESOLVENODE_Siblings) {
     CXFA_Node* child = parentNode->GetNodeItem(XFA_NODEITEM_FirstChild);
-    FX_DWORD dwSubStyles =
+    uint32_t dwSubStyles =
         XFA_RESOLVENODE_Children | XFA_RESOLVENODE_Properties;
     if (dwStyles & XFA_RESOLVENODE_TagName) {
       dwSubStyles |= XFA_RESOLVENODE_TagName;
@@ -443,7 +443,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(
         rndFind.m_CurNode = child;
         CFX_WideString wsOriginCondition = rndFind.m_wsCondition;
         rndFind.m_wsCondition.Empty();
-        FX_DWORD dwOriginStyle = rndFind.m_dwStyles;
+        uint32_t dwOriginStyle = rndFind.m_dwStyles;
         rndFind.m_dwStyles = dwOriginStyle | XFA_RESOLVENODE_ALL;
         XFA_ResolveNodes_Normal(rndFind);
         rndFind.m_dwStyles = dwOriginStyle;
@@ -476,7 +476,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(
     }
   }
   if (dwStyles & XFA_RESOLVENODE_Parent) {
-    FX_DWORD dwSubStyles = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent |
+    uint32_t dwSubStyles = XFA_RESOLVENODE_Siblings | XFA_RESOLVENODE_Parent |
                            XFA_RESOLVENODE_Properties;
     if (dwStyles & XFA_RESOLVENODE_TagName) {
       dwSubStyles |= XFA_RESOLVENODE_TagName;
@@ -782,9 +782,9 @@ void CXFA_ResolveProcessor::XFA_ResolveNode_FilterCondition(
   }
 }
 void CXFA_ResolveProcessor::XFA_ResolveNodes_SetStylesForChild(
-    FX_DWORD dwParentStyles,
+    uint32_t dwParentStyles,
     CXFA_ResolveNodesData& rnd) {
-  FX_DWORD dwSubStyles = XFA_RESOLVENODE_Children;
+  uint32_t dwSubStyles = XFA_RESOLVENODE_Children;
   if (dwParentStyles & XFA_RESOLVENODE_TagName) {
     dwSubStyles |= XFA_RESOLVENODE_TagName;
   }
diff --git a/xfa/fxfa/parser/xfa_utils_imp.cpp b/xfa/fxfa/parser/xfa_utils_imp.cpp
index af0630f6ec..5e8881e192 100644
--- a/xfa/fxfa/parser/xfa_utils_imp.cpp
+++ b/xfa/fxfa/parser/xfa_utils_imp.cpp
@@ -316,7 +316,7 @@ FX_DOUBLE XFA_WideStringToDouble(const CFX_WideString& wsStringVal) {
   wsValue.TrimLeft();
   wsValue.TrimRight();
   int64_t nIntegral = 0;
-  FX_DWORD dwFractional = 0;
+  uint32_t dwFractional = 0;
   int32_t nExponent = 0;
   int32_t cc = 0;
   FX_BOOL bNegative = FALSE, bExpSign = FALSE;
@@ -361,7 +361,7 @@ FX_DOUBLE XFA_WideStringToDouble(const CFX_WideString& wsStringVal) {
         return 0;
       }
     }
-    dwFractional = (FX_DWORD)(fraction * 4294967296.0);
+    dwFractional = (uint32_t)(fraction * 4294967296.0);
   }
   if (cc < len && (str[cc] == 'E' || str[cc] == 'e')) {
     cc++;