diff options
Diffstat (limited to 'src/WixToolset.Core.Burn')
| -rw-r--r-- | src/WixToolset.Core.Burn/Bundles/BurnCommon.cs | 10 | ||||
| -rw-r--r-- | src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs b/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs index 5cff0b5a..01c9f9ca 100644 --- a/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs +++ b/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs | |||
| @@ -354,7 +354,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
| 354 | /// <param name="bytes">Array from which to read.</param> | 354 | /// <param name="bytes">Array from which to read.</param> |
| 355 | /// <param name="offset">Beginning offset from which to read.</param> | 355 | /// <param name="offset">Beginning offset from which to read.</param> |
| 356 | /// <returns>value at offset</returns> | 356 | /// <returns>value at offset</returns> |
| 357 | private static UInt16 ReadUInt16(byte[] bytes, UInt32 offset) | 357 | internal static UInt16 ReadUInt16(byte[] bytes, UInt32 offset) |
| 358 | { | 358 | { |
| 359 | Debug.Assert(offset + 2 <= bytes.Length); | 359 | Debug.Assert(offset + 2 <= bytes.Length); |
| 360 | return (UInt16)(bytes[offset] + (bytes[offset + 1] << 8)); | 360 | return (UInt16)(bytes[offset] + (bytes[offset + 1] << 8)); |
| @@ -366,10 +366,10 @@ namespace WixToolset.Core.Burn.Bundles | |||
| 366 | /// <param name="bytes">Array from which to read.</param> | 366 | /// <param name="bytes">Array from which to read.</param> |
| 367 | /// <param name="offset">Beginning offset from which to read.</param> | 367 | /// <param name="offset">Beginning offset from which to read.</param> |
| 368 | /// <returns>value at offset</returns> | 368 | /// <returns>value at offset</returns> |
| 369 | private static UInt32 ReadUInt32(byte[] bytes, UInt32 offset) | 369 | internal static UInt32 ReadUInt32(byte[] bytes, UInt32 offset) |
| 370 | { | 370 | { |
| 371 | Debug.Assert(offset + 4 <= bytes.Length); | 371 | Debug.Assert(offset + 4 <= bytes.Length); |
| 372 | return (UInt32)(bytes[offset] + (bytes[offset + 1] << 8) + (bytes[offset + 2] << 16) + (bytes[offset + 3] << 24)); | 372 | return BurnCommon.ReadUInt16(bytes, offset) + ((UInt32)BurnCommon.ReadUInt16(bytes, offset + 2) << 16); |
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | /// <summary> | 375 | /// <summary> |
| @@ -378,10 +378,10 @@ namespace WixToolset.Core.Burn.Bundles | |||
| 378 | /// <param name="bytes">Array from which to read.</param> | 378 | /// <param name="bytes">Array from which to read.</param> |
| 379 | /// <param name="offset">Beginning offset from which to read.</param> | 379 | /// <param name="offset">Beginning offset from which to read.</param> |
| 380 | /// <returns>value at offset</returns> | 380 | /// <returns>value at offset</returns> |
| 381 | private static UInt64 ReadUInt64(byte[] bytes, UInt32 offset) | 381 | internal static UInt64 ReadUInt64(byte[] bytes, UInt32 offset) |
| 382 | { | 382 | { |
| 383 | Debug.Assert(offset + 8 <= bytes.Length); | 383 | Debug.Assert(offset + 8 <= bytes.Length); |
| 384 | return BurnCommon.ReadUInt32(bytes, offset) + ((UInt64)(BurnCommon.ReadUInt32(bytes, offset + 4)) << 32); | 384 | return BurnCommon.ReadUInt32(bytes, offset) + ((UInt64)BurnCommon.ReadUInt32(bytes, offset + 4) << 32); |
| 385 | } | 385 | } |
| 386 | } | 386 | } |
| 387 | } | 387 | } |
diff --git a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj index 77e0856a..b0be1d3b 100644 --- a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj +++ b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj | |||
| @@ -15,6 +15,9 @@ | |||
| 15 | <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo"> | 15 | <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo"> |
| 16 | <_Parameter1>WixToolset.Core.TestPackage, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a9967ec28982f42ee51a47dd5204315975a6ed69294b982146a99a70130a2fa13e226aaddde14c17d1bf3af69e8956d69a86585e74d208efcc5ac98a0686055327b2e87960d3c39bf3a6bc1e572863327d19dbf4fd2616dda124dbea260755a2d1d39d3cf1049ea526493eb2bf996b8ad985e3012308529e5b9b0f5cd5fa04bd</_Parameter1> | 16 | <_Parameter1>WixToolset.Core.TestPackage, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a9967ec28982f42ee51a47dd5204315975a6ed69294b982146a99a70130a2fa13e226aaddde14c17d1bf3af69e8956d69a86585e74d208efcc5ac98a0686055327b2e87960d3c39bf3a6bc1e572863327d19dbf4fd2616dda124dbea260755a2d1d39d3cf1049ea526493eb2bf996b8ad985e3012308529e5b9b0f5cd5fa04bd</_Parameter1> |
| 17 | </AssemblyAttribute> | 17 | </AssemblyAttribute> |
| 18 | <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo"> | ||
| 19 | <_Parameter1>WixToolsetTest.Core.Burn, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a9967ec28982f42ee51a47dd5204315975a6ed69294b982146a99a70130a2fa13e226aaddde14c17d1bf3af69e8956d69a86585e74d208efcc5ac98a0686055327b2e87960d3c39bf3a6bc1e572863327d19dbf4fd2616dda124dbea260755a2d1d39d3cf1049ea526493eb2bf996b8ad985e3012308529e5b9b0f5cd5fa04bd</_Parameter1> | ||
| 20 | </AssemblyAttribute> | ||
| 18 | </ItemGroup> | 21 | </ItemGroup> |
| 19 | 22 | ||
| 20 | <ItemGroup> | 23 | <ItemGroup> |
