Fix decompiling non-advertised shortcuts.

2 files changed, 36 insertions, 28 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index ba515d69..9ecad783 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -783,6 +783,7 @@ namespace WixToolset.Core.WindowsInstaller
                 this.FinalizePropertyTable(tables);
                 this.FinalizeRemoveFileTable(tables);
                 this.FinalizeSearchTables(tables);
+                this.FinalizeShortcutTable(tables);
                 this.FinalizeUpgradeTable(tables);
                 this.FinalizeSequenceTables(tables);
                 this.FinalizeVerbTable(tables);
@@ -1360,7 +1361,6 @@ namespace WixToolset.Core.WindowsInstaller
             var extensionTable = tables["Extension"];
             var msiAssemblyTable = tables["MsiAssembly"];
             var publishComponentTable = tables["PublishComponent"];
-            var shortcutTable = tables["Shortcut"];
             var typeLibTable = tables["TypeLib"];
 
             if (null != classTable)
@@ -1395,19 +1395,6 @@ namespace WixToolset.Core.WindowsInstaller
                 }
             }
 
-            if (null != shortcutTable)
-            {
-                foreach (var row in shortcutTable.Rows)
-                {
-                    var target = Convert.ToString(row[4]);
-
-                    if (!target.StartsWith("[", StringComparison.Ordinal) && !target.EndsWith("]", StringComparison.Ordinal))
-                    {
-                        this.SetPrimaryFeature(row, 4, 3);
-                    }
-                }
-            }
-
             if (null != typeLibTable)
             {
                 foreach (var row in typeLibTable.Rows)
@@ -2435,6 +2422,40 @@ namespace WixToolset.Core.WindowsInstaller
         }
 
         /// <summary>
+        /// Finalize the Shortcut table.
+        /// </summary>
+        /// <param name="tables">The collection of all tables.</param>
+        /// <remarks>
+        /// Sets Advertise to yes if Target points to a Feature.
+        /// Occurs during finalization because it has to check against every feature row.
+        /// </remarks>
+        private void FinalizeShortcutTable(TableIndexedCollection tables)
+        {
+            var shortcutTable = tables["Shortcut"];
+            if (null == shortcutTable)
+            {
+                return;
+            }
+
+            foreach (var row in shortcutTable.Rows)
+            {
+                var shortcut = (Wix.Shortcut)this.core.GetIndexedElement(row);
+                var target = Convert.ToString(row[4]);
+                var feature = this.core.GetIndexedElement("Feature", target);
+                if (feature == null)
+                {
+                    // TODO: use this value to do a "more-correct" nesting under the indicated File or CreateDirectory element
+                    shortcut.Target = target;
+                }
+                else
+                {
+                    shortcut.Advertise = Wix.YesNoType.yes;
+                    this.SetPrimaryFeature(row, 4, 3);
+                }
+            }
+        }
+
+        /// <summary>
         /// Finalize the sequence tables.
         /// </summary>
         /// <param name="tables">The collection of all tables.</param>
@@ -8441,19 +8462,6 @@ namespace WixToolset.Core.WindowsInstaller
                     shortcut.Name = names[0];
                 }
 
-                var target = Convert.ToString(row[4]);
-                if (target.StartsWith("[", StringComparison.Ordinal) && target.EndsWith("]", StringComparison.Ordinal))
-                {
-                    // TODO: use this value to do a "more-correct" nesting under the indicated File or CreateDirectory element
-                    shortcut.Target = target;
-                }
-                else
-                {
-                    shortcut.Advertise = Wix.YesNoType.yes;
-
-                    // primary feature is set in FinalizeFeatureComponentsTable
-                }
-
                 if (null != row[5])
                 {
                     shortcut.Arguments = Convert.ToString(row[5]);
diff --git a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
index c44393cf..71ddef8f 100644
--- a/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/DecompileFixture.cs
@@ -153,7 +153,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void CanDecompileShortcuts()
         {
             var folder = TestData.Get(@"TestData\Shortcut");