Merge to XFA: Use stdint.h types throughout PDFium.

xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../foxitlib.h"
 #include "../common/xfa_utils.h"
 #include "../common/xfa_object.h"
 #include "../common/xfa_document.h"
@@ skipping 13 matching lines @@
 {
     m_pNodeHelper = FX_NEW CXFA_NodeHelper;
 }
 CXFA_ResolveProcessor::~CXFA_ResolveProcessor(void)
 {
     if(m_pNodeHelper) {
         delete m_pNodeHelper;
         m_pNodeHelper = NULL;
     }
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes(CXFA_ResolveNodesData &rnd)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes(CXFA_ResolveNodesData &rnd)
 {
     if (rnd.m_CurNode == NULL) {
         return -1;
     }
     if(!rnd.m_CurNode->IsNode()) {
         if(rnd.m_dwStyles & XFA_RESOLVENODE_Attributes) {
             return XFA_ResolveNodes_ForAttributeRs(rnd.m_CurNode, rnd, rnd.m_wsName);
         }
         return 0;
     }
@@ skipping 25 matching lines @@
         } else if (rnd.m_uHashName == XFA_HASHCODE_Xfa) {
             rnd.m_Nodes.Add(rnd.m_CurNode);
         } else if ((rnd.m_dwStyles & XFA_RESOLVENODE_Attributes) && XFA_ResolveNodes_ForAttributeRs(rnd.m_CurNode, rnd, rnd.m_wsName)) {
             return 1;
         }
         if (rnd.m_Nodes.GetSize() > 0) {
             XFA_ResolveNode_FilterCondition(rnd, rnd.m_wsCondition);
         }
         return rnd.m_Nodes.GetSize();
     }
