1 files changed, 215 insertions, 0 deletions

diff --git a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
new file mode 100644
index 00000000..4caec9b4
--- /dev/null
+++ b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
@@ -0,0 +1,215 @@
+// 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.Bind
+{
+    using System.Collections.Generic;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+
+    /// <summary>
+    /// Resolve source fields in the tables included in the output
+    /// </summary>
+    internal class ResolveFieldsCommand : ICommand
+    {
+        public TableIndexedCollection Tables { private get; set; }
+
+        public ExtractEmbeddedFiles FilesWithEmbeddedFiles { private get; set; }
+
+        public BinderFileManagerCore FileManagerCore { private get; set; }
+
+        public IEnumerable<IBinderFileManager> FileManagers { private get; set; }
+
+        public bool SupportDelayedResolution { private get; set; }
+
+        public string TempFilesLocation { private get; set; }
+
+        public WixVariableResolver WixVariableResolver { private get; set; }
+
+        public IEnumerable<DelayedField> DelayedFields { get; private set; }
+
+        public void Execute()
+        {
+            List<DelayedField> delayedFields = this.SupportDelayedResolution ? new List<DelayedField>() : null;
+
+            foreach (Table table in this.Tables)
+            {
+                foreach (Row row in table.Rows)
+                {
+                    foreach (Field field in row.Fields)
+                    {
+                        bool isDefault = true;
+                        bool delayedResolve = false;
+
+                        // Check to make sure we're in a scenario where we can handle variable resolution.
+                        if (null != delayedFields)
+                        {
+                            // resolve localization and wix variables
+                            if (field.Data is string)
+                            {
+                                field.Data = this.WixVariableResolver.ResolveVariables(row.SourceLineNumbers, field.AsString(), false, ref isDefault, ref delayedResolve);
+                                if (delayedResolve)
+                                {
+                                    delayedFields.Add(new DelayedField(row, field));
+                                }
+                            }
+                        }
+
+                        // Move to next row if we've hit an error resolving variables.
+                        if (Messaging.Instance.EncounteredError) // TODO: make this error handling more specific to just the failure to resolve variables in this field.
+                        {
+                            continue;
+                        }
+
+                        // Resolve file paths
+                        if (ColumnType.Object == field.Column.Type)
+                        {
+                            ObjectField objectField = (ObjectField)field;
+
+                            // Skip file resolution if the file is to be deleted.
+                            if (RowOperation.Delete == row.Operation)
+                            {
+                                continue;
+                            }
+
+                            // File is embedded and path to it was not modified above.
+                            if (objectField.EmbeddedFileIndex.HasValue && isDefault)
+                            {
+                                string extractPath = this.FilesWithEmbeddedFiles.AddEmbeddedFileIndex(objectField.BaseUri, objectField.EmbeddedFileIndex.Value, this.TempFilesLocation);
+
+                                // Set the path to the embedded file once where it will be extracted.
+                                objectField.Data = extractPath;
+                            }
+                            else if (null != objectField.Data) // non-compressed file (or localized value)
+                            {
+                                try
+                                {
+                                    if (OutputType.Patch != this.FileManagerCore.Output.Type) // Normal binding for non-Patch scenario such as link (light.exe)
+                                    {
+                                        // keep a copy of the un-resolved data for future replay. This will be saved into wixpdb file
+                                        if (null == objectField.UnresolvedData)
+                                        {
+                                            objectField.UnresolvedData = (string)objectField.Data;
+                                        }
+
+                                        // resolve the path to the file
+                                        objectField.Data = this.ResolveFile((string)objectField.Data, table.Name, row.SourceLineNumbers, BindStage.Normal);
+                                    }
+                                    else if (!(this.FileManagerCore.RebaseTarget || this.FileManagerCore.RebaseUpdated)) // Normal binding for Patch Scenario (normal patch, no re-basing logic)
+                                    {
+                                        // resolve the path to the file
+                                        objectField.Data = this.ResolveFile((string)objectField.Data, table.Name, row.SourceLineNumbers, BindStage.Normal);
+                                    }
+                                    else // Re-base binding path scenario caused by pyro.exe -bt -bu
+                                    {
+                                        // by default, use the resolved Data for file lookup
+                                        string filePathToResolve = (string)objectField.Data;
+
+                                        // if -bu is used in pyro command, this condition holds true and the tool
+                                        // will use pre-resolved source for new wixpdb file
+                                        if (this.FileManagerCore.RebaseUpdated)
+                                        {
+                                            // try to use the unResolved Source if it exists.
+                                            // New version of wixpdb file keeps a copy of pre-resolved Source. i.e. !(bindpath.test)\foo.dll
+                                            // Old version of winpdb file does not contain this attribute and the value is null.
+                                            if (null != objectField.UnresolvedData)
+                                            {
+                                                filePathToResolve = objectField.UnresolvedData;
+                                            }
+                                        }
+
+                                        objectField.Data = this.ResolveFile(filePathToResolve, table.Name, row.SourceLineNumbers, BindStage.Updated);
+                                    }
+                                }
+                                catch (WixFileNotFoundException)
+                                {
+                                    // display the error with source line information
+                                    Messaging.Instance.OnMessage(WixErrors.FileNotFound(row.SourceLineNumbers, (string)objectField.Data));
+                                }
+                            }
+
+                            isDefault = true;
+                            if (null != objectField.PreviousData)
+                            {
+                                objectField.PreviousData = this.WixVariableResolver.ResolveVariables(row.SourceLineNumbers, objectField.PreviousData, false, ref isDefault);
+                                if (!Messaging.Instance.EncounteredError) // TODO: make this error handling more specific to just the failure to resolve variables in this field.
+                                {
+                                    // file is compressed in a cabinet (and not modified above)
+                                    if (objectField.PreviousEmbeddedFileIndex.HasValue && isDefault)
+                                    {
+                                        // when loading transforms from disk, PreviousBaseUri may not have been set
+                                        if (null == objectField.PreviousBaseUri)
+                                        {
+                                            objectField.PreviousBaseUri = objectField.BaseUri;
+                                        }
+
+                                        string extractPath = this.FilesWithEmbeddedFiles.AddEmbeddedFileIndex(objectField.PreviousBaseUri, objectField.PreviousEmbeddedFileIndex.Value, this.TempFilesLocation);
+
+                                        // set the path to the file once its extracted from the cabinet
+                                        objectField.PreviousData = extractPath;
+                                    }
+                                    else if (null != objectField.PreviousData) // non-compressed file (or localized value)
+                                    {
+                                        try
+                                        {
+                                            if (!this.FileManagerCore.RebaseTarget && !this.FileManagerCore.RebaseUpdated)
+                                            {
+                                                // resolve the path to the file
+                                                objectField.PreviousData = this.ResolveFile((string)objectField.PreviousData, table.Name, row.SourceLineNumbers, BindStage.Normal);
+                                            }
+                                            else
+                                            {
+                                                if (this.FileManagerCore.RebaseTarget)
+                                                {
+                                                    // if -bt is used, it come here
+                                                    // Try to use the original unresolved source from either target build or update build
+                                                    // If both target and updated are of old wixpdb, it behaves the same as today, no re-base logic here
+                                                    // If target is old version and updated is new version, it uses unresolved path from updated build
+                                                    // If both target and updated are of new versions, it uses unresolved path from target build
+                                                    if (null != objectField.UnresolvedPreviousData || null != objectField.UnresolvedData)
+                                                    {
+                                                        objectField.PreviousData = objectField.UnresolvedPreviousData ?? objectField.UnresolvedData;
+                                                    }
+                                                }
+
+                                                // resolve the path to the file
+                                                objectField.PreviousData = this.ResolveFile((string)objectField.PreviousData, table.Name, row.SourceLineNumbers, BindStage.Target);
+
+                                            }
+                                        }
+                                        catch (WixFileNotFoundException)
+                                        {
+                                            // display the error with source line information
+                                            Messaging.Instance.OnMessage(WixErrors.FileNotFound(row.SourceLineNumbers, (string)objectField.PreviousData));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            this.DelayedFields = delayedFields;
+        }
+
+        private string ResolveFile(string source, string type, SourceLineNumber sourceLineNumbers, BindStage bindStage = BindStage.Normal)
+        {
+            string path = null;
+            foreach (IBinderFileManager fileManager in this.FileManagers)
+            {
+                path = fileManager.ResolveFile(source, type, sourceLineNumbers, bindStage);
+                if (null != path)
+                {
+                    break;
+                }
+            }
+
+            if (null == path)
+            {
+                throw new WixFileNotFoundException(sourceLineNumbers, source, type);
+            }
+
+            return path;
+        }
+    }
+}