From 8caeea053f53e0884da5fb53e1ab4a5560809d5b Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Mon, 29 Apr 2024 00:49:45 -0400 Subject: [PATCH] Handle LPTStr implementations --- SabreTools.IO/Extensions/BinaryReaderExtensions.cs | 2 +- SabreTools.IO/Extensions/ByteArrayReaderExtensions.cs | 2 +- SabreTools.IO/Extensions/StreamReaderExtensions.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SabreTools.IO/Extensions/BinaryReaderExtensions.cs b/SabreTools.IO/Extensions/BinaryReaderExtensions.cs index dfb6eeb..d5da04e 100644 --- a/SabreTools.IO/Extensions/BinaryReaderExtensions.cs +++ b/SabreTools.IO/Extensions/BinaryReaderExtensions.cs @@ -712,6 +712,7 @@ namespace SabreTools.IO.Extensions return encoding.GetString(byvalBytes); case UnmanagedType.LPStr: + case UnmanagedType.LPTStr: // Technically distinct; possibly not null-terminated case null: var lpstrBytes = new List(); while (true) @@ -745,7 +746,6 @@ namespace SabreTools.IO.Extensions return Encoding.Unicode.GetString([.. lpwstrBytes]); // No support required yet - case UnmanagedType.LPTStr: #if NET472_OR_GREATER || NETCOREAPP case UnmanagedType.LPUTF8Str: #endif diff --git a/SabreTools.IO/Extensions/ByteArrayReaderExtensions.cs b/SabreTools.IO/Extensions/ByteArrayReaderExtensions.cs index b5c2064..dde303d 100644 --- a/SabreTools.IO/Extensions/ByteArrayReaderExtensions.cs +++ b/SabreTools.IO/Extensions/ByteArrayReaderExtensions.cs @@ -839,6 +839,7 @@ namespace SabreTools.IO.Extensions return encoding.GetString(byvalBytes); case UnmanagedType.LPStr: + case UnmanagedType.LPTStr: // Technically distinct; possibly not null-terminated case null: var lpstrBytes = new List(); while (true) @@ -872,7 +873,6 @@ namespace SabreTools.IO.Extensions return Encoding.Unicode.GetString([.. lpwstrBytes]); // No support required yet - case UnmanagedType.LPTStr: #if NET472_OR_GREATER || NETCOREAPP case UnmanagedType.LPUTF8Str: #endif diff --git a/SabreTools.IO/Extensions/StreamReaderExtensions.cs b/SabreTools.IO/Extensions/StreamReaderExtensions.cs index 1ea91a6..69e273b 100644 --- a/SabreTools.IO/Extensions/StreamReaderExtensions.cs +++ b/SabreTools.IO/Extensions/StreamReaderExtensions.cs @@ -823,6 +823,7 @@ namespace SabreTools.IO.Extensions return encoding.GetString(byvalBytes); case UnmanagedType.LPStr: + case UnmanagedType.LPTStr: // Technically distinct; possibly not null-terminated case null: var lpstrBytes = new List(); while (true) @@ -856,7 +857,6 @@ namespace SabreTools.IO.Extensions return Encoding.Unicode.GetString([.. lpwstrBytes]); // No support required yet - case UnmanagedType.LPTStr: #if NET472_OR_GREATER || NETCOREAPP case UnmanagedType.LPUTF8Str: #endif