Remove FX_DWORD from XFA, part 2

xfa/fxfa/parser/xfa_document.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FXFA_PARSER_XFA_DOCUMENT_H_
 #define XFA_FXFA_PARSER_XFA_DOCUMENT_H_
 
 #include "xfa/fxfa/parser/xfa_localemgr.h"
@@ skipping 64 matching lines @@
                            XFA_PAGEEVENT eEvent,
                            void* pParam = NULL) = 0;
 
   virtual void OnNodeEvent(CXFA_Node* pSender,
                            XFA_NODEEVENT eEvent,
                            void* pParam = NULL,
                            void* pParam2 = NULL,
                            void* pParam3 = NULL,
                            void* pParam4 = NULL) = 0;
   virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender,
-                                 FX_DWORD dwEvent,
+                                 uint32_t dwEvent,
                                  void* pParam = NULL,
                                  void* pAdditional = NULL,
                                  void* pAdditional2 = NULL) = 0;
 
   virtual CXFA_LayoutItem* OnCreateLayoutItem(CXFA_Node* pNode) = 0;
   virtual void OnLayoutEvent(IXFA_DocLayout* pLayout,
                              CXFA_LayoutItem* pSender,
                              XFA_LAYOUTEVENT eEvent,
                              void* pParam = NULL,
                              void* pParam2 = NULL) = 0;
@@ skipping 20 matching lines @@
   virtual void ResetData(CXFA_WidgetData* pWidgetData = NULL) = 0;
   virtual int32_t GetLayoutStatus() = 0;
   virtual void RunNodeInitialize(CXFA_Node* pNode) = 0;
   virtual void RunSubformIndexChange(CXFA_Node* pSubformNode) = 0;
   virtual CXFA_Node* GetFocusWidgetNode() = 0;
   virtual void SetFocusWidgetNode(CXFA_Node* pNode) = 0;
 };
 class IXFA_ObjFactory {
  public:
   virtual ~IXFA_ObjFactory() {}
-  virtual CXFA_Node* CreateNode(FX_DWORD dwPacket, XFA_ELEMENT eElement) = 0;
+  virtual CXFA_Node* CreateNode(uint32_t dwPacket, XFA_ELEMENT eElement) = 0;
   virtual CXFA_Node* CreateNode(const XFA_PACKETINFO* pPacket,
                                 XFA_ELEMENT eElement) = 0;
 };
 #define XFA_DOCFLAG_StrictScoping 0x0001
 #define XFA_DOCFLAG_HasInteractive 0x0002
 #define XFA_DOCFLAG_Interactive 0x0004
 #define XFA_DOCFLAG_Scripting 0x0008
 class CScript_DataWindow;
 class CScript_EventPseudoModel;
 class CScript_HostPseudoModel;
 class CScript_LogPseudoModel;
 class CScript_LayoutPseudoModel;
 class CScript_SignaturePseudoModel;
 class CXFA_Document : public IXFA_ObjFactory {
  public:
   CXFA_Document(IXFA_DocParser* pParser);
   ~CXFA_Document();
   CXFA_Node* GetRoot() const { return m_pRootNode; }
   IXFA_DocParser* GetParser() const { return m_pParser; }
   IXFA_Notify* GetNotify() const;
   void SetRoot(CXFA_Node* pNewRoot);
   CXFA_Object* GetXFAObject(const CFX_WideStringC& wsNodeName);
-  CXFA_Object* GetXFAObject(FX_DWORD wsNodeNameHash);
+  CXFA_Object* GetXFAObject(uint32_t wsNodeNameHash);
   void AddPurgeNode(CXFA_Node* pNode);
   FX_BOOL RemovePurgeNode(CXFA_Node* pNode);
   void PurgeNodes();
-  bool HasFlag(FX_DWORD dwFlag) { return (m_dwDocFlags & dwFlag) == dwFlag; }
-  void SetFlag(FX_DWORD dwFlag, FX_BOOL bOn = TRUE);
+  bool HasFlag(uint32_t dwFlag) { return (m_dwDocFlags & dwFlag) == dwFlag; }
+  void SetFlag(uint32_t dwFlag, FX_BOOL bOn = TRUE);
   FX_BOOL IsInteractive();
   XFA_VERSION GetCurVersionMode() { return m_eCurVersionMode; }
   XFA_VERSION RecognizeXFAVersionNumber(CFX_WideString& wsTemplateNS);
   CXFA_LocaleMgr* GetLocalMgr();
-  virtual CXFA_Node* CreateNode(FX_DWORD dwPacket, XFA_ELEMENT eElement);
+  virtual CXFA_Node* CreateNode(uint32_t dwPacket, XFA_ELEMENT eElement);
   virtual CXFA_Node* CreateNode(const XFA_PACKETINFO* pPacket,
                                 XFA_ELEMENT eElement);
   void DoProtoMerge();
   CXFA_Node* GetNodeByID(CXFA_Node* pRoot, const CFX_WideStringC& wsID);
   void DoDataMerge();
   void DoDataRemerge(FX_BOOL bDoDataMerge);
   CXFA_Node* DataMerge_CopyContainer(CXFA_Node* pTemplateNode,
                                      CXFA_Node* pFormNode,
                                      CXFA_Node* pDataScope,
                                      FX_BOOL bOneInstance = FALSE,
                                      FX_BOOL bDataMerge = TRUE,
                                      FX_BOOL bUpLevel = TRUE);
   void DataMerge_UpdateBindingRelations(CXFA_Node* pFormUpdateRoot);
   CXFA_Node* GetNotBindNode(CXFA_ObjArray& arrayNodes);
   CXFA_LayoutProcessor* GetLayoutProcessor();
   IXFA_DocLayout* GetDocLayout();
   IXFA_ScriptContext* InitScriptContext(FXJSE_HRUNTIME hRuntime);
   IXFA_ScriptContext* GetScriptContext();
   void ClearLayoutData();
 
-  CFX_MapPtrTemplate<FX_DWORD, CXFA_Node*> m_rgGlobalBinding;
+  CFX_MapPtrTemplate<uint32_t, CXFA_Node*> m_rgGlobalBinding;
   CXFA_NodeArray m_pPendingPageSet;
 
  protected:
   IXFA_DocParser* m_pParser;
   IXFA_ScriptContext* m_pScriptContext;
   CXFA_LayoutProcessor* m_pLayoutProcessor;
   CXFA_Node* m_pRootNode;
   CXFA_LocaleMgr* m_pLocalMgr;
   CScript_DataWindow* m_pScriptDataWindow;
   CScript_EventPseudoModel* m_pScriptEvent;
   CScript_HostPseudoModel* m_pScriptHost;
   CScript_LogPseudoModel* m_pScriptLog;
   CScript_LayoutPseudoModel* m_pScriptLayout;
   CScript_SignaturePseudoModel* m_pScriptSignature;
   CXFA_NodeSet m_rgPurgeNodes;
   XFA_VERSION m_eCurVersionMode;
-  FX_DWORD m_dwDocFlags;
+  uint32_t m_dwDocFlags;
   friend class CXFA_SimpleParser;
 };
 
 #endif  // XFA_FXFA_PARSER_XFA_DOCUMENT_H_