From 668b4bada7c38bbf69848c626665d35f0cf782c2 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Fri, 29 Sep 2023 11:42:04 -0400 Subject: [PATCH] Fix some byte[] -> string printing --- PortableExecutable.cs | 8 ++++---- SabreTools.Printing.csproj | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PortableExecutable.cs b/PortableExecutable.cs index 495b7e5..59ebdb4 100644 --- a/PortableExecutable.cs +++ b/PortableExecutable.cs @@ -311,7 +311,7 @@ namespace SabreTools.Printing continue; } - builder.AppendLine(entry.Name, " Name"); + builder.AppendLine(entry.Name, " Name", Encoding.ASCII); builder.AppendLine(entry.VirtualSize, " Virtual size"); builder.AppendLine(entry.VirtualAddress, " Virtual address"); builder.AppendLine(entry.VirtualAddress.ConvertVirtualAddress(table ?? Array.Empty()), " Physical address"); @@ -360,7 +360,7 @@ namespace SabreTools.Printing { if (entry.ShortName != null) { - builder.AppendLine(entry.ShortName, " Short name"); + builder.AppendLine(entry.ShortName, " Short name", Encoding.ASCII); } else { @@ -438,7 +438,7 @@ namespace SabreTools.Printing } else if (currentSymbolType == 4) { - builder.AppendLine(entry.AuxFormat4FileName, " File name"); + builder.AppendLine(entry.AuxFormat4FileName, " File name", Encoding.ASCII); auxSymbolsRemaining--; } else if (currentSymbolType == 5) @@ -1036,7 +1036,7 @@ namespace SabreTools.Printing if (entry.NameOffset != default) { builder.AppendLine(entry.NameOffset, $"{padding}Name offset"); - builder.AppendLine(entry.Name?.UnicodeString, $"{padding}Name ({entry.Name?.Length ?? 0})"); + builder.AppendLine(entry.Name?.UnicodeString, $"{padding}Name ({entry.Name?.Length ?? 0})", Encoding.Unicode); } else { diff --git a/SabreTools.Printing.csproj b/SabreTools.Printing.csproj index e5b698e..2593b9d 100644 --- a/SabreTools.Printing.csproj +++ b/SabreTools.Printing.csproj @@ -4,7 +4,7 @@ net48;net6.0;net7.0;net8.0 win-x86;win-x64;linux-x64;osx-x64 - 1.1.0 + 1.1.1 true @@ -30,8 +30,8 @@ - - + +