Support implicit standard directory reference and "3264" platform folders

Completes wixtoolset/issues#5798 and wixtoolset/issues#5835

1 files changed, 95 insertions, 0 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AddRequiredStandardDirectories.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AddRequiredStandardDirectories.cs
new file mode 100644
index 00000000..4597639b
--- /dev/null
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AddRequiredStandardDirectories.cs
@@ -0,0 +1,95 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Core.WindowsInstaller.Bind
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using WixToolset.Data;
+    using WixToolset.Data.Symbols;
+    using WixToolset.Data.WindowsInstaller;
+
+    /// <summary>
+    /// Add referenced standard directory symbols, if not already present.
+    /// </summary>
+    internal class AddRequiredStandardDirectories
+    {
+        internal AddRequiredStandardDirectories(IntermediateSection section, Platform platform)
+        {
+            this.Section = section;
+            this.Platform = platform;
+        }
+
+        private IntermediateSection Section { get; }
+
+        private Platform Platform { get; }
+
+        public void Execute()
+        {
+            var directories = this.Section.Symbols.OfType<DirectorySymbol>().ToList();
+            var directoriesById = directories.ToDictionary(d => d.Id.Id);
+
+            foreach (var directory in directories)
+            {
+                var parentDirectoryId = directory.ParentDirectoryRef;
+
+                if (String.IsNullOrEmpty(parentDirectoryId))
+                {
+                    if (directory.Id.Id != "TARGETDIR")
+                    {
+                        directory.ParentDirectoryRef = "TARGETDIR";
+                    }
+                }
+                else
+                {
+                    this.EnsureStandardDirectoryAdded(directoriesById, parentDirectoryId, directory.SourceLineNumbers);
+                }
+            }
+
+            if (!directoriesById.ContainsKey("TARGETDIR") && WindowsInstallerStandard.TryGetStandardDirectory("TARGETDIR", out var targetDir))
+            {
+                directoriesById.Add(targetDir.Id.Id, targetDir);
+                this.Section.AddSymbol(targetDir);
+            }
+        }
+
+        private void EnsureStandardDirectoryAdded(Dictionary<string, DirectorySymbol> directoriesById, string directoryId, SourceLineNumber sourceLineNumbers)
+        {
+            if (!directoriesById.ContainsKey(directoryId) && WindowsInstallerStandard.TryGetStandardDirectory(directoryId, out var standardDirectory))
+            {
+                var parentDirectoryId = this.GetStandardDirectoryParent(directoryId);
+
+                var directory = new DirectorySymbol(sourceLineNumbers, standardDirectory.Id)
+                {
+                    Name = standardDirectory.Name,
+                    ParentDirectoryRef = parentDirectoryId,
+                };
+
+                directoriesById.Add(directory.Id.Id, directory);
+                this.Section.AddSymbol(directory);
+
+                if (!String.IsNullOrEmpty(parentDirectoryId))
+                {
+                    this.EnsureStandardDirectoryAdded(directoriesById, parentDirectoryId, sourceLineNumbers);
+                }
+            }
+        }
+
+        private string GetStandardDirectoryParent(string directoryId)
+        {
+            switch (directoryId)
+            {
+                case "TARGETDIR":
+                    return null;
+
+                case "CommonFiles6432Folder":
+                case "ProgramFiles6432Folder":
+                case "System6432Folder":
+                    return WindowsInstallerStandard.GetPlatformSpecificDirectoryId(directoryId, this.Platform);
+
+                default:
+                    return "TARGETDIR";
+            }
+        }
+    }
+}