From 269ef77ccbb20db68c0b5049bb6a3a867623db64 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 8 Nov 2017 17:11:21 +0000 Subject: Fix XFA_SCRIPTATTRIBUTEINFO attribute type This CL changes XFA_SCRIPTATTRIBUTEINFO attribute field to be a XFA_ATTRIBUTE from an in32_t. This necessitated adding an XFA_ATTRIBUTE_Unknown and updating the various -1 values in the script data description. Change-Id: I837602e38b3785d7c8515830fae8dc427d449e9f Reviewed-on: https://pdfium-review.googlesource.com/18030 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/fxfa_basic.h | 7 +- xfa/fxfa/parser/xfa_basic_data_element_script.cpp | 529 +++++++++++----------- xfa/fxfa/parser/xfa_resolvenode_rs.h | 5 +- xfa/fxfa/parser/xfa_utils.cpp | 6 +- 4 files changed, 275 insertions(+), 272 deletions(-) (limited to 'xfa') diff --git a/xfa/fxfa/fxfa_basic.h b/xfa/fxfa/fxfa_basic.h index be8fcf2833..ccd44cdc13 100644 --- a/xfa/fxfa/fxfa_basic.h +++ b/xfa/fxfa/fxfa_basic.h @@ -367,6 +367,8 @@ enum XFA_ATTRIBUTEENUM { XFA_ATTRIBUTEENUM_Lowered, }; enum XFA_ATTRIBUTE { + XFA_ATTRIBUTE_Unknown = -1, + XFA_ATTRIBUTE_H, XFA_ATTRIBUTE_W, XFA_ATTRIBUTE_X, @@ -995,7 +997,7 @@ enum XFA_UNIT { struct XFA_NOTSUREATTRIBUTE { XFA_Element eElement; - XFA_ATTRIBUTE eAttribute; + XFA_ATTRIBUTE attribute; XFA_ATTRIBUTETYPE eType; void* pValue; }; @@ -1014,11 +1016,12 @@ enum XFA_SCRIPT_TYPE { XFA_SCRIPT_Basic, XFA_SCRIPT_Object, }; + struct XFA_SCRIPTATTRIBUTEINFO { uint32_t uHash; const wchar_t* pName; XFA_ATTRIBUTE_CALLBACK callback; - int32_t eAttribute; + XFA_ATTRIBUTE attribute; uint16_t eValueType; }; diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp index a7af40ceba..906f4e3fde 100644 --- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp +++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp @@ -446,8 +446,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0x1ee2d24d, L"instanceIndex", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_InstanceIndex, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_InstanceIndex, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x8c99377e, L"relation", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Relation, XFA_SCRIPT_Basic}, @@ -515,8 +515,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue_Read, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue_Read, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xf6b47749, L"lock", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_BOOL, XFA_ATTRIBUTE_Lock, XFA_SCRIPT_Basic}, @@ -704,7 +704,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_BOOL, XFA_ATTRIBUTE_Lock, XFA_SCRIPT_Basic}, {0x2d574d58, L"this", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Xfa_This, - -1, XFA_SCRIPT_Object}, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0x4fdc3454, L"timeStamp", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_TimeStamp, XFA_SCRIPT_Basic}, @@ -1060,14 +1060,14 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_BOOL, XFA_ATTRIBUTE_Lock, XFA_SCRIPT_Basic}, {0x6c0d9600, L"currentValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Delta_CurrentValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Delta_CurrentValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x942643f0, L"savedValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Delta_SavedValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Delta_SavedValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc8da4da7, L"target", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Delta_Target, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Delta_Target, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, @@ -1174,26 +1174,26 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_MaxChars, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, @@ -1258,14 +1258,14 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -1317,8 +1317,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0x1abbd7e0, L"dataNode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DataNode, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DataNode, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0x25839852, L"access", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Access, XFA_SCRIPT_Basic}, @@ -1326,26 +1326,26 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Rotate, XFA_SCRIPT_Basic}, {0x3b1ddd06, L"fillColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FillColor, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FillColor, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x54c399e3, L"formattedValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_FormattedValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_FormattedValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x570ce835, L"presence", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Presence, XFA_SCRIPT_Basic}, {0x5a3b375d, L"borderColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderColor, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderColor, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x5e936ed6, L"fontColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FontColor, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FontColor, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x6826c408, L"parentSubform", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_ParentSubform, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_ParentSubform, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x79b67434, L"mandatoryMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_MandatoryMessage, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_MandatoryMessage, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x7a7cc341, L"vAlign", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_VAlign, XFA_SCRIPT_Basic}, @@ -1362,23 +1362,23 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_MinW, XFA_SCRIPT_Basic}, {0x85fd6faf, L"mandatory", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_Mandatory, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_Mandatory, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x8e1c2921, L"relevant", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Relevant, XFA_SCRIPT_Basic}, {0x964fb42e, L"formatMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_FormatMessage, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_FormatMessage, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xa03cf627, L"rawValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xa60dd202, L"length", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_Length, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_Length, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xac06e2b0, L"colSpan", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_ColSpan, XFA_SCRIPT_Basic}, @@ -1395,17 +1395,17 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_AccessKey, XFA_SCRIPT_Basic}, {0xcabfa3d0, L"validationMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xdcecd663, L"editValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_EditValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_EditValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xe07e5061, L"selectedIndex", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_SelectedIndex, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Field_SelectedIndex, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xf65e34be, L"borderWidth", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderWidth, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderWidth, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x31b19c1, L"name", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Name, XFA_SCRIPT_Basic}, @@ -1451,52 +1451,52 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xd843798, L"fullText", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::FullText, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::FullText, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x1b6d1cf5, L"reenter", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::Reenter, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::Reenter, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x1e6ffa9a, L"prevContentType", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::PrevContentType, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::PrevContentType, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x25a3c206, L"soapFaultString", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::SoapFaultString, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::SoapFaultString, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x2e00c007, L"newContentType", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::NewContentType, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::NewContentType, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x4570500f, L"modifier", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::Modifier, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::Modifier, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x50e2e33b, L"selEnd", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::SelEnd, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::SelEnd, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x57de87c2, L"prevText", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::PrevText, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::PrevText, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x6ea04e0a, L"soapFaultCode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::SoapFaultCode, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::SoapFaultCode, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x6f6556cf, L"newText", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::NewText, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::NewText, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x891f4606, L"change", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::Change, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::Change, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x8fa3c19e, L"shift", (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::Shift, - -1, XFA_SCRIPT_Basic}, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xa9d9b2e1, L"keyDown", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::KeyDown, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::KeyDown, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbfc89db2, L"selStart", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::SelStart, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::SelStart, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc32a5812, L"commitKey", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::CommitKey, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::CommitKey, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc8da4da7, L"target", - (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::Target, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_EventPseudoModel::Target, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -1575,26 +1575,26 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0xf23332f, L"errorText", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_ErrorText, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_ErrorText, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x1abbd7e0, L"dataNode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DataNode, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DataNode, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0x25839852, L"access", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Access, XFA_SCRIPT_Basic}, {0x3b1ddd06, L"fillColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FillColor, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FillColor, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x570ce835, L"presence", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Presence, XFA_SCRIPT_Basic}, {0x5a3b375d, L"borderColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderColor, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderColor, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x79b67434, L"mandatoryMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_MandatoryMessage, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_MandatoryMessage, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x7a7cc341, L"vAlign", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_VAlign, XFA_SCRIPT_Basic}, @@ -1614,20 +1614,20 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Layout, XFA_SCRIPT_Basic}, {0x846599f8, L"transient", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_Transient, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_Transient, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x85fd6faf, L"mandatory", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_Mandatory, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_Mandatory, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x8e1c2921, L"relevant", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Relevant, XFA_SCRIPT_Basic}, {0xa03cf627, L"rawValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_DefaultAndRawValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_DefaultAndRawValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_DefaultAndRawValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ExclGroup_DefaultAndRawValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xac06e2b0, L"colSpan", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_ColSpan, XFA_SCRIPT_Basic}, @@ -1641,11 +1641,11 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_AccessKey, XFA_SCRIPT_Basic}, {0xcabfa3d0, L"validationMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xf65e34be, L"borderWidth", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderWidth, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderWidth, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -1713,8 +1713,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_TransferEncoding, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue_Read, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue_Read, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, @@ -1722,8 +1722,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Aspect, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue_Read, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue_Read, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xdb55fec5, L"href", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Href, XFA_SCRIPT_Basic}, @@ -1773,14 +1773,14 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_FracDigits, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xde7f92ba, L"leadDigits", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_LeadDigits, XFA_SCRIPT_Basic}, @@ -1805,23 +1805,23 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_ColumnWidths, XFA_SCRIPT_Basic}, {0x1abbd7e0, L"dataNode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DataNode, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DataNode, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0x1ee2d24d, L"instanceIndex", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_InstanceIndex, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_InstanceIndex, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x25839852, L"access", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Access, XFA_SCRIPT_Basic}, {0x3b1ddd06, L"fillColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FillColor, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_FillColor, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x570ce835, L"presence", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Presence, XFA_SCRIPT_Basic}, {0x5a3b375d, L"borderColor", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderColor, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderColor, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x7a7cc341, L"vAlign", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_VAlign, XFA_SCRIPT_Basic}, @@ -1847,8 +1847,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_MergeMode, XFA_SCRIPT_Basic}, {0x9f3e9510, L"instanceManager", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Subform_InstanceManager, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Subform_InstanceManager, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0xac06e2b0, L"colSpan", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_ColSpan, XFA_SCRIPT_Basic}, @@ -1856,14 +1856,14 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xbc8fa350, L"locale", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Subform_Locale, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Subform_Locale, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc2bd40fd, L"anchorType", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_AnchorType, XFA_SCRIPT_Basic}, {0xcabfa3d0, L"validationMessage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_ValidationMessage, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xe4c3a5e5, L"restoreState", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_RestoreState, XFA_SCRIPT_Basic}, @@ -1871,8 +1871,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Scope, XFA_SCRIPT_Basic}, {0xf65e34be, L"borderWidth", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderWidth, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_BorderWidth, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -1898,42 +1898,42 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Type, XFA_SCRIPT_Basic}, {0x5a50e9e6, L"version", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Handler_Version, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Handler_Version, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, - {0x31b19c1, L"name", (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Name, -1, - XFA_SCRIPT_Basic}, + {0x31b19c1, L"name", (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Name, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x66c1ae9, L"validationsEnabled", - (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::ValidationsEnabled, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::ValidationsEnabled, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x14d04502, L"title", (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Title, - -1, XFA_SCRIPT_Basic}, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x392ae445, L"platform", - (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Platform, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Platform, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x5a50e9e6, L"version", - (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Version, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Version, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x66cb1eed, L"variation", - (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Variation, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Variation, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x7717cbc4, L"language", - (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Language, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::Language, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x86698963, L"appType", - (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::AppType, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::AppType, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x94ff9e8d, L"calculationsEnabled", - (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::CalculationsEnabled, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::CalculationsEnabled, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbcd44940, L"currentPage", - (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::CurrentPage, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::CurrentPage, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xd592b920, L"numPages", - (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::NumPages, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_HostPseudoModel::NumPages, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, @@ -1983,8 +1983,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Lock, XFA_SCRIPT_Basic}, {0x7d9fd7c5, L"mode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_SubmitFormat_Mode, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_SubmitFormat_Mode, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, @@ -1995,14 +1995,14 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -2040,8 +2040,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, @@ -2049,8 +2049,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xf6b47749, L"lock", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_BOOL, XFA_ATTRIBUTE_Lock, XFA_SCRIPT_Basic}, @@ -2076,8 +2076,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_BOOL, XFA_ATTRIBUTE_Lock, XFA_SCRIPT_Basic}, {0xfcef86b5, L"ready", - (XFA_ATTRIBUTE_CALLBACK)&CJX_LayoutPseudoModel::Ready, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_LayoutPseudoModel::Ready, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, @@ -2211,14 +2211,14 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -2336,16 +2336,17 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xfb67185, L"recordsBefore", - (XFA_ATTRIBUTE_CALLBACK)&CJX_DataWindow::RecordsBefore, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_DataWindow::RecordsBefore, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x21d5dfcb, L"currentRecordNumber", - (XFA_ATTRIBUTE_CALLBACK)&CJX_DataWindow::CurrentRecordNumber, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_DataWindow::CurrentRecordNumber, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x312af044, L"recordsAfter", - (XFA_ATTRIBUTE_CALLBACK)&CJX_DataWindow::RecordsAfter, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_DataWindow::RecordsAfter, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x6aab37cb, L"isDefined", - (XFA_ATTRIBUTE_CALLBACK)&CJX_DataWindow::IsDefined, -1, XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_DataWindow::IsDefined, XFA_ATTRIBUTE_Unknown, + XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -2356,11 +2357,11 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_RunAt, XFA_SCRIPT_Basic}, {0xa021b738, L"stateless", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Script_Stateless, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Script_Stateless, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xadc4c77b, L"binding", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Binding, XFA_SCRIPT_Basic}, @@ -2371,8 +2372,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xf6b47749, L"lock", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_BOOL, XFA_ATTRIBUTE_Lock, XFA_SCRIPT_Basic}, @@ -2455,8 +2456,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xf6b47749, L"lock", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_BOOL, XFA_ATTRIBUTE_Lock, XFA_SCRIPT_Basic}, @@ -2524,8 +2525,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_TransferEncoding, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, @@ -2533,8 +2534,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_MaxLength, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xdb55fec5, L"href", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Href, XFA_SCRIPT_Basic}, @@ -2563,8 +2564,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Action, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, @@ -2608,14 +2609,14 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xb3543a6, L"max", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_InstanceManager_Max, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_InstanceManager_Max, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xb356ca4, L"min", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_InstanceManager_Min, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_InstanceManager_Min, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x6f544d49, L"count", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_InstanceManager_Count, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_InstanceManager_Count, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x25363, L"to", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_To, XFA_SCRIPT_Basic}, {0xa0933954, L"unicodeRange", @@ -2691,11 +2692,11 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Contains, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xe372ae97, L"isNull", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_BOOL, XFA_ATTRIBUTE_IsNull, XFA_SCRIPT_Basic}, @@ -2846,14 +2847,14 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -2864,8 +2865,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0x28dee6e9, L"format", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Encrypt_Format, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Encrypt_Format, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, @@ -2914,11 +2915,11 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Relevant, XFA_SCRIPT_Basic}, {0xa03cf627, L"rawValue", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xac06e2b0, L"colSpan", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_ColSpan, XFA_SCRIPT_Basic}, @@ -3063,8 +3064,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Overline, XFA_SCRIPT_Basic}, {0xaf754613, L"checksum", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Form_Checksum, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Form_Checksum, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, @@ -3099,14 +3100,14 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbe52dfbf, L"desc", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Desc, XFA_SCRIPT_Basic}, @@ -3207,7 +3208,7 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0x2f16a382, L"type", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Extras_Type, - -1, XFA_SCRIPT_Basic}, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, @@ -3278,8 +3279,8 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_BOOL, XFA_ATTRIBUTE_Lock, XFA_SCRIPT_Basic}, {0x97be91b, L"content", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Packet_Content, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Packet_Content, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -3435,20 +3436,20 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Hand, XFA_SCRIPT_Basic}, {0xa60dd202, L"length", - (XFA_ATTRIBUTE_CALLBACK)&CJX_NodeList::Script_ListClass_Length, -1, - XFA_SCRIPT_Basic}, - {0x20146, L"db", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Source_Db, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_NodeList::Script_ListClass_Length, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, + {0x20146, L"db", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Source_Db, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, {0xbc254332, L"usehref", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, - {0xb3543a6, L"max", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Occur_Max, -1, - XFA_SCRIPT_Basic}, - {0xb356ca4, L"min", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Occur_Min, -1, - XFA_SCRIPT_Basic}, + {0xb3543a6, L"max", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Occur_Max, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, + {0xb356ca4, L"min", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Occur_Min, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xc0811ed, L"use", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Use, XFA_SCRIPT_Basic}, @@ -3516,62 +3517,62 @@ const XFA_SCRIPTATTRIBUTEINFO g_SomAttributeData[] = { (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Usehref, XFA_SCRIPT_Basic}, {0xb2c80857, L"className", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_ObjectClass_ClassName, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Object::Script_ObjectClass_ClassName, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xa60dd202, L"length", - (XFA_ATTRIBUTE_CALLBACK)&CJX_NodeList::Script_ListClass_Length, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_NodeList::Script_ListClass_Length, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x31b19c1, L"name", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Name, XFA_SCRIPT_Basic}, {0x9f9d0f9, L"all", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_All, - -1, XFA_SCRIPT_Object}, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0x4df15659, L"nodes", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_Nodes, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_Nodes, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0x78a8d6cf, L"classAll", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_ClassAll, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_ClassAll, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0xcad6d8ca, L"parent", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_Parent, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_Parent, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0xd5679c78, L"index", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_Index, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_Index, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xdb5b4bce, L"classIndex", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_ClassIndex, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_ClassIndex, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xe4989adf, L"somExpression", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_SomExpression, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_TreeClass_SomExpression, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x21aed, L"id", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Attribute_String, XFA_ATTRIBUTE_Id, XFA_SCRIPT_Basic}, - {0x234a1, L"ns", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_Ns, -1, - XFA_SCRIPT_Basic}, + {0x234a1, L"ns", (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_Ns, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0x50d1a9d1, L"model", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_Model, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_Model, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0xacb4823f, L"isContainer", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_IsContainer, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_IsContainer, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xe372ae97, L"isNull", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_IsNull, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_IsNull, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xfe612a5b, L"oneOfChild", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_OneOfChild, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_NodeClass_OneOfChild, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0x97c1c65, L"context", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ModelClass_Context, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ModelClass_Context, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0x58be2870, L"aliasNode", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ModelClass_AliasNode, -1, - XFA_SCRIPT_Object}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_ModelClass_AliasNode, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Object}, {0xa52682bd, L"{default}", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, {0xd6e27f1d, L"value", - (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, -1, - XFA_SCRIPT_Basic}, + (XFA_ATTRIBUTE_CALLBACK)&CJX_Node::Script_Som_DefaultValue, + XFA_ATTRIBUTE_Unknown, XFA_SCRIPT_Basic}, }; const int32_t g_iSomAttributeCount = sizeof(g_SomAttributeData) / sizeof(XFA_ATTRIBUTEINFO); diff --git a/xfa/fxfa/parser/xfa_resolvenode_rs.h b/xfa/fxfa/parser/xfa_resolvenode_rs.h index 750adab36f..e77df4589c 100644 --- a/xfa/fxfa/parser/xfa_resolvenode_rs.h +++ b/xfa/fxfa/parser/xfa_resolvenode_rs.h @@ -52,9 +52,8 @@ struct XFA_RESOLVENODE_RS { for (CXFA_Object* pObject : objects) { auto pValue = pdfium::MakeUnique(valueArray->m_pIsolate); CJX_Object* jsObject = pObject->JSObject(); - (jsObject->*(pScriptAttribute->callback))( - pValue.get(), false, - static_cast(pScriptAttribute->eAttribute)); + (jsObject->*(pScriptAttribute->callback))(pValue.get(), false, + pScriptAttribute->attribute); valueArray->m_Values.push_back(std::move(pValue)); } } diff --git a/xfa/fxfa/parser/xfa_utils.cpp b/xfa/fxfa/parser/xfa_utils.cpp index 2ee675013c..b9b1eb6fd6 100644 --- a/xfa/fxfa/parser/xfa_utils.cpp +++ b/xfa/fxfa/parser/xfa_utils.cpp @@ -278,7 +278,7 @@ const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_Element eElement, int32_t iMid = (iStart + iEnd) / 2; const XFA_NOTSUREATTRIBUTE* pAttr = g_XFANotsureAttributes + iMid; if (eElement == pAttr->eElement) { - if (pAttr->eAttribute == eAttribute) { + if (pAttr->attribute == eAttribute) { if (eType == XFA_ATTRIBUTETYPE_NOTSURE || eType == pAttr->eType) return pAttr; return nullptr; @@ -287,7 +287,7 @@ const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_Element eElement, if (iBefore >= 0) { pAttr = g_XFANotsureAttributes + iBefore; while (eElement == pAttr->eElement) { - if (pAttr->eAttribute == eAttribute) { + if (pAttr->attribute == eAttribute) { if (eType == XFA_ATTRIBUTETYPE_NOTSURE || eType == pAttr->eType) return pAttr; return nullptr; @@ -304,7 +304,7 @@ const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_Element eElement, if (iAfter <= g_iXFANotsureCount - 1) { pAttr = g_XFANotsureAttributes + iAfter; while (eElement == pAttr->eElement) { - if (pAttr->eAttribute == eAttribute) { + if (pAttr->attribute == eAttribute) { if (eType == XFA_ATTRIBUTETYPE_NOTSURE || eType == pAttr->eType) return pAttr; return nullptr; -- cgit v1.2.3