summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r--xfa/fxfa/parser/xfa_basic_imp.cpp24
-rw-r--r--xfa/fxfa/parser/xfa_document_datadescription_imp.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_document_datamerger_imp.cpp24
-rw-r--r--xfa/fxfa/parser/xfa_document_imp.cpp10
-rw-r--r--xfa/fxfa/parser/xfa_document_serialize.cpp4
-rw-r--r--xfa/fxfa/parser/xfa_layout_appadapter.cpp4
-rw-r--r--xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp12
-rw-r--r--xfa/fxfa/parser/xfa_localemgr.cpp6
-rw-r--r--xfa/fxfa/parser/xfa_localevalue.cpp22
-rw-r--r--xfa/fxfa/parser/xfa_object_imp.cpp58
-rw-r--r--xfa/fxfa/parser/xfa_objectacc_imp.cpp8
-rw-r--r--xfa/fxfa/parser/xfa_parser_imp.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_script_eventpseudomodel.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp16
-rw-r--r--xfa/fxfa/parser/xfa_script_imp.cpp10
-rw-r--r--xfa/fxfa/parser/xfa_script_nodehelper.cpp6
-rw-r--r--xfa/fxfa/parser/xfa_script_resolveprocessor.cpp14
-rw-r--r--xfa/fxfa/parser/xfa_utils_imp.cpp4
18 files changed, 114 insertions, 114 deletions
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++;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 21:18:28 +0000