From 94b941ee95a294228516097c269e27dfa41593ab Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 13 Jan 2020 09:10:13 -0800 Subject: Provide Record enumerator on View that disposes fetched Records --- src/WixToolset.Core.TestPackage/WixRunnerResult.cs | 1 - .../Bind/ExtractMergeModuleFilesCommand.cs | 66 ++--- .../Bind/MergeModulesCommand.cs | 22 +- .../Bind/ProcessUncompressedFilesCommand.cs | 20 +- .../Inscribe/InscribeMsiPackageCommand.cs | 242 +++++++-------- src/WixToolset.Core.WindowsInstaller/Msi/View.cs | 83 +++++- .../Unbind/UnbindDatabaseCommand.cs | 325 ++++++++++----------- src/WixToolset.Core.WindowsInstaller/Validator.cs | 18 +- src/WixToolset.Core/CommandLine/BuildCommand.cs | 2 +- 9 files changed, 389 insertions(+), 390 deletions(-) diff --git a/src/WixToolset.Core.TestPackage/WixRunnerResult.cs b/src/WixToolset.Core.TestPackage/WixRunnerResult.cs index f4870ae3..88f20158 100644 --- a/src/WixToolset.Core.TestPackage/WixRunnerResult.cs +++ b/src/WixToolset.Core.TestPackage/WixRunnerResult.cs @@ -26,7 +26,6 @@ namespace WixToolset.Core.TestPackage var filename = message.SourceLineNumbers?.FileName ?? "TEST"; var line = message.SourceLineNumbers?.LineNumber ?? -1; var type = message.Level.ToString().ToLowerInvariant(); - var output = message.Level >= MessageLevel.Warning ? Console.Out : Console.Error; if (line > 0) { diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs index 4105cb8f..5412c6f9 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs @@ -89,46 +89,38 @@ namespace WixToolset.Core.WindowsInstaller.Bind using (View view = db.OpenExecuteView("SELECT `File`, `Directory_` FROM `File`, `Component` WHERE `Component_`=`Component`")) { // add each file row from the merge module into the file row collection (check for errors along the way) - while (true) + foreach (Record record in view.Records) { - using (Record record = view.Fetch()) + // NOTE: this is very tricky - the merge module file rows are not added to the + // file table because they should not be created via idt import. Instead, these + // rows are created by merging in the actual modules. + var fileTuple = new FileTuple(wixMergeRow.SourceLineNumbers, new Identifier(AccessModifier.Private, record[1])); + fileTuple.Attributes = wixMergeRow.FileAttributes; + fileTuple.DirectoryRef = record[2]; + fileTuple.DiskId = wixMergeRow.DiskId; + fileTuple.Source = new IntermediateFieldPathValue { Path = Path.Combine(this.IntermediateFolder, wixMergeRow.Id.Id, record[1]) }; + + var mergeModuleFileFacade = new FileFacade(true, fileTuple); + + // If case-sensitive collision with another merge module or a user-authored file identifier. + if (indexedFileFacades.TryGetValue(mergeModuleFileFacade.File.Id.Id, out var collidingFacade)) { - if (null == record) - { - break; - } - - // NOTE: this is very tricky - the merge module file rows are not added to the - // file table because they should not be created via idt import. Instead, these - // rows are created by merging in the actual modules. - var fileTuple = new FileTuple(wixMergeRow.SourceLineNumbers, new Identifier(AccessModifier.Private, record[1])); - fileTuple.Attributes = wixMergeRow.FileAttributes; - fileTuple.DirectoryRef = record[2]; - fileTuple.DiskId = wixMergeRow.DiskId; - fileTuple.Source = new IntermediateFieldPathValue { Path = Path.Combine(this.IntermediateFolder, wixMergeRow.Id.Id, record[1]) }; - - var mergeModuleFileFacade = new FileFacade(true, fileTuple); - - // If case-sensitive collision with another merge module or a user-authored file identifier. - if (indexedFileFacades.TryGetValue(mergeModuleFileFacade.File.Id.Id, out var collidingFacade)) - { - this.Messaging.Write(ErrorMessages.DuplicateModuleFileIdentifier(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, collidingFacade.File.Id.Id)); - } - else if (uniqueModuleFileIdentifiers.TryGetValue(mergeModuleFileFacade.File.Id.Id, out collidingFacade)) // case-insensitive collision with another file identifier in the same merge module - { - this.Messaging.Write(ErrorMessages.DuplicateModuleCaseInsensitiveFileIdentifier(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, mergeModuleFileFacade.File.Id.Id, collidingFacade.File.Id.Id)); - } - else // no collision - { - mergeModulesFileFacades.Add(mergeModuleFileFacade); - - // Keep updating the indexes as new rows are added. - indexedFileFacades.Add(mergeModuleFileFacade.File.Id.Id, mergeModuleFileFacade); - uniqueModuleFileIdentifiers.Add(mergeModuleFileFacade.File.Id.Id, mergeModuleFileFacade); - } - - containsFiles = true; + this.Messaging.Write(ErrorMessages.DuplicateModuleFileIdentifier(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, collidingFacade.File.Id.Id)); } + else if (uniqueModuleFileIdentifiers.TryGetValue(mergeModuleFileFacade.File.Id.Id, out collidingFacade)) // case-insensitive collision with another file identifier in the same merge module + { + this.Messaging.Write(ErrorMessages.DuplicateModuleCaseInsensitiveFileIdentifier(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, mergeModuleFileFacade.File.Id.Id, collidingFacade.File.Id.Id)); + } + else // no collision + { + mergeModulesFileFacades.Add(mergeModuleFileFacade); + + // Keep updating the indexes as new rows are added. + indexedFileFacades.Add(mergeModuleFileFacade.File.Id.Id, mergeModuleFileFacade); + uniqueModuleFileIdentifiers.Add(mergeModuleFileFacade.File.Id.Id, mergeModuleFileFacade); + } + + containsFiles = true; } } } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs index 7ee33997..8c11555e 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs @@ -220,14 +220,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind string query = String.Format(CultureInfo.InvariantCulture, "SELECT * FROM {0} WHERE `Action` = '{1}'", row[0].ToString(), (string)row[1]); using (View view = db.OpenExecuteView(query)) + using (Record record = view.Fetch()) { - using (Record record = view.Fetch()) + if (null != record) { - if (null != record) - { - this.Messaging.Write(WarningMessages.SuppressMergedAction((string)row[1], row[0].ToString())); - view.Modify(ModifyView.Delete, record); - } + this.Messaging.Write(WarningMessages.SuppressMergedAction((string)row[1], row[0].ToString())); + view.Modify(ModifyView.Delete, record); } } } @@ -244,17 +242,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind using (View view = db.OpenExecuteView(String.Concat("SELECT `Action` FROM ", tableName))) { - while (true) + foreach (Record resultRecord in view.Records) { - using (Record resultRecord = view.Fetch()) - { - if (null == resultRecord) - { - break; - } - - this.Messaging.Write(WarningMessages.SuppressMergedAction(resultRecord.GetString(1), tableName)); - } + this.Messaging.Write(WarningMessages.SuppressMergedAction(resultRecord.GetString(1), tableName)); } } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs index 64fb3e4d..373ada38 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs @@ -57,25 +57,17 @@ namespace WixToolset.Core.WindowsInstaller.Bind var mediaRows = this.Section.Tuples.OfType().ToDictionary(t => t.DiskId); - using (Database db = new Database(this.DatabasePath, OpenDatabase.ReadOnly)) + using (var db = new Database(this.DatabasePath, OpenDatabase.ReadOnly)) { - using (View directoryView = db.OpenExecuteView("SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`")) + using (var directoryView = db.OpenExecuteView("SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`")) { - while (true) + foreach (var directoryRecord in directoryView.Records) { - using (Record directoryRecord = directoryView.Fetch()) - { - if (null == directoryRecord) - { - break; - } + var sourceName = Common.GetName(directoryRecord.GetString(3), true, this.LongNamesInImage); - string sourceName = Common.GetName(directoryRecord.GetString(3), true, this.LongNamesInImage); + var resolvedDirectory = this.BackendHelper.CreateResolvedDirectory(directoryRecord.GetString(2), sourceName); - var resolvedDirectory = this.BackendHelper.CreateResolvedDirectory(directoryRecord.GetString(2), sourceName); - - directories.Add(directoryRecord.GetString(1), resolvedDirectory); - } + directories.Add(directoryRecord.GetString(1), resolvedDirectory); } } diff --git a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs index b91eeeef..ff7472ff 100644 --- a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs @@ -60,47 +60,39 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe { using (View digitalSignatureView = database.OpenExecuteView("SELECT `Table`, `SignObject`, `DigitalCertificate_`, `Hash` FROM `MsiDigitalSignature` WHERE `Table` <> 'Media'")) { - while (true) + foreach (Record digitalSignatureRecord in digitalSignatureView.Records) { - using (Record digitalSignatureRecord = digitalSignatureView.Fetch()) - { - if (null == digitalSignatureRecord) - { - break; - } + Row digitalSignatureRow = null; + digitalSignatureRow = digitalSignatureTable.CreateRow(null); - Row digitalSignatureRow = null; - digitalSignatureRow = digitalSignatureTable.CreateRow(null); + string table = digitalSignatureRecord.GetString(0); + string signObject = digitalSignatureRecord.GetString(1); - string table = digitalSignatureRecord.GetString(0); - string signObject = digitalSignatureRecord.GetString(1); + digitalSignatureRow[0] = table; + digitalSignatureRow[1] = signObject; + digitalSignatureRow[2] = digitalSignatureRecord.GetString(2); - digitalSignatureRow[0] = table; - digitalSignatureRow[1] = signObject; - digitalSignatureRow[2] = digitalSignatureRecord.GetString(2); + if (false == digitalSignatureRecord.IsNull(3)) + { + // Export to a file, because the MSI API's require us to provide a file path on disk + string hashPath = Path.Combine(this.Context.IntermediateFolder, "MsiDigitalSignature"); + string hashFileName = string.Concat(table, ".", signObject, ".bin"); - if (false == digitalSignatureRecord.IsNull(3)) - { - // Export to a file, because the MSI API's require us to provide a file path on disk - string hashPath = Path.Combine(this.Context.IntermediateFolder, "MsiDigitalSignature"); - string hashFileName = string.Concat(table, ".", signObject, ".bin"); + Directory.CreateDirectory(hashPath); + hashPath = Path.Combine(hashPath, hashFileName); - Directory.CreateDirectory(hashPath); - hashPath = Path.Combine(hashPath, hashFileName); + using (FileStream fs = File.Create(hashPath)) + { + int bytesRead; + byte[] buffer = new byte[1024 * 4]; - using (FileStream fs = File.Create(hashPath)) + while (0 != (bytesRead = digitalSignatureRecord.GetStream(3, buffer, buffer.Length))) { - int bytesRead; - byte[] buffer = new byte[1024 * 4]; - - while (0 != (bytesRead = digitalSignatureRecord.GetStream(3, buffer, buffer.Length))) - { - fs.Write(buffer, 0, bytesRead); - } + fs.Write(buffer, 0, bytesRead); } - - digitalSignatureRow[3] = hashFileName; } + + digitalSignatureRow[3] = hashFileName; } } } @@ -111,145 +103,129 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe { using (View digitalCertificateView = database.OpenExecuteView("SELECT * FROM `MsiDigitalCertificate`")) { - while (true) + foreach (Record digitalCertificateRecord in digitalCertificateView.Records) { - using (Record digitalCertificateRecord = digitalCertificateView.Fetch()) - { - if (null == digitalCertificateRecord) - { - break; - } + string certificateId = digitalCertificateRecord.GetString(1); // get the identifier of the certificate - string certificateId = digitalCertificateRecord.GetString(1); // get the identifier of the certificate + // Export to a file, because the MSI API's require us to provide a file path on disk + string certPath = Path.Combine(this.Context.IntermediateFolder, "MsiDigitalCertificate"); + Directory.CreateDirectory(certPath); + certPath = Path.Combine(certPath, string.Concat(certificateId, ".cer")); - // Export to a file, because the MSI API's require us to provide a file path on disk - string certPath = Path.Combine(this.Context.IntermediateFolder, "MsiDigitalCertificate"); - Directory.CreateDirectory(certPath); - certPath = Path.Combine(certPath, string.Concat(certificateId, ".cer")); + using (FileStream fs = File.Create(certPath)) + { + int bytesRead; + byte[] buffer = new byte[1024 * 4]; - using (FileStream fs = File.Create(certPath)) + while (0 != (bytesRead = digitalCertificateRecord.GetStream(2, buffer, buffer.Length))) { - int bytesRead; - byte[] buffer = new byte[1024 * 4]; - - while (0 != (bytesRead = digitalCertificateRecord.GetStream(2, buffer, buffer.Length))) - { - fs.Write(buffer, 0, bytesRead); - } + fs.Write(buffer, 0, bytesRead); } + } - // Add it to our "add to MsiDigitalCertificate" table dictionary - Row digitalCertificateRow = digitalCertificateTable.CreateRow(null); - digitalCertificateRow[0] = certificateId; + // Add it to our "add to MsiDigitalCertificate" table dictionary + Row digitalCertificateRow = digitalCertificateTable.CreateRow(null); + digitalCertificateRow[0] = certificateId; - // Now set the file path on disk where this binary stream will be picked up at import time - digitalCertificateRow[1] = string.Concat(certificateId, ".cer"); + // Now set the file path on disk where this binary stream will be picked up at import time + digitalCertificateRow[1] = string.Concat(certificateId, ".cer"); - // Load the cert to get it's thumbprint - X509Certificate cert = X509Certificate.CreateFromCertFile(certPath); - X509Certificate2 cert2 = new X509Certificate2(cert); + // Load the cert to get it's thumbprint + X509Certificate cert = X509Certificate.CreateFromCertFile(certPath); + X509Certificate2 cert2 = new X509Certificate2(cert); - certificates.Add(cert2.Thumbprint, certificateId); - } + certificates.Add(cert2.Thumbprint, certificateId); } } } using (View mediaView = database.OpenExecuteView("SELECT * FROM `Media`")) { - while (true) + foreach (Record mediaRecord in mediaView.Records) { - using (Record mediaRecord = mediaView.Fetch()) + X509Certificate2 cert2 = null; + Row digitalSignatureRow = null; + + string cabName = mediaRecord.GetString(4); // get the name of the cab + // If there is no cabinet or it's an internal cab, skip it. + if (String.IsNullOrEmpty(cabName) || cabName.StartsWith("#", StringComparison.Ordinal)) { - if (null == mediaRecord) - { - break; - } + continue; + } - X509Certificate2 cert2 = null; - Row digitalSignatureRow = null; + string cabId = mediaRecord.GetString(1); // get the ID of the cab + string cabPath = Path.Combine(Path.GetDirectoryName(this.Context.InputFilePath), cabName); - string cabName = mediaRecord.GetString(4); // get the name of the cab - // If there is no cabinet or it's an internal cab, skip it. - if (String.IsNullOrEmpty(cabName) || cabName.StartsWith("#", StringComparison.Ordinal)) - { - continue; - } + // If the cabs aren't there, throw an error but continue to catch the other errors + if (!File.Exists(cabPath)) + { + this.Messaging.Write(ErrorMessages.WixFileNotFound(cabPath)); + continue; + } - string cabId = mediaRecord.GetString(1); // get the ID of the cab - string cabPath = Path.Combine(Path.GetDirectoryName(this.Context.InputFilePath), cabName); + try + { + // Get the certificate from the cab + X509Certificate signedFileCert = X509Certificate.CreateFromSignedFile(cabPath); + cert2 = new X509Certificate2(signedFileCert); + } + catch (System.Security.Cryptography.CryptographicException e) + { + uint HResult = unchecked((uint)Marshal.GetHRForException(e)); - // If the cabs aren't there, throw an error but continue to catch the other errors - if (!File.Exists(cabPath)) + // If the file has no cert, continue, but flag that we found at least one so we can later give a warning + if (0x80092009 == HResult) // CRYPT_E_NO_MATCH { - this.Messaging.Write(ErrorMessages.WixFileNotFound(cabPath)); + foundUnsignedExternals = true; continue; } - try + // todo: exactly which HRESULT corresponds to this issue? + // If it's one of these exact platforms, warn the user that it may be due to their OS. + if ((5 == Environment.OSVersion.Version.Major && 2 == Environment.OSVersion.Version.Minor) || // W2K3 + (5 == Environment.OSVersion.Version.Major && 1 == Environment.OSVersion.Version.Minor)) // XP { - // Get the certificate from the cab - X509Certificate signedFileCert = X509Certificate.CreateFromSignedFile(cabPath); - cert2 = new X509Certificate2(signedFileCert); + this.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFileDownlevelOS(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult))); } - catch (System.Security.Cryptography.CryptographicException e) + else // otherwise, generic error { - uint HResult = unchecked((uint)Marshal.GetHRForException(e)); - - // If the file has no cert, continue, but flag that we found at least one so we can later give a warning - if (0x80092009 == HResult) // CRYPT_E_NO_MATCH - { - foundUnsignedExternals = true; - continue; - } - - // todo: exactly which HRESULT corresponds to this issue? - // If it's one of these exact platforms, warn the user that it may be due to their OS. - if ((5 == Environment.OSVersion.Version.Major && 2 == Environment.OSVersion.Version.Minor) || // W2K3 - (5 == Environment.OSVersion.Version.Major && 1 == Environment.OSVersion.Version.Minor)) // XP - { - this.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFileDownlevelOS(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult))); - } - else // otherwise, generic error - { - this.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFile(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult))); - } + this.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFile(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult))); } + } - // If we haven't added this cert to the MsiDigitalCertificate table, set it up to be added - if (!certificates.ContainsKey(cert2.Thumbprint)) - { - // generate a stable identifier - string certificateGeneratedId = Common.GenerateIdentifier("cer", cert2.Thumbprint); - - // Add it to our "add to MsiDigitalCertificate" table dictionary - Row digitalCertificateRow = digitalCertificateTable.CreateRow(null); - digitalCertificateRow[0] = certificateGeneratedId; - - // Export to a file, because the MSI API's require us to provide a file path on disk - string certPath = Path.Combine(this.Context.IntermediateFolder, "MsiDigitalCertificate"); - Directory.CreateDirectory(certPath); - certPath = Path.Combine(certPath, string.Concat(cert2.Thumbprint, ".cer")); - File.Delete(certPath); + // If we haven't added this cert to the MsiDigitalCertificate table, set it up to be added + if (!certificates.ContainsKey(cert2.Thumbprint)) + { + // generate a stable identifier + string certificateGeneratedId = Common.GenerateIdentifier("cer", cert2.Thumbprint); - using (BinaryWriter writer = new BinaryWriter(File.Open(certPath, FileMode.Create))) - { - writer.Write(cert2.RawData); - writer.Close(); - } + // Add it to our "add to MsiDigitalCertificate" table dictionary + Row digitalCertificateRow = digitalCertificateTable.CreateRow(null); + digitalCertificateRow[0] = certificateGeneratedId; - // Now set the file path on disk where this binary stream will be picked up at import time - digitalCertificateRow[1] = string.Concat(cert2.Thumbprint, ".cer"); + // Export to a file, because the MSI API's require us to provide a file path on disk + string certPath = Path.Combine(this.Context.IntermediateFolder, "MsiDigitalCertificate"); + Directory.CreateDirectory(certPath); + certPath = Path.Combine(certPath, string.Concat(cert2.Thumbprint, ".cer")); + File.Delete(certPath); - certificates.Add(cert2.Thumbprint, certificateGeneratedId); + using (BinaryWriter writer = new BinaryWriter(File.Open(certPath, FileMode.Create))) + { + writer.Write(cert2.RawData); + writer.Close(); } - digitalSignatureRow = digitalSignatureTable.CreateRow(null); + // Now set the file path on disk where this binary stream will be picked up at import time + digitalCertificateRow[1] = string.Concat(cert2.Thumbprint, ".cer"); - digitalSignatureRow[0] = "Media"; - digitalSignatureRow[1] = cabId; - digitalSignatureRow[2] = certificates[cert2.Thumbprint]; + certificates.Add(cert2.Thumbprint, certificateGeneratedId); } + + digitalSignatureRow = digitalSignatureTable.CreateRow(null); + + digitalSignatureRow[0] = "Media"; + digitalSignatureRow[1] = cabId; + digitalSignatureRow[2] = certificates[cert2.Thumbprint]; } } @@ -275,7 +251,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe certificates = null; - // If we did find external cabs but none of them were signed, give a warning + // If we did find external cabs but not all of them were signed, give a warning if (foundUnsignedExternals) { this.Messaging.Write(WarningMessages.ExternalCabsAreNotSigned(this.Context.InputFilePath)); diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/View.cs b/src/WixToolset.Core.WindowsInstaller/Msi/View.cs index 1beb72da..0fb7fc62 100644 --- a/src/WixToolset.Core.WindowsInstaller/Msi/View.cs +++ b/src/WixToolset.Core.WindowsInstaller/Msi/View.cs @@ -3,6 +3,8 @@ namespace WixToolset.Core.WindowsInstaller.Msi { using System; + using System.Collections; + using System.Collections.Generic; using System.Globalization; /// @@ -109,6 +111,11 @@ namespace WixToolset.Core.WindowsInstaller.Msi this.Handle = handle; } + /// + /// Enumerator that automatically disposes of the retrieved Records. + /// + public IEnumerable Records => new ViewEnumerable(this); + /// /// Executes a view with no customizable parameters. /// @@ -124,7 +131,7 @@ namespace WixToolset.Core.WindowsInstaller.Msi /// Record containing parameters to be substituded into the view. public void Execute(Record record) { - int error = MsiInterop.MsiViewExecute(this.Handle, null == record ? 0 : record.Handle); + var error = MsiInterop.MsiViewExecute(this.Handle, null == record ? 0 : record.Handle); if (0 != error) { throw new MsiException(error); @@ -137,9 +144,7 @@ namespace WixToolset.Core.WindowsInstaller.Msi /// Returns the fetched record; otherwise null. public Record Fetch() { - uint recordHandle; - - int error = MsiInterop.MsiViewFetch(this.Handle, out recordHandle); + var error = MsiInterop.MsiViewFetch(this.Handle, out var recordHandle); if (259 == error) { return null; @@ -183,5 +188,75 @@ namespace WixToolset.Core.WindowsInstaller.Msi return new Record(recordHandle); } + + private class ViewEnumerable : IEnumerable + { + private readonly View view; + + public ViewEnumerable(View view) => this.view = view; + + public IEnumerator GetEnumerator() => new ViewEnumerator(this.view); + + IEnumerator IEnumerable.GetEnumerator() => new ViewEnumerator(this.view); + } + + private class ViewEnumerator : IEnumerator + { + private readonly View view; + private readonly List records = new List(); + private int position = -1; + private bool disposed; + + public ViewEnumerator(View view) => this.view = view; + + public Record Current => this.records[this.position]; + + object IEnumerator.Current => this.records[this.position]; + + public bool MoveNext() + { + if (this.position + 1 >= this.records.Count) + { + var record = this.view.Fetch(); + + if (record == null) + { + return false; + } + + this.records.Add(record); + this.position = this.records.Count - 1; + } + else + { + ++this.position; + } + + return true; + } + + public void Reset() => this.position = -1; + + public void Dispose() + { + this.Dispose(true); + } + + protected virtual void Dispose(bool disposing) + { + if (!this.disposed) + { + if (disposing) + { + foreach (var record in this.records) + { + record.Dispose(); + } + } + + this.disposed = true; + } + } + } } } diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs index 557500e8..fb4b4ee3 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs @@ -121,142 +121,125 @@ namespace WixToolset.Core.WindowsInstaller.Unbind // get the normal tables using (var tablesView = this.Database.OpenExecuteView("SELECT * FROM _Tables")) { - while (true) + foreach (var tableRecord in tablesView.Records) { - using (var tableRecord = tablesView.Fetch()) - { - if (null == tableRecord) - { - break; - } + var tableName = tableRecord.GetString(1); - var tableName = tableRecord.GetString(1); + using (var tableView = this.Database.OpenExecuteView(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM `{0}`", tableName))) + { + var tableDefinition = this.GetTableDefinition(tableName, tableView, validationView); + var table = new Table(tableDefinition); - using (var tableView = this.Database.OpenExecuteView(String.Format(CultureInfo.InvariantCulture, "SELECT * FROM `{0}`", tableName))) + foreach (var rowRecord in tableView.Records) { - var tableDefinition = this.GetTableDefinition(tableName, tableView, validationView); - var table = new Table(tableDefinition); + var recordCount = rowRecord.GetFieldCount(); + var row = table.CreateRow(output.SourceLineNumbers); - while (true) + for (var i = 0; recordCount > i && row.Fields.Length > i; i++) { - using (var rowRecord = tableView.Fetch()) + if (rowRecord.IsNull(i + 1)) { - if (null == rowRecord) + if (!row.Fields[i].Column.Nullable) { - break; + // TODO: display an error for a null value in a non-nullable field OR + // display a warning and put an empty string in the value to let the compiler handle it + // (the second option is risky because the later code may make certain assumptions about + // the contents of a row value) } - - var recordCount = rowRecord.GetFieldCount(); - var row = table.CreateRow(output.SourceLineNumbers); - - for (var i = 0; recordCount > i && row.Fields.Length > i; i++) + } + else + { + switch (row.Fields[i].Column.Type) { - if (rowRecord.IsNull(i + 1)) - { - if (!row.Fields[i].Column.Nullable) + case ColumnType.Number: + var success = false; + var intValue = rowRecord.GetInteger(i + 1); + if (row.Fields[i].Column.IsLocalizable) { - // TODO: display an error for a null value in a non-nullable field OR - // display a warning and put an empty string in the value to let the compiler handle it - // (the second option is risky because the later code may make certain assumptions about - // the contents of a row value) + success = row.BestEffortSetField(i, Convert.ToString(intValue, CultureInfo.InvariantCulture)); } - } - else - { - switch (row.Fields[i].Column.Type) + else { - case ColumnType.Number: - var success = false; - var intValue = rowRecord.GetInteger(i + 1); - if (row.Fields[i].Column.IsLocalizable) - { - success = row.BestEffortSetField(i, Convert.ToString(intValue, CultureInfo.InvariantCulture)); - } - else - { - success = row.BestEffortSetField(i, intValue); - } + success = row.BestEffortSetField(i, intValue); + } - if (!success) - { - this.Messaging.Write(WarningMessages.BadColumnDataIgnored(row.SourceLineNumbers, Convert.ToString(intValue, CultureInfo.InvariantCulture), tableName, row.Fields[i].Column.Name)); - } - break; - case ColumnType.Object: - var sourceFile = "FILE NOT EXPORTED, USE THE dark.exe -x OPTION TO EXPORT BINARIES"; + if (!success) + { + this.Messaging.Write(WarningMessages.BadColumnDataIgnored(row.SourceLineNumbers, Convert.ToString(intValue, CultureInfo.InvariantCulture), tableName, row.Fields[i].Column.Name)); + } + break; + case ColumnType.Object: + var sourceFile = "FILE NOT EXPORTED, USE THE dark.exe -x OPTION TO EXPORT BINARIES"; - if (null != this.ExportBasePath) - { - var relativeSourceFile = Path.Combine(tableName, row.GetPrimaryKey('.')); - sourceFile = Path.Combine(this.ExportBasePath, relativeSourceFile); + if (null != this.ExportBasePath) + { + var relativeSourceFile = Path.Combine(tableName, row.GetPrimaryKey('.')); + sourceFile = Path.Combine(this.ExportBasePath, relativeSourceFile); - // ensure the parent directory exists - System.IO.Directory.CreateDirectory(Path.Combine(this.ExportBasePath, tableName)); + // ensure the parent directory exists + System.IO.Directory.CreateDirectory(Path.Combine(this.ExportBasePath, tableName)); - using (var fs = System.IO.File.Create(sourceFile)) - { - int bytesRead; - var buffer = new byte[512]; + using (var fs = System.IO.File.Create(sourceFile)) + { + int bytesRead; + var buffer = new byte[512]; - while (0 != (bytesRead = rowRecord.GetStream(i + 1, buffer, buffer.Length))) - { - fs.Write(buffer, 0, bytesRead); - } + while (0 != (bytesRead = rowRecord.GetStream(i + 1, buffer, buffer.Length))) + { + fs.Write(buffer, 0, bytesRead); } - - this.exportedFiles.Add(sourceFile); } - row[i] = sourceFile; - break; - default: - var value = rowRecord.GetString(i + 1); + this.exportedFiles.Add(sourceFile); + } - switch (row.Fields[i].Column.Category) - { + row[i] = sourceFile; + break; + default: + var value = rowRecord.GetString(i + 1); + + switch (row.Fields[i].Column.Category) + { case ColumnCategory.Guid: value = value.ToUpper(CultureInfo.InvariantCulture); break; - } + } - // de-modularize - if (!this.SuppressDemodularization && OutputType.Module == output.Type && ColumnModularizeType.None != row.Fields[i].Column.ModularizeType) - { - var modularization = new Regex(@"\.[0-9A-Fa-f]{8}_[0-9A-Fa-f]{4}_[0-9A-Fa-f]{4}_[0-9A-Fa-f]{4}_[0-9A-Fa-f]{12}"); + // de-modularize + if (!this.SuppressDemodularization && OutputType.Module == output.Type && ColumnModularizeType.None != row.Fields[i].Column.ModularizeType) + { + var modularization = new Regex(@"\.[0-9A-Fa-f]{8}_[0-9A-Fa-f]{4}_[0-9A-Fa-f]{4}_[0-9A-Fa-f]{4}_[0-9A-Fa-f]{12}"); - if (null == modularizationGuid) + if (null == modularizationGuid) + { + var match = modularization.Match(value); + if (match.Success) { - var match = modularization.Match(value); - if (match.Success) - { - modularizationGuid = String.Concat('{', match.Value.Substring(1).Replace('_', '-'), '}'); - } + modularizationGuid = String.Concat('{', match.Value.Substring(1).Replace('_', '-'), '}'); } - - value = modularization.Replace(value, String.Empty); } - // escape "$(" for the preprocessor - value = value.Replace("$(", "$$("); + value = modularization.Replace(value, String.Empty); + } - // escape things that look like wix variables - var matches = Common.WixVariableRegex.Matches(value); - for (var j = matches.Count - 1; 0 <= j; j--) - { - value = value.Insert(matches[j].Index, "!"); - } + // escape "$(" for the preprocessor + value = value.Replace("$(", "$$("); - row[i] = value; - break; + // escape things that look like wix variables + var matches = Common.WixVariableRegex.Matches(value); + for (var j = matches.Count - 1; 0 <= j; j--) + { + value = value.Insert(matches[j].Index, "!"); } - } + + row[i] = value; + break; } } } - - output.Tables.Add(table); } + output.Tables.Add(table); } } } @@ -634,82 +617,82 @@ namespace WixToolset.Core.WindowsInstaller.Unbind { switch (table.Name) { - case "WixFile": - case "MsiFileHash": - ConnectTableToSection(table, fileSectionIdIndex, 0); - break; - case "MsiAssembly": - case "MsiAssemblyName": - ConnectTableToSection(table, componentSectionIdIndex, 0); - break; - case "MsiPackageCertificate": - case "MsiPatchCertificate": - ConnectTableToSection(table, digitalCertificateSectionIdIndex, 1); - break; - case "CreateFolder": - case "FeatureComponents": - case "MoveFile": - case "ReserveCost": - case "ODBCTranslator": - ConnectTableToSection(table, componentSectionIdIndex, 1); - break; - case "TypeLib": - ConnectTableToSection(table, componentSectionIdIndex, 2); - break; - case "Shortcut": - case "Environment": - ConnectTableToSection(table, componentSectionIdIndex, 3); - break; - case "RemoveRegistry": - ConnectTableToSection(table, componentSectionIdIndex, 4); - break; - case "ServiceControl": - ConnectTableToSection(table, componentSectionIdIndex, 5); - break; - case "IniFile": - case "RemoveIniFile": - ConnectTableToSection(table, componentSectionIdIndex, 7); - break; - case "AppId": - ConnectTableToSection(table, appIdSectionIdIndex, 0); - break; - case "Condition": - ConnectTableToSection(table, featureSectionIdIndex, 0); - break; - case "ODBCSourceAttribute": - ConnectTableToSection(table, odbcDataSourceSectionIdIndex, 0); - break; - case "ODBCAttribute": - ConnectTableToSection(table, odbcDriverSectionIdIndex, 0); - break; - case "AdminExecuteSequence": - case "AdminUISequence": - case "AdvtExecuteSequence": - case "AdvtUISequence": - case "InstallExecuteSequence": - case "InstallUISequence": - ConnectTableToSection(table, customActionSectionIdIndex, 0); - break; - case "LockPermissions": - case "MsiLockPermissions": - foreach (var row in table.Rows) - { - var lockObject = (string)row[0]; - var tableName = (string)row[1]; - switch (tableName) + case "WixFile": + case "MsiFileHash": + ConnectTableToSection(table, fileSectionIdIndex, 0); + break; + case "MsiAssembly": + case "MsiAssemblyName": + ConnectTableToSection(table, componentSectionIdIndex, 0); + break; + case "MsiPackageCertificate": + case "MsiPatchCertificate": + ConnectTableToSection(table, digitalCertificateSectionIdIndex, 1); + break; + case "CreateFolder": + case "FeatureComponents": + case "MoveFile": + case "ReserveCost": + case "ODBCTranslator": + ConnectTableToSection(table, componentSectionIdIndex, 1); + break; + case "TypeLib": + ConnectTableToSection(table, componentSectionIdIndex, 2); + break; + case "Shortcut": + case "Environment": + ConnectTableToSection(table, componentSectionIdIndex, 3); + break; + case "RemoveRegistry": + ConnectTableToSection(table, componentSectionIdIndex, 4); + break; + case "ServiceControl": + ConnectTableToSection(table, componentSectionIdIndex, 5); + break; + case "IniFile": + case "RemoveIniFile": + ConnectTableToSection(table, componentSectionIdIndex, 7); + break; + case "AppId": + ConnectTableToSection(table, appIdSectionIdIndex, 0); + break; + case "Condition": + ConnectTableToSection(table, featureSectionIdIndex, 0); + break; + case "ODBCSourceAttribute": + ConnectTableToSection(table, odbcDataSourceSectionIdIndex, 0); + break; + case "ODBCAttribute": + ConnectTableToSection(table, odbcDriverSectionIdIndex, 0); + break; + case "AdminExecuteSequence": + case "AdminUISequence": + case "AdvtExecuteSequence": + case "AdvtUISequence": + case "InstallExecuteSequence": + case "InstallUISequence": + ConnectTableToSection(table, customActionSectionIdIndex, 0); + break; + case "LockPermissions": + case "MsiLockPermissions": + foreach (var row in table.Rows) { - case "File": - row.SectionId = (string)fileSectionIdIndex[lockObject]; - break; - case "Registry": - row.SectionId = (string)registrySectionIdIndex[lockObject]; - break; - case "ServiceInstall": - row.SectionId = (string)serviceInstallSectionIdIndex[lockObject]; - break; + var lockObject = (string)row[0]; + var tableName = (string)row[1]; + switch (tableName) + { + case "File": + row.SectionId = (string)fileSectionIdIndex[lockObject]; + break; + case "Registry": + row.SectionId = (string)registrySectionIdIndex[lockObject]; + break; + case "ServiceInstall": + row.SectionId = (string)serviceInstallSectionIdIndex[lockObject]; + break; + } } - } - break; + break; } } diff --git a/src/WixToolset.Core.WindowsInstaller/Validator.cs b/src/WixToolset.Core.WindowsInstaller/Validator.cs index 1c9cdc2f..72b09ebc 100644 --- a/src/WixToolset.Core.WindowsInstaller/Validator.cs +++ b/src/WixToolset.Core.WindowsInstaller/Validator.cs @@ -201,21 +201,13 @@ namespace WixToolset.Core.WindowsInstaller List actions = new List(); using (View view = database.OpenExecuteView("SELECT `Action` FROM `_ICESequence` ORDER BY `Sequence`")) { - while (true) + foreach (Record record in view.Records) { - using (Record record = view.Fetch()) - { - if (null == record) - { - break; - } + string action = record.GetString(1); - string action = record.GetString(1); - - if ((this.SuppressedICEs == null || !this.SuppressedICEs.Contains(action)) && (this.ICEs == null || this.ICEs.Contains(action))) - { - actions.Add(action); - } + if ((this.SuppressedICEs == null || !this.SuppressedICEs.Contains(action)) && (this.ICEs == null || this.ICEs.Contains(action))) + { + actions.Add(action); } } } diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 5ee60984..023a3c1e 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs @@ -591,7 +591,7 @@ namespace WixToolset.Core.CommandLine this.OutputType = Path.GetExtension(this.OutputFile); } - switch (this.OutputType.ToLowerInvariant()) + switch (this.OutputType?.ToLowerInvariant()) { case "bundle": case ".exe": -- cgit v1.2.3-55-g6feb