Remove FX_DWORD from XFA, part 2

xfa/fxfa/parser/xfa_object.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_OBJECT_H_
 #define XFA_FXFA_PARSER_XFA_OBJECT_H_
 
 #include "xfa/fde/xml/fde_xml.h"
@@ skipping 23 matching lines @@
   XFA_NODEFLAG_NeedsInitApp = 0x00400,
   XFA_NODEFLAG_BindFormItems = 0x00800,
   XFA_NODEFLAG_UserInteractive = 0x01000,
   XFA_NODEFLAG_SkipDataBinding = 0x02000,
   XFA_NODEFLAG_OwnXMLNode = 0x04000,
   XFA_NODEFLAG_UnusedNode = 0x08000,
   XFA_NODEFLAG_LayoutGeneratedNode = 0x10000,
 };
 class CXFA_Object {
  public:
-  CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags);
+  CXFA_Object(CXFA_Document* pDocument, uint32_t uFlags);
   CXFA_Document* GetDocument() const { return m_pDocument; }
-  FX_DWORD GetFlag() const { return m_uFlags; }
+  uint32_t GetFlag() const { return m_uFlags; }
   XFA_OBJECTTYPE GetObjectType() const {
     return (XFA_OBJECTTYPE)(m_uFlags & XFA_OBJECTTYPEMASK);
   }
 
   FX_BOOL IsNode() const {
     return (m_uFlags & XFA_OBJECTTYPEMASK) >= XFA_OBJECTTYPE_Node;
   }
   FX_BOOL IsOrdinaryObject() const {
     return (m_uFlags & XFA_OBJECTTYPEMASK) == XFA_OBJECTTYPE_OrdinaryObject;
   }
@@ skipping 21 matching lines @@
   XFA_ELEMENT GetClassID() const;
   void GetClassName(CFX_WideStringC& wsName) const;
   uint32_t GetClassHashCode() const;
   void Script_ObjectClass_ClassName(FXJSE_HVALUE hValue,
                                     FX_BOOL bSetting,
                                     XFA_ATTRIBUTE eAttribute);
   void ThrowScriptErrorMessage(int32_t iStringID, ...);
 
  protected:
   CXFA_Document* const m_pDocument;
-  FX_DWORD m_uFlags;
+  uint32_t m_uFlags;
 };
 
 #define XFA_NODEFILTER_Children 0x01
 #define XFA_NODEFILTER_Properties 0x02
 #define XFA_NODEFILTER_OneOfProperty 0x04
 #define XFA_CLONEFLAG_Content 0x01
 enum XFA_NODEITEM {
   XFA_NODEITEM_Parent,
   XFA_NODEITEM_FirstChild,
   XFA_NODEITEM_NextSibling,
@@ skipping 25 matching lines @@
   CFX_MapPtrToPtr m_ValueMap;
   CFX_MapPtrTemplate<void*, XFA_MAPDATABLOCK*> m_BufferMap;
 };
 
 #define XFA_CalcRefCount (void*)(uintptr_t) FXBSTR_ID('X', 'F', 'A', 'R')
 #define XFA_CalcData (void*)(uintptr_t) FXBSTR_ID('X', 'F', 'A', 'C')
 #define XFA_LAYOUTITEMKEY (void*)(uintptr_t) FXBSTR_ID('L', 'Y', 'I', 'M')
 class CXFA_Node : public CXFA_Object {
  public:
   XFA_ELEMENT GetClassID() const { return (XFA_ELEMENT)m_eNodeClass; }
-  FX_DWORD GetPacketID() const { return m_ePacket; }
-  FX_BOOL HasFlag(FX_DWORD dwFlag) const;
-  void SetFlag(FX_DWORD dwFlag, FX_BOOL bOn = TRUE, FX_BOOL bNotify = TRUE);
+  uint32_t GetPacketID() const { return m_ePacket; }
+  FX_BOOL HasFlag(uint32_t dwFlag) const;
+  void SetFlag(uint32_t dwFlag, FX_BOOL bOn = TRUE, FX_BOOL bNotify = TRUE);
   FX_BOOL IsAttributeInXML();
   FX_BOOL IsFormContainer() {
     return m_ePacket == XFA_XDPPACKET_Form && IsContainerNode();
   }
   void SetXMLMappingNode(IFDE_XMLNode* pXMLNode) { m_pXMLNode = pXMLNode; }
   IFDE_XMLNode* GetXMLMappingNode() const { return m_pXMLNode; }
   IFDE_XMLNode* CreateXMLMappingNode();
   FX_BOOL IsNeedSavingXMLNode();
-  FX_DWORD GetNameHash() const { return m_dwNameHash; }
+  uint32_t GetNameHash() const { return m_dwNameHash; }
   bool IsUnnamed() const { return m_dwNameHash == 0; }
   CXFA_Node* GetModelNode();
   void UpdateNameHash();
   FX_BOOL HasAttribute(XFA_ATTRIBUTE eAttr, FX_BOOL bCanInherit = FALSE);
   FX_BOOL SetAttribute(XFA_ATTRIBUTE eAttr,
                        const CFX_WideStringC& wsValue,
                        FX_BOOL bNotify = FALSE);
   FX_BOOL GetAttribute(XFA_ATTRIBUTE eAttr,
                        CFX_WideString& wsValue,
                        FX_BOOL bUseDefault = TRUE);
@@ skipping 105 matching lines @@
   CXFA_Node* GetChild(int32_t index,
                       XFA_ELEMENT eElement,
                       FX_BOOL bOnlyChild = FALSE);
   int32_t InsertChild(int32_t index, CXFA_Node* pNode);
   FX_BOOL InsertChild(CXFA_Node* pNode, CXFA_Node* pBeforeNode = NULL);
   FX_BOOL RemoveChild(CXFA_Node* pNode, FX_BOOL bNotify = TRUE);
   CXFA_Node* Clone(FX_BOOL bRecursive);
   CXFA_Node* GetNodeItem(XFA_NODEITEM eItem) const;
   CXFA_Node* GetNodeItem(XFA_NODEITEM eItem, XFA_OBJECTTYPE eType) const;
   int32_t GetNodeList(CXFA_NodeArray& nodes,
-                      FX_DWORD dwTypeFilter = XFA_NODEFILTER_Children |
+                      uint32_t dwTypeFilter = XFA_NODEFILTER_Children |
                                               XFA_NODEFILTER_Properties,
                       XFA_ELEMENT eElementFilter = XFA_ELEMENT_UNKNOWN,
                       int32_t iLevel = 1);
   CXFA_Node* CreateSamePacketNode(XFA_ELEMENT eElement,
-                                  FX_DWORD dwFlags = XFA_NODEFLAG_Initialized);
+                                  uint32_t dwFlags = XFA_NODEFLAG_Initialized);
   CXFA_Node* CloneTemplateToForm(FX_BOOL bRecursive);
   CXFA_Node* GetTemplateNode() const;
   void SetTemplateNode(CXFA_Node* pTemplateNode);
   CXFA_Node* GetDataDescriptionNode();
   void SetDataDescriptionNode(CXFA_Node* pDataDescriptionNode);
   CXFA_Node* GetBindData();
   int32_t GetBindItems(CXFA_NodeArray& formItems);
   int32_t AddBindItem(CXFA_Node* pFormNode);
   int32_t RemoveBindItem(CXFA_Node* pFormNode);
   FX_BOOL HasBindItem();
   CXFA_WidgetData* GetWidgetData();
   CXFA_WidgetData* GetContainerWidgetData();
   FX_BOOL GetLocaleName(CFX_WideString& wsLocaleName);
   XFA_ATTRIBUTEENUM GetIntact();
   CXFA_Node* GetFirstChildByName(const CFX_WideStringC& wsNodeName) const;