-    FX_INT32 nRet = XFA_ResolveNodes_Normal(rnd);
+    int32_t nRet = XFA_ResolveNodes_Normal(rnd);
     if (nRet < 1 && rnd.m_uHashName == XFA_HASHCODE_Xfa) {
         rnd.m_Nodes.Add(rnd.m_pSC->GetDocument()->GetRoot());
     }
     return rnd.m_Nodes.GetSize();
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes_AnyChild(CXFA_ResolveNodesData &rnd)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_AnyChild(CXFA_ResolveNodesData &rnd)
 {
     CFX_WideString wsName = rnd.m_wsName.Right(rnd.m_wsName.GetLength() - 1);
     CFX_WideString wsCondition = rnd.m_wsCondition;
     CXFA_Node* findNode = NULL;
     CXFA_NodeArray siblings;
     FX_BOOL bClassName = FALSE;
     if(wsName.GetAt(0) == '#') {
         bClassName = TRUE;
         wsName = wsName.Right(wsName.GetLength() - 1);
     }
     findNode = m_pNodeHelper->XFA_ResolveNodes_GetOneChild((CXFA_Node*)rnd.m_CurNode, wsName, bClassName);
     if (findNode == NULL) {
         return 0;
     }
     if (wsCondition.IsEmpty()) {
         rnd.m_Nodes.Add(findNode);
         return rnd.m_Nodes.GetSize();
     }
     m_pNodeHelper->XFA_CountSiblings(findNode, XFA_LOGIC_Transparent, (CXFA_NodeArray*)&rnd.m_Nodes, bClassName);
     XFA_ResolveNode_FilterCondition(rnd, wsCondition);
     return rnd.m_Nodes.GetSize();
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes_Dollar(CXFA_ResolveNodesData &rnd)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Dollar(CXFA_ResolveNodesData &rnd)
 {
     CXFA_ObjArray &nodes = rnd.m_Nodes;
     CFX_WideString wsName = rnd.m_wsName;
     CFX_WideString wsCondition = rnd.m_wsCondition;
-    FX_INT32 iNameLen = wsName.GetLength();
+    int32_t iNameLen = wsName.GetLength();
     if (iNameLen == 1) {
         nodes.Add(rnd.m_CurNode);
         return 1;
     }
     if (rnd.m_nLevel > 0) {
         return -1;
     }
     FX_DWORD dwNameHash = FX_HashCode_String_GetW((FX_LPCWSTR)wsName + 1, iNameLen - 1);
     if (dwNameHash == XFA_HASHCODE_Xfa) {
         nodes.Add(rnd.m_pSC->GetDocument()->GetRoot());
     } else {
         CXFA_Object* pObjNode = rnd.m_pSC->GetDocument()->GetXFANode(dwNameHash);
         if(pObjNode) {
             rnd.m_Nodes.Add(pObjNode);
         }
     }
     if (rnd.m_Nodes.GetSize() > 0) {
         XFA_ResolveNode_FilterCondition(rnd, wsCondition);
     }
     return rnd.m_Nodes.GetSize();
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes_Excalmatory(CXFA_ResolveNodesData &rnd)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Excalmatory(CXFA_ResolveNodesData &rnd)
 {
     if (rnd.m_nLevel > 0) {
         return 0;
     }
     CXFA_Node* datasets = (CXFA_Node*)rnd.m_pSC->GetDocument()->GetXFANode(XFA_HASHCODE_Datasets);
     if (datasets == NULL) {
         return 0;
     }
     CXFA_ResolveNodesData rndFind;
     rndFind.m_pSC = rnd.m_pSC;
     rndFind.m_CurNode = datasets;
     rndFind.m_wsName = rnd.m_wsName.Right(rnd.m_wsName.GetLength() - 1);
     rndFind.m_uHashName = FX_HashCode_String_GetW(rndFind.m_wsName, rndFind.m_wsName.GetLength());
     rndFind.m_nLevel = rnd.m_nLevel + 1;
     rndFind.m_dwStyles = XFA_RESOLVENODE_Children;
     rndFind.m_wsCondition = rnd.m_wsCondition;
     XFA_ResolveNodes(rndFind);
     if (rndFind.m_Nodes.GetSize() > 0) {
         rnd.m_Nodes.Append(rndFind.m_Nodes);
         rndFind.m_Nodes.RemoveAll();
     }
     return rnd.m_Nodes.GetSize();
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes_NumberSign(CXFA_ResolveNodesData &rnd)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_NumberSign(CXFA_ResolveNodesData &rnd)
 {
     FX_DWORD dwStyles = rnd.m_dwStyles;
     CFX_WideString wsName = rnd.m_wsName.Right(rnd.m_wsName.GetLength() - 1);
     CFX_WideString wsCondition = rnd.m_wsCondition;
     CXFA_Node* curNode = (CXFA_Node*)rnd.m_CurNode;
     if(XFA_ResolveNodes_ForAttributeRs(curNode, rnd, wsName)) {
         return 1;
     }
     CXFA_ResolveNodesData rndFind;
     rndFind.m_pSC = rnd.m_pSC;
     rndFind.m_nLevel = rnd.m_nLevel + 1;
     rndFind.m_dwStyles = rnd.m_dwStyles;
     rndFind.m_dwStyles |= XFA_RESOLVENODE_TagName;
     rndFind.m_dwStyles &= ~XFA_RESOLVENODE_Attributes;
     rndFind.m_wsName = wsName;
     rndFind.m_uHashName = FX_HashCode_String_GetW(rndFind.m_wsName, rndFind.m_wsName.GetLength());
     rndFind.m_wsCondition = wsCondition;
     rndFind.m_CurNode = curNode;
     XFA_ResolveNodes_Normal(rndFind);
     if (rndFind.m_Nodes.GetSize() > 0) {
         if(wsCondition.GetLength() == 0 && rndFind.m_Nodes.Find(curNode) >= 0) {
             rnd.m_Nodes.Add(curNode);
         } else {
             rnd.m_Nodes.Append(rndFind.m_Nodes);
             rndFind.m_Nodes.RemoveAll();
         }
     }
     return rnd.m_Nodes.GetSize();
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes_ForAttributeRs(CXFA_Object* curNode, CXFA_ResolveNodesData &rnd, FX_WSTR strAttr)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_ForAttributeRs(CXFA_Object* curNode, CXFA_ResolveNodesData &rnd, FX_WSTR strAttr)
 {
     XFA_LPCSCRIPTATTRIBUTEINFO lpScriptAttribute = XFA_GetScriptAttributeByName(curNode->GetClassID(), strAttr);
     if(lpScriptAttribute) {
         rnd.m_pScriptAttribute = lpScriptAttribute;
         rnd.m_Nodes.Add(curNode);
         rnd.m_dwFlag = XFA_RESOVENODE_RSTYPE_Attribute;
         return 1;
     }
     return 0;
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(CXFA_ResolveNodesData &rnd)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Normal(CXFA_ResolveNodesData &rnd)
 {
     if (rnd.m_nLevel > 32) {
         return 0;
     }
     if(!rnd.m_CurNode->IsNode()) {
         return 0;
     }
     CXFA_Node* curNode = (CXFA_Node*)rnd.m_CurNode;
     CXFA_ObjArray &nodes = rnd.m_Nodes;
-    FX_INT32 nNum = nodes.GetSize();
+    int32_t nNum = nodes.GetSize();
     FX_DWORD dwStyles = rnd.m_dwStyles;
     CFX_WideString &wsName = rnd.m_wsName;
-    FX_UINT32 uNameHash = rnd.m_uHashName;
+    uint32_t uNameHash = rnd.m_uHashName;
     CFX_WideString &wsCondition = rnd.m_wsCondition;
     CXFA_ResolveNodesData rndFind;
     rndFind.m_wsName = rnd.m_wsName;
     rndFind.m_wsCondition = rnd.m_wsCondition;
     rndFind.m_pSC = rnd.m_pSC;
     rndFind.m_nLevel = rnd.m_nLevel + 1;
     rndFind.m_uHashName = uNameHash;
     CXFA_NodeArray children;
     CXFA_NodeArray properties;
     CXFA_Node*  pVariablesNode = NULL;
@@ skipping 12 matching lines @@
             XFA_LPCPROPERTY pPropert = XFA_GetPropertyOfElement(curNode->GetClassID(), pChild->GetClassID(), XFA_XDPPACKET_UNKNOWN);
             if(pPropert) {
                 properties.Add(pChild);
             } else {
                 children.Add(pChild);
             }
         }
         pChild = pChild->GetNodeItem(XFA_NODEITEM_NextSibling);
     }
     if((dwStyles & XFA_RESOLVENODE_Properties) && pVariablesNode) {
-        FX_UINT32 uPropHash = pVariablesNode->GetClassHashCode();
+        uint32_t uPropHash = pVariablesNode->GetClassHashCode();
         if (uPropHash == uNameHash) {
             nodes.Add(pVariablesNode);
         } else {
             rndFind.m_CurNode = pVariablesNode;
             XFA_ResolveNodes_SetStylesForChild(dwStyles, rndFind);
             CFX_WideString wsSaveCondition = rndFind.m_wsCondition;
             rndFind.m_wsCondition.Empty();
             XFA_ResolveNodes_Normal(rndFind);
             rndFind.m_wsCondition = wsSaveCondition;
             if (rndFind.m_Nodes.GetSize() > 0) {
                 nodes.Append(rndFind.m_Nodes);
                 rndFind.m_Nodes.RemoveAll();
             }
         }
         if (nodes.GetSize() > nNum) {
             XFA_ResolveNode_FilterCondition(rnd, wsCondition);
             if (nodes.GetSize() > 0) {
                 return 1;
             }
             return 0;
         }
     }
     if (dwStyles & XFA_RESOLVENODE_Children) {
         FX_BOOL bSetFlag = FALSE;
         if(pPageSetNode && (dwStyles & XFA_RESOLVENODE_Properties)) {
             children.Add(pPageSetNode);
         }
-        for(FX_INT32 i = 0; i < children.GetSize(); i++) {
+        for(int32_t i = 0; i < children.GetSize(); i++) {
             CXFA_Node* child = children[i];
             if (dwStyles & XFA_RESOLVENODE_TagName) {
                 if (child->GetClassHashCode() == uNameHash) {
                     nodes.Add(child);
                 }
             } else if (child->GetNameHash() == uNameHash) {
                 nodes.Add(child);
             }
             if (m_pNodeHelper->XFA_NodeIsTransparent(child) && child->GetClassID() != XFA_ELEMENT_PageSet) {
                 if(!bSetFlag) {
@@ skipping 31 matching lines @@
             return 0;
         }
     }
     if (dwStyles & XFA_RESOLVENODE_Attributes) {
         if(XFA_ResolveNodes_ForAttributeRs(curNode, rnd, wsName)) {
             return 1;
         }
     }
     if (dwStyles & XFA_RESOLVENODE_Properties) {
         FX_BOOL bSetFlag = FALSE;
-        for(FX_INT32 i = 0; i < properties.GetSize(); i++) {
+        for(int32_t i = 0; i < properties.GetSize(); i++) {
             CXFA_Node* childProperty = properties[i];
             if(childProperty->IsUnnamed()) {
-                FX_UINT32 uPropHash = childProperty->GetClassHashCode();
+                uint32_t uPropHash = childProperty->GetClassHashCode();
                 XFA_ELEMENT eName = childProperty->GetClassID();
                 if (uPropHash == uNameHash) {
                     nodes.Add(childProperty);
                 }
             } else if(childProperty->GetNameHash() == uNameHash && childProperty->GetClassID() != XFA_ELEMENT_Extras
                       && childProperty->GetClassID() != XFA_ELEMENT_Items) {
                 nodes.Add(childProperty);
             }
         }
         if (nodes.GetSize() > nNum) {
@@ skipping 14 matching lines @@
             if (pElement) {
                 pProp = ((CXFA_Node*)curNode)->GetProperty(0, pElement->eName, pElement->eName != XFA_ELEMENT_PageSet);
             }
         }
         if (pProp) {
             nodes.Add(pProp);
             return nodes.GetSize();
         }
     }
     CXFA_Node* parentNode = m_pNodeHelper->XFA_ResolveNodes_GetParent((CXFA_Node *)curNode, XFA_LOGIC_NoTransparent);
-    FX_UINT32 uCurClassHash = curNode->GetClassHashCode();
+    uint32_t uCurClassHash = curNode->GetClassHashCode();
     if (parentNode == NULL) {
         if(uCurClassHash == uNameHash) {
             nodes.Add((CXFA_Node*)curNode);
             XFA_ResolveNode_FilterCondition(rnd, wsCondition);
             if(nodes.GetSize() > 0) {
                 return 1;
             }
         }
         return 0;
     }
@@ skipping 94 matching lines @@
         if (rndFind.m_Nodes.GetSize() > 0) {
             nodes.Append(rndFind.m_Nodes);
             rndFind.m_Nodes.RemoveAll();
         }
         if (nodes.GetSize() > nNum) {
             return 1;
         }
     }
     return 0;
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes_Asterisk(CXFA_ResolveNodesData &rnd)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_Asterisk(CXFA_ResolveNodesData &rnd)
 {
     CXFA_Node* curNode = (CXFA_Node*)rnd.m_CurNode;
     CXFA_ObjArray &nodes = rnd.m_Nodes;
     CXFA_NodeArray array;
     curNode->GetNodeList(array, XFA_NODEFILTER_Children | XFA_NODEFILTER_Properties);
     nodes.Append((CXFA_ObjArray &)array);
     return nodes.GetSize();
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes_PopStack(CFX_Int32Array &stack)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_PopStack(CFX_Int32Array &stack)
 {
-    FX_INT32 nType = -1;
-    FX_INT32 iSize = stack.GetSize() - 1;
+    int32_t nType = -1;
+    int32_t iSize = stack.GetSize() - 1;
     if (iSize > -1) {
         nType = stack[iSize];
         stack.RemoveAt(iSize, 1);
     }
     return nType;
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNodes_GetFilter(FX_WSTR wsExpression, FX_INT32 nStart, CXFA_ResolveNodesData &rnd)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_GetFilter(FX_WSTR wsExpression, int32_t nStart, CXFA_ResolveNodesData &rnd)
 {
     FXSYS_assert(nStart > -1);
-    FX_INT32 iLength = wsExpression.GetLength();
+    int32_t iLength = wsExpression.GetLength();
     if (nStart >= iLength) {
         return 0;
     }
     CFX_WideString& wsName = rnd.m_wsName;
     CFX_WideString& wsCondition = rnd.m_wsCondition;
     FX_LPWSTR pNameBuf = wsName.GetBuffer(iLength - nStart);
     FX_LPWSTR pConditionBuf = wsCondition.GetBuffer(iLength - nStart);
-    FX_INT32 nCount = 0;
-    FX_INT32 nNameCount = 0;
-    FX_INT32 nConditionCount = 0;
+    int32_t nCount = 0;
+    int32_t nNameCount = 0;
+    int32_t nConditionCount = 0;
     CFX_Int32Array stack;
-    FX_INT32 nType = -1;
+    int32_t nType = -1;
     FX_LPCWSTR pSrc = wsExpression.GetPtr();
     FX_WCHAR wPrev = 0, wCur;
     FX_BOOL bIsCondition = FALSE;
     while (nStart < iLength) {
         wCur = pSrc[nStart ++];
         if (wCur == '.') {
             if (wPrev == '\\') {
                 pNameBuf[nNameCount - 1] = wPrev = '.';
                 continue;
             }
@@ skipping 62 matching lines @@
     }
     wsName.ReleaseBuffer(nNameCount);
     wsName.TrimLeft();
     wsName.TrimRight();
     wsCondition.ReleaseBuffer(nConditionCount);
     wsCondition.TrimLeft();
     wsCondition.TrimRight();
     rnd.m_uHashName = FX_HashCode_String_GetW(wsName, wsName.GetLength());
     return nStart;
 }
-void CXFA_ResolveProcessor::XFA_ResolveNode_ConditionArray(FX_INT32 iCurIndex, CFX_WideString wsCondition, FX_INT32 iFoundCount, CXFA_ResolveNodesData &rnd)
+void CXFA_ResolveProcessor::XFA_ResolveNode_ConditionArray(int32_t iCurIndex, CFX_WideString wsCondition, int32_t iFoundCount, CXFA_ResolveNodesData &rnd)
 {
     CXFA_NodeArray &findNodes = (CXFA_NodeArray&)rnd.m_Nodes;
-    FX_INT32 iLen = wsCondition.GetLength();
+    int32_t iLen = wsCondition.GetLength();
     FX_BOOL bRelative = FALSE;
     FX_BOOL bAll = FALSE;
-    FX_INT32 i = 1;
+    int32_t i = 1;
     for (; i < iLen; ++i) {
         FX_WCHAR ch = wsCondition[i];
         if (ch == ' ') {
             continue;
         }
         if (ch == '+' || ch == '-') {
             bRelative = TRUE;
             break;
         } else if (ch == '*') {
             bAll = TRUE;
@@ skipping 21 matching lines @@
                 m_pNodeHelper->m_iCurAllStart = m_iCurStart;
             }
         }
         return;
     }
     if (iFoundCount == 1 && !iLen) {
         return;
     }
     CFX_WideString wsIndex;
     wsIndex = wsCondition.Mid(i, iLen - 1 - i);
-    FX_INT32 iIndex = wsIndex.GetInteger();
+    int32_t iIndex = wsIndex.GetInteger();
     if (bRelative) {
         iIndex += iCurIndex;
     }
     if (iFoundCount <= iIndex || iIndex < 0) {
         if(rnd.m_dwStyles & XFA_RESOLVENODE_CreateNode) {
             m_pNodeHelper->m_pCreateParent = (CXFA_Node*)rnd.m_CurNode;
             m_pNodeHelper->m_iCreateCount = iIndex - iFoundCount + 1;
         }
         findNodes.RemoveAll();
     } else {
         CXFA_Node* ret = findNodes[iIndex];
         findNodes.RemoveAll();
         findNodes.Add(ret);
     }
 }
-void CXFA_ResolveProcessor::XFA_ResolveNode_DoPredicateFilter(FX_INT32 iCurIndex, CFX_WideString wsCondition, FX_INT32 iFoundCount, CXFA_ResolveNodesData &rnd)
+void CXFA_ResolveProcessor::XFA_ResolveNode_DoPredicateFilter(int32_t iCurIndex, CFX_WideString wsCondition, int32_t iFoundCount, CXFA_ResolveNodesData &rnd)
 {
     CXFA_NodeArray &findNodes = (CXFA_NodeArray&)rnd.m_Nodes;
     FXSYS_assert(iFoundCount == findNodes.GetSize());
     CFX_WideString wsExpression;
     IXFA_ScriptContext* pContext = NULL;
     XFA_SCRIPTLANGTYPE eLangType = XFA_SCRIPTLANGTYPE_Unkown;
     if (wsCondition.Left(2) == FX_WSTRC(L".[") && wsCondition.Right(1) == FX_WSTRC(L"]")) {
         eLangType = XFA_SCRIPTLANGTYPE_Formcalc;
     } else if (wsCondition.Left(2) == FX_WSTRC(L".(") && wsCondition.Right(1) == FX_WSTRC(L")")) {
         eLangType = XFA_SCRIPTLANGTYPE_Javascript;
     } else {
         return;
     }
     pContext = rnd.m_pSC;
     wsExpression = wsCondition.Mid(2, wsCondition.GetLength() - 3);
-    for(FX_INT32 i = iFoundCount - 1; i >= 0; i--) {
+    for(int32_t i = iFoundCount - 1; i >= 0; i--) {
         CXFA_Object* node = findNodes[i];
         FX_BOOL bRet = FALSE;
         FXJSE_HVALUE pRetValue = FXJSE_Value_Create(rnd.m_pSC->GetRuntime());
         bRet = pContext->RunScript(eLangType, wsExpression, pRetValue, node);
         if(!bRet || !FXJSE_Value_ToBoolean(pRetValue)) {
             findNodes.RemoveAt(i);
         }
         FXJSE_Value_Release(pRetValue);
     }
     return;
 }
 void CXFA_ResolveProcessor::XFA_ResolveNode_FilterCondition(CXFA_ResolveNodesData &rnd, CFX_WideString wsCondition)
 {
     CXFA_NodeArray &findNodes = (CXFA_NodeArray&)rnd.m_Nodes;
-    FX_INT32 iCurrIndex = 0;
+    int32_t iCurrIndex = 0;
     const CXFA_NodeArray &array = rnd.m_pSC->GetUpObjectArray();
-    FX_INT32 iSize = array.GetSize();
+    int32_t iSize = array.GetSize();
     if (iSize) {
         CXFA_Node* curNode = array[iSize - 1];
         FX_BOOL bIsProperty =  m_pNodeHelper->XFA_NodeIsProperty(curNode);
         if(curNode->IsUnnamed() || (bIsProperty && curNode->GetClassID() != XFA_ELEMENT_PageSet)) {
             iCurrIndex = m_pNodeHelper->XFA_GetIndex(curNode, XFA_LOGIC_Transparent, bIsProperty, TRUE);
         } else {
             iCurrIndex = m_pNodeHelper->XFA_GetIndex(curNode, XFA_LOGIC_Transparent, bIsProperty, FALSE);
         }
     }
-    FX_INT32 iFoundCount = findNodes.GetSize();
+    int32_t iFoundCount = findNodes.GetSize();
     wsCondition.TrimLeft();
     wsCondition.TrimRight();
-    FX_INT32 iLen = wsCondition.GetLength();
+    int32_t iLen = wsCondition.GetLength();
     if (!iLen) {
         if (rnd.m_dwStyles & XFA_RESOLVENODE_ALL) {
             return;
         }
         if (iFoundCount == 1) {
             return;
         }
         if (iFoundCount <= iCurrIndex) {
             if(rnd.m_dwStyles & XFA_RESOLVENODE_CreateNode) {
                 m_pNodeHelper->m_pCreateParent = (CXFA_Node*)rnd.m_CurNode;
@@ skipping 30 matching lines @@
     FX_DWORD dwSubStyles = XFA_RESOLVENODE_Children;
     if (dwParentStyles & XFA_RESOLVENODE_TagName) {
         dwSubStyles |= XFA_RESOLVENODE_TagName;
     }
     dwSubStyles &= ~XFA_RESOLVENODE_Parent;
     dwSubStyles &= ~XFA_RESOLVENODE_Siblings;
     dwSubStyles &= ~XFA_RESOLVENODE_Properties;
     dwSubStyles |= XFA_RESOLVENODE_ALL;
     rnd.m_dwStyles = dwSubStyles;
 }
-FX_INT32 CXFA_ResolveProcessor::XFA_ResolveNode_SetResultCreateNode(XFA_RESOLVENODE_RS& resolveNodeRS, CFX_WideString &wsLastCondition)
+int32_t CXFA_ResolveProcessor::XFA_ResolveNode_SetResultCreateNode(XFA_RESOLVENODE_RS& resolveNodeRS, CFX_WideString &wsLastCondition)
 {
     if(m_pNodeHelper->m_pCreateParent) {
         resolveNodeRS.nodes.Add(m_pNodeHelper->m_pCreateParent);
     } else {
         m_pNodeHelper->XFA_CreateNode_ForCondition(wsLastCondition);
     }
     resolveNodeRS.dwFlags = m_pNodeHelper->m_iCreateFlag;
     if(resolveNodeRS.dwFlags == XFA_RESOLVENODE_RSTYPE_CreateNodeOne) {
         if(m_pNodeHelper->m_iCurAllStart != -1) {
             resolveNodeRS.dwFlags = XFA_RESOLVENODE_RSTYPE_CreateNodeMidAll;
         }
     }
     return resolveNodeRS.nodes.GetSize();
 }
-void CXFA_ResolveProcessor::XFA_ResolveNode_SetIndexDataBind(CFX_WideString &wsNextCondition, FX_INT32 &iIndex, FX_INT32 iCount)
+void CXFA_ResolveProcessor::XFA_ResolveNode_SetIndexDataBind(CFX_WideString &wsNextCondition, int32_t &iIndex, int32_t iCount)
 {
     if(m_pNodeHelper->XFA_CreateNode_ForCondition(wsNextCondition)) {
         if(m_pNodeHelper->m_eLastCreateType == XFA_ELEMENT_DataGroup) {
             iIndex = 0;
         } else {
             iIndex = iCount - 1;
         }
     } else {
         iIndex = iCount - 1;
     }
 }