From 22e00b878ffe89ee3134d3d1b42b3d6c777adae8 Mon Sep 17 00:00:00 2001 From: Bevan Weiss Date: Wed, 12 Feb 2025 19:52:50 +1100 Subject: Msmq decompile test revealed some latent issues with the Wix6Group Decompiler not being broad enough in where it looks for indexes. Carry forward both Group and Wix4Group just for good measure. Signed-off-by: Bevan Weiss --- src/ext/Util/wixext/UtilDecompiler.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/ext/Util/wixext/UtilDecompiler.cs') diff --git a/src/ext/Util/wixext/UtilDecompiler.cs b/src/ext/Util/wixext/UtilDecompiler.cs index 55323e15..cde64f8f 100644 --- a/src/ext/Util/wixext/UtilDecompiler.cs +++ b/src/ext/Util/wixext/UtilDecompiler.cs @@ -455,7 +455,9 @@ namespace WixToolset.Util foreach (var row in table.Rows) { var groupId = row.FieldAsString(0); - if (this.DecompilerHelper.TryGetIndexedElement("Group", groupId, out var group)) + XElement group; + if (this.DecompilerHelper.TryGetIndexedElement("Group", groupId, out group) + || this.DecompilerHelper.TryGetIndexedElement("Wix4Group", groupId, out group)) { var attributes = (Group6SymbolAttributes)(row.FieldAsNullableInteger(2) ?? 0); group.Add(AttributeIfNotNull("Comment", row, 1)); @@ -483,10 +485,14 @@ namespace WixToolset.Util foreach (var row in table.Rows) { var parentId = row.FieldAsString(0); - var parentExists = this.DecompilerHelper.TryGetIndexedElement("Group", parentId, out var parentGroup); + XElement parentGroup; + var parentExists = (this.DecompilerHelper.TryGetIndexedElement("Group", parentId, out parentGroup) + || this.DecompilerHelper.TryGetIndexedElement("Wix4Group", parentId, out parentGroup)); var childId = row.FieldAsString(1); - var childExists = this.DecompilerHelper.TryGetIndexedElement("Group", childId, out var childGroup); + XElement childGroup; + var childExists = (this.DecompilerHelper.TryGetIndexedElement("Group", childId, out childGroup) + || this.DecompilerHelper.TryGetIndexedElement("Wix4Group", childId, out childGroup)); if (parentExists && childExists) { -- cgit v1.2.3-55-g6feb