From 66563e5e142fb89d4df5d2b8a20e65261becb0a2 Mon Sep 17 00:00:00 2001
From: fyodorkor <fyodorkor@gmail.com>
Date: Thu, 13 Apr 2023 22:37:02 +0300
Subject: Fix XmlConfig decompile to produce schema element, Add unitest for
 XmlDecomile

---
 src/ext/Util/wixext/UtilDecompiler.cs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/ext/Util/wixext')

diff --git a/src/ext/Util/wixext/UtilDecompiler.cs b/src/ext/Util/wixext/UtilDecompiler.cs
index 0a78201e..52b64889 100644
--- a/src/ext/Util/wixext/UtilDecompiler.cs
+++ b/src/ext/Util/wixext/UtilDecompiler.cs
@@ -673,7 +673,7 @@ namespace WixToolset.Util
         {
             foreach (var row in table.Rows)
             {
-                var flags = row.FieldAsNullableInteger(6) ?? 0;
+                var flags = row.FieldAsNullableInteger(7) ?? 0;
                 string node = null;
                 string action = null;
                 string on = null;
@@ -712,14 +712,16 @@ namespace WixToolset.Util
                 var xmlConfig = new XElement(UtilConstants.XmlConfigName,
                     new XAttribute("Id", row.FieldAsString(0)),
                     new XAttribute("File", row.FieldAsString(1)),
-                    new XAttribute("ElementPath", row.FieldAsString(2)),
-                    AttributeIfNotNull("VerifyPath", row, 3),
-                    AttributeIfNotNull("Name", row, 4),
+                    AttributeIfNotNull("ElementId", row, 2),
+                    AttributeIfNotNull("ElementPath", row, 3),
+                    AttributeIfNotNull("VerifyPath", row, 4),
+                    AttributeIfNotNull("Name", row, 5),
+                    AttributeIfNotNull("Value", row, 6),
                     AttributeIfNotNull("Node", node),
                     AttributeIfNotNull("Action", action),
                     AttributeIfNotNull("On", on),
                     AttributeIfTrue("PreserveModifiedDate", 0x00001000 == (flags & 0x00001000)),
-                    NumericAttributeIfNotNull("Sequence", row, 8)
+                    NumericAttributeIfNotNull("Sequence", row, 9)
                     );
 
                 this.DecompilerHelper.IndexElement(row, xmlConfig);
@@ -967,16 +969,16 @@ namespace WixToolset.Util
         /// <param name="tables">Collection of all tables.</param>
         private void FinalizeXmlConfigTable(TableIndexedCollection tables)
         {
-            if (tables.TryGetTable("XmlConfig", out var xmlConfigTable))
+            if (tables.TryGetTable("Wix4XmlConfig", out var xmlConfigTable))
             {
                 foreach (var row in xmlConfigTable.Rows)
                 {
                     var xmlConfig = this.DecompilerHelper.GetIndexedElement(row);
 
-                    if (null == row[6] || 0 == (int)row[6])
+                    if (null != row[2])
                     {
                         var id = row.FieldAsString(2);
-                        if (this.DecompilerHelper.TryGetIndexedElement("XmlConfig", id, out var parentXmlConfig))
+                        if (this.DecompilerHelper.TryGetIndexedElement("Wix4XmlConfig", id, out var parentXmlConfig))
                         {
                             parentXmlConfig.Add(xmlConfig);
                         }
@@ -987,7 +989,7 @@ namespace WixToolset.Util
                     }
                     else
                     {
-                        var componentId = row.FieldAsString(7);
+                        var componentId = row.FieldAsString(8);
                         if (this.DecompilerHelper.TryGetIndexedElement("Component", componentId, out var component))
                         {
                             component.Add(xmlConfig);
-- 
cgit v1.2.3-55-g6feb