Replaced ReadPrintableAsciiString with ReadString and the correct encoding.

KN4CK3R · KN4CK3R · commit d7af6033d67a · 2019-05-07T11:49:58.000+02:00
diff --git a/ReClass.NET/Extensions/EncodingExtensions.cs b/ReClass.NET/Extensions/EncodingExtensions.cs
@@ -10,7 +10,7 @@ public static class EncodingExtension
 		/// <returns>The byte count per character.</returns>
 		public static int GuessByteCountPerChar(this Encoding encoding)
 		{
-			if (encoding.IsSameCodePage(Encoding.UTF8) || encoding.IsSameCodePage(Encoding.ASCII)) return 1;
+			if (encoding.IsSameCodePage(Encoding.UTF8) || encoding.CodePage == 1252 /* Windows-1252 */ || encoding.IsSameCodePage(Encoding.ASCII)) return 1;
 			if (encoding.IsSameCodePage(Encoding.Unicode) || encoding.IsSameCodePage(Encoding.BigEndianUnicode)) return 2;
 			if (encoding.IsSameCodePage(Encoding.UTF32)) return 4;
 
diff --git a/ReClass.NET/Memory/MemoryBuffer.cs b/ReClass.NET/Memory/MemoryBuffer.cs
@@ -339,31 +339,6 @@ public IntPtr ReadIntPtr(int offset)
 
 		#endregion
 
-		public string ReadPrintableAsciiString(int offset, int length)
-		{
-			Contract.Requires(offset >= 0);
-			Contract.Requires(length >= 0);
-			Contract.Ensures(Contract.Result<string>() != null);
-
-			if (Offset + offset + length > data.Length)
-			{
-				length = Math.Max(data.Length - Offset - offset, 0);
-			}
-
-			if (length <= 0)
-			{
-				return string.Empty;
-			}
-
-			var sb = new StringBuilder(length);
-			for (var i = 0; i < length; ++i)
-			{
-				var c = (char)data[Offset + offset + i];
-				sb.Append(c.IsPrintable() ? c : '.');
-			}
-			return sb.ToString();
-		}
-
 		public string ReadString(Encoding encoding, int offset, int length)
 		{
 			Contract.Requires(encoding != null);
diff --git a/ReClass.NET/Nodes/Hex16Node.cs b/ReClass.NET/Nodes/Hex16Node.cs
@@ -23,7 +23,7 @@ public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadPrintableAsciiString(Offset, 2) + "       " : null, 2);
+			return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadString(view.Settings.RawDataEncoding, Offset, 2) + "       " : null, 2);
 		}
 
 		public override void Update(HotSpot spot)
diff --git a/ReClass.NET/Nodes/Hex32Node.cs b/ReClass.NET/Nodes/Hex32Node.cs
@@ -33,7 +33,7 @@ public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadPrintableAsciiString(Offset, 4) + "     " : null, 4);
+			return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadString(view.Settings.RawDataEncoding, Offset, 4) + "     " : null, 4);
 		}
 
 		public override void Update(HotSpot spot)
diff --git a/ReClass.NET/Nodes/Hex64Node.cs b/ReClass.NET/Nodes/Hex64Node.cs
@@ -33,7 +33,7 @@ public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadPrintableAsciiString(Offset, 8) + " " : null, 8);
+			return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadString(view.Settings.RawDataEncoding, Offset, 8) + " " : null, 8);
 		}
 
 		public override void Update(HotSpot spot)
diff --git a/ReClass.NET/Nodes/Hex8Node.cs b/ReClass.NET/Nodes/Hex8Node.cs
@@ -23,7 +23,7 @@ public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadPrintableAsciiString(Offset, 1) + "        " : null, 1);
+			return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadString(view.Settings.RawDataEncoding, Offset, 1) + "        " : null, 1);
 		}
 
 		public override void Update(HotSpot spot)
diff --git a/ReClass.NET/Settings.cs b/ReClass.NET/Settings.cs
@@ -1,4 +1,5 @@
 ﻿using System.Drawing;
+using System.Text;
 using ReClassNET.Util;
 
 namespace ReClassNET
@@ -21,6 +22,8 @@ public class Settings
 
 		public bool HighlightChangedValues { get; set; } = true;
 
+		public Encoding RawDataEncoding { get; set; } = Encoding.GetEncoding(1252); /* Windows-1252 */
+
 		// Comment Drawing Settings
 
 		public bool ShowCommentFloat { get; set; } = true;

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public static class EncodingExtension`
`10`	`10`	`/// <returns>The byte count per character.</returns>`
`11`	`11`	`public static int GuessByteCountPerChar(this Encoding encoding)`
`12`	`12`	`{`
`13`		`- if (encoding.IsSameCodePage(Encoding.UTF8) \|\| encoding.IsSameCodePage(Encoding.ASCII)) return 1;`
	`13`	`+ if (encoding.IsSameCodePage(Encoding.UTF8) \|\| encoding.CodePage == 1252 /* Windows-1252 */ \|\| encoding.IsSameCodePage(Encoding.ASCII)) return 1;`
`14`	`14`	`if (encoding.IsSameCodePage(Encoding.Unicode) \|\| encoding.IsSameCodePage(Encoding.BigEndianUnicode)) return 2;`
`15`	`15`	`if (encoding.IsSameCodePage(Encoding.UTF32)) return 4;`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)`
`23`	`23`
`24`	`24`	`public override Size Draw(ViewInfo view, int x, int y)`
`25`	`25`	`{`
`26`		`- return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadPrintableAsciiString(Offset, 2) + " " : null, 2);`
	`26`	`+ return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadString(view.Settings.RawDataEncoding, Offset, 2) + " " : null, 2);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public override void Update(HotSpot spot)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)`
`33`	`33`
`34`	`34`	`public override Size Draw(ViewInfo view, int x, int y)`
`35`	`35`	`{`
`36`		`- return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadPrintableAsciiString(Offset, 4) + " " : null, 4);`
	`36`	`+ return Draw(view, x, y, view.Settings.ShowNodeText ? view.Memory.ReadString(view.Settings.RawDataEncoding, Offset, 4) + " " : null, 4);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public override void Update(HotSpot spot)`