From eacaa8794ba90b3df4ac344e96ec8da155d90d19 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 13 Dec 2022 14:08:57 -0800 Subject: Slightly larger buffer when inscribing bundle plus minor code cleanup --- src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs | 2 +- src/wix/WixToolset.Core.Burn/Bundles/BurnWriter.cs | 6 +++--- .../WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs b/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs index 08ed7d56..95673ab0 100644 --- a/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs +++ b/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs @@ -451,7 +451,7 @@ namespace WixToolset.Core.Burn.Bundles internal struct ContainerSlot { - public ContainerSlot(uint size) : this() + public ContainerSlot(uint size) { this.Size = size; } diff --git a/src/wix/WixToolset.Core.Burn/Bundles/BurnWriter.cs b/src/wix/WixToolset.Core.Burn/Bundles/BurnWriter.cs index a61713f1..29664177 100644 --- a/src/wix/WixToolset.Core.Burn/Bundles/BurnWriter.cs +++ b/src/wix/WixToolset.Core.Burn/Bundles/BurnWriter.cs @@ -135,13 +135,13 @@ namespace WixToolset.Core.Burn.Bundles var nextAddress = this.EngineSize; for (var i = 1; i < reader.AttachedContainers.Count; i++) { - var cntnr = reader.AttachedContainers[i]; + var slot = reader.AttachedContainers[i]; reader.Stream.Seek(nextAddress, SeekOrigin.Begin); // TODO: verify that the size in the section data is 0 or the same size. - this.AppendContainer(reader.Stream, cntnr.Size, BurnCommon.Container.Attached); + this.AppendContainer(reader.Stream, slot.Size, BurnCommon.Container.Attached); - nextAddress += cntnr.Size; + nextAddress += slot.Size; } return true; diff --git a/src/wix/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs b/src/wix/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs index 5eeb7061..d0e1165b 100644 --- a/src/wix/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs +++ b/src/wix/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs @@ -37,7 +37,7 @@ namespace WixToolset.Core.Burn.Inscribe { reader.Stream.Seek(0, SeekOrigin.Begin); - var buffer = new byte[4 * 1024]; + var buffer = new byte[8 * 1024]; var total = 0; var read = 0; do -- cgit v1.2.3-55-g6feb