-  CXFA_Node* GetFirstChildByName(FX_DWORD dwNodeNameHash) const;
+  CXFA_Node* GetFirstChildByName(uint32_t dwNodeNameHash) const;
   CXFA_Node* GetFirstChildByClass(XFA_ELEMENT eNodeClass) const;
-  CXFA_Node* GetNextSameNameSibling(FX_DWORD dwNodeNameHash) const;
+  CXFA_Node* GetNextSameNameSibling(uint32_t dwNodeNameHash) const;
   CXFA_Node* GetNextSameNameSibling(const CFX_WideStringC& wsNodeName) const;
   CXFA_Node* GetNextSameClassSibling(XFA_ELEMENT eNodeClass) const;
   int32_t GetNodeSameNameIndex() const;
   int32_t GetNodeSameClassIndex() const;
   void GetSOMExpression(CFX_WideString& wsSOMExpression);
   CXFA_Node* GetInstanceMgrOfSubform();
 
   CXFA_Node* GetOccurNode();
   void Script_TreeClass_ResolveNode(CFXJSE_Arguments* pArguments);
   void Script_TreeClass_ResolveNodes(CFXJSE_Arguments* pArguments);
   void Script_Som_ResolveNodeList(FXJSE_HVALUE hValue,
                                   CFX_WideString wsExpression,
-                                  FX_DWORD dwFlag,
+                                  uint32_t dwFlag,
                                   CXFA_Node* refNode = NULL);
   void Script_TreeClass_All(FXJSE_HVALUE hValue,
                             FX_BOOL bSetting,
                             XFA_ATTRIBUTE eAttribute);
   void Script_TreeClass_Nodes(FXJSE_HVALUE hValue,
                               FX_BOOL bSetting,
                               XFA_ATTRIBUTE eAttribute);
   void Script_TreeClass_ClassAll(FXJSE_HVALUE hValue,
                                  FX_BOOL bSetting,
                                  XFA_ATTRIBUTE eAttribute);
@@ skipping 316 matching lines @@
                          void* pKey,
                          FX_BOOL bRecursive = FALSE);
 
   CXFA_Node* m_pNext;
   CXFA_Node* m_pChild;
   CXFA_Node* m_pLastChild;
   CXFA_Node* m_pParent;
   IFDE_XMLNode* m_pXMLNode;
   XFA_ELEMENT m_eNodeClass;
   uint16_t m_ePacket;
-  FX_DWORD m_dwNameHash;
+  uint32_t m_dwNameHash;
   CXFA_Node* m_pAuxNode;
   XFA_MAPMODULEDATA* m_pMapModuleData;
 };
 class CXFA_OrdinaryObject : public CXFA_Object {
  public:
   CXFA_OrdinaryObject(CXFA_Document* pDocument, XFA_ELEMENT eElement)
       : CXFA_Object(pDocument, XFA_OBJECTTYPE_OrdinaryObject),
         m_uScriptHash(0) {
     m_eNodeClass = eElement;
   }
@@ skipping 140 matching lines @@
   return pObj ? pObj->AsNode() : nullptr;
 }
 inline const CXFA_OrdinaryObject* ToOrdinaryObject(const CXFA_Object* pObj) {
   return pObj ? pObj->AsOrdinaryObject() : nullptr;
 }
 inline const CXFA_NodeList* ToNodeList(const CXFA_Object* pObj) {
   return pObj ? pObj->AsNodeList() : nullptr;
 }
 
 #endif  // XFA_FXFA_PARSER_XFA_OBJECT_H_