Added ScanResult.ValueSize.

Author: KN4CK3R

ReClass.NET/MemoryScanner/ScanResult.cs

@@ -11,13 +11,17 @@ public abstract class ScanResult
 
 		public IntPtr Address { get; set; }
 
+		public abstract int ValueSize { get; }
+
 		public abstract ScanResult Clone();
 	}
 
 	public class ByteScanResult : ScanResult, IEquatable<ByteScanResult>
 	{
 		public override ScanValueType ValueType => ScanValueType.Byte;
 
+		public override int ValueSize => sizeof(byte);
+
 		public byte Value { get; }
 
 		public ByteScanResult(byte value)
@@ -50,6 +54,8 @@ public class ShortScanResult : ScanResult, IEquatable<ShortScanResult>
 	{
 		public override ScanValueType ValueType => ScanValueType.Short;
 
+		public override int ValueSize => sizeof(short);
+
 		public short Value { get; }
 
 		public ShortScanResult(short value)
@@ -82,6 +88,8 @@ public class IntegerScanResult : ScanResult, IEquatable<IntegerScanResult>
 	{
 		public override ScanValueType ValueType => ScanValueType.Integer;
 
+		public override int ValueSize => sizeof(int);
+
 		public int Value { get; }
 
 		public IntegerScanResult(int value)
@@ -114,6 +122,8 @@ public class LongScanResult : ScanResult, IEquatable<LongScanResult>
 	{
 		public override ScanValueType ValueType => ScanValueType.Long;
 
+		public override int ValueSize => sizeof(long);
+
 		public long Value { get; }
 
 		public LongScanResult(long value)
@@ -146,6 +156,8 @@ public class FloatScanResult : ScanResult, IEquatable<FloatScanResult>
 	{
 		public override ScanValueType ValueType => ScanValueType.Float;
 
+		public override int ValueSize => sizeof(float);
+
 		public float Value { get; }
 
 		public FloatScanResult(float value)
@@ -178,6 +190,8 @@ public class DoubleScanResult : ScanResult, IEquatable<DoubleScanResult>
 	{
 		public override ScanValueType ValueType => ScanValueType.Double;
 
+		public override int ValueSize => sizeof(double);
+
 		public double Value { get; }
 
 		public DoubleScanResult(double value)
@@ -210,6 +224,8 @@ public class ArrayOfBytesScanResult : ScanResult, IEquatable<ArrayOfBytesScanRes
 	{
 		public override ScanValueType ValueType => ScanValueType.ArrayOfBytes;
 
+		public override int ValueSize => Value.Length;
+
 		public byte[] Value { get; }
 
 		public ArrayOfBytesScanResult(byte[] value)
@@ -244,6 +260,8 @@ public class StringScanResult : ScanResult, IEquatable<StringScanResult>
 	{
 		public override ScanValueType ValueType => ScanValueType.String;
 
+		public override int ValueSize => Value.Length;
+
 		public string Value { get; }
 
 		public Encoding Encoding { get; }

ReClass.NET/MemoryScanner/Scanner.cs

@@ -244,7 +244,7 @@ private Task<bool> FirstScan(IScanComparer comparer, IProgress<int> progress, Ca
 									.ToList();
 								if (results.Count > 0)
 								{
-									var block = CreateResultBlock(results, start, comparer.ValueSize);
+									var block = CreateResultBlock(results, start);
 									store.AddBlock(block); // Store the result block.
 								}
 							}
@@ -309,7 +309,7 @@ private Task<bool> NextScan(IScanComparer comparer, IProgress<int> progress, Can
 									.ToList();
 								if (results.Count > 0)
 								{
-									var block = CreateResultBlock(results, b.Start, comparer.ValueSize);
+									var block = CreateResultBlock(results, b.Start);
 									store.AddBlock(block);
 								}
 							}
@@ -375,16 +375,18 @@ private static List<ConsolidatedMemoryRegion> ConsolidateSections(IList<Section>
 		/// </summary>
 		/// <param name="results">The results in this block.</param>
 		/// <param name="previousStartAddress">The start address of the previous block or section.</param>
-		/// <param name="valueSize">The size of the value type.</param>
 		/// <returns>The new result block.</returns>
-		private static ScanResultBlock CreateResultBlock(IReadOnlyList<ScanResult> results, IntPtr previousStartAddress, int valueSize)
+		private static ScanResultBlock CreateResultBlock(IReadOnlyList<ScanResult> results, IntPtr previousStartAddress)
 		{
+			var firstResult = results.First();
+			var lastResult = results.Last();
+
 			// Calculate start and end address
-			var startAddress = results.First().Address.Add(previousStartAddress);
-			var endAddress = results.Last().Address.Add(previousStartAddress) + valueSize;
+			var startAddress = firstResult.Address.Add(previousStartAddress);
+			var endAddress = lastResult.Address.Add(previousStartAddress) + lastResult.ValueSize;
 
 			// Adjust the offsets of the results
-			var firstOffset = results.First().Address;
+			var firstOffset = firstResult.Address;
 			foreach (var result in results)
 			{
 				result.Address = result.Address.Sub(firstOffset);