Merge remote-tracking branch 'upstream/master'

titto · titto · commit 3c10ff999a34 · 2019-08-14T23:21:14.000+10:00
diff --git a/ReClass.NET/Forms/ScannerForm.cs b/ReClass.NET/Forms/ScannerForm.cs
@@ -734,6 +734,14 @@ private IScanComparer CreateComparer(ScanSettings settings)
 				if (!long.TryParse(dualValueBox.Value1, numberStyle, null, out var value1)) throw new InvalidInputException(dualValueBox.Value1);
 				if (!long.TryParse(dualValueBox.Value2, numberStyle, null, out var value2) && checkBothInputFields) throw new InvalidInputException(dualValueBox.Value2);
 
+				if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
+				{
+					if (value1 > value2)
+					{
+						Utils.Swap(ref value1, ref value2);
+					}
+				}
+
 				switch (settings.ValueType)
 				{
 					case ScanValueType.Byte:
@@ -769,6 +777,14 @@ int CalculateSignificantDigits(string input, NumberFormatInfo numberFormat)
 				var nf2 = NumberFormat.GuessNumberFormat(dualValueBox.Value2);
 				if (!double.TryParse(dualValueBox.Value2, NumberStyles.Float, nf2, out var value2) && checkBothInputFields) throw new InvalidInputException(dualValueBox.Value2);
 
+				if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
+				{
+					if (value1 > value2)
+					{
+						Utils.Swap(ref value1, ref value2);
+					}
+				}
+
 				var significantDigits = Math.Max(
 					CalculateSignificantDigits(dualValueBox.Value1, nf1),
 					CalculateSignificantDigits(dualValueBox.Value2, nf2)
diff --git a/ReClass.NET/MemoryScanner/Comparer/ByteMemoryComparer.cs b/ReClass.NET/MemoryScanner/Comparer/ByteMemoryComparer.cs
@@ -15,14 +15,6 @@ public ByteMemoryComparer(ScanCompareType compareType, byte value1, byte value2)
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			Value1 = value1;
 			Value2 = value2;
 		}
diff --git a/ReClass.NET/MemoryScanner/Comparer/DoubleMemoryComparer.cs b/ReClass.NET/MemoryScanner/Comparer/DoubleMemoryComparer.cs
@@ -21,14 +21,6 @@ public DoubleMemoryComparer(ScanCompareType compareType, ScanRoundMode roundType
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			RoundType = roundType;
 			this.significantDigits = Math.Max(significantDigits, 1);
 			Value1 = Math.Round(value1, this.significantDigits, MidpointRounding.AwayFromZero);
diff --git a/ReClass.NET/MemoryScanner/Comparer/FloatMemoryComparer.cs b/ReClass.NET/MemoryScanner/Comparer/FloatMemoryComparer.cs
@@ -21,14 +21,6 @@ public FloatMemoryComparer(ScanCompareType compareType, ScanRoundMode roundType,
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			RoundType = roundType;
 			this.significantDigits = Math.Max(significantDigits, 1);
 			Value1 = (float)Math.Round(value1, this.significantDigits, MidpointRounding.AwayFromZero);
diff --git a/ReClass.NET/MemoryScanner/Comparer/IntegerMemoryComparer.cs b/ReClass.NET/MemoryScanner/Comparer/IntegerMemoryComparer.cs
@@ -15,14 +15,6 @@ public IntegerMemoryComparer(ScanCompareType compareType, int value1, int value2
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			Value1 = value1;
 			Value2 = value2;
 		}
diff --git a/ReClass.NET/MemoryScanner/Comparer/LongMemoryComparer.cs b/ReClass.NET/MemoryScanner/Comparer/LongMemoryComparer.cs
@@ -15,14 +15,6 @@ public LongMemoryComparer(ScanCompareType compareType, long value1, long value2)
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			Value1 = value1;
 			Value2 = value2;
 		}
diff --git a/ReClass.NET/MemoryScanner/Comparer/ShortMemoryComparer.cs b/ReClass.NET/MemoryScanner/Comparer/ShortMemoryComparer.cs
@@ -15,14 +15,6 @@ public ShortMemoryComparer(ScanCompareType compareType, short value1, short valu
 		{
 			CompareType = compareType;
 
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				if (value1 > value2)
-				{
-					Utils.Swap(ref value1, ref value2);
-				}
-			}
-
 			Value1 = value1;
 			Value2 = value2;
 		}
diff --git a/ReClass.NET/Nodes/BitFieldNode.cs b/ReClass.NET/Nodes/BitFieldNode.cs
@@ -109,6 +109,8 @@ private string ConvertValueToBitString(MemoryBuffer memory)
 
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
+			const int BitsPerBlock = 4;
+
 			if (IsHidden && !IsWrapped)
 			{
 				return DrawHidden(view, x, y);
@@ -135,7 +137,7 @@ public override Size Draw(ViewInfo view, int x, int y)
 
 			for (var i = 0; i < bits; ++i)
 			{
-				var rect = new Rectangle(x + i * view.Font.Width, y, view.Font.Width, view.Font.Height);
+				var rect = new Rectangle(x + (i + i / BitsPerBlock) * view.Font.Width, y, view.Font.Width, view.Font.Height);
 				AddHotSpot(view, rect, string.Empty, i, HotSpotType.Edit);
 			}
 
diff --git a/ReClass.NET/Util/BitString.cs b/ReClass.NET/Util/BitString.cs
@@ -51,15 +51,17 @@ public static string ToString(long value)
 
 		private static string AddPaddingAndBuildBlocks(int bits, string value)
 		{
+			const int BitsPerBlock = 4;
+
 			var sb = new StringBuilder(bits);
 
 			var padding = bits - value.Length;
 
 			// Add full padding blocks.
-			while (padding > 4)
+			while (padding > BitsPerBlock)
 			{
 				sb.Append("0000 ");
-				padding -= 4;
+				padding -= BitsPerBlock;
 			}
 
 			// Add only a part of a block.
@@ -72,7 +74,7 @@ private static string AddPaddingAndBuildBlocks(int bits, string value)
 				}
 
 				// and {4 - padding} bits of the value.
-				sb.Append(value, 0, 4 - padding);
+				sb.Append(value, 0, BitsPerBlock - padding);
 
 				if (value.Length > padding)
 				{
@@ -81,10 +83,10 @@ private static string AddPaddingAndBuildBlocks(int bits, string value)
 			}
 
 			// Add all remaining blocks.
-			for (var i = padding == 0 ? 0 : 4 - padding; i < value.Length; i += 4)
+			for (var i = padding == 0 ? 0 : BitsPerBlock - padding; i < value.Length; i += BitsPerBlock)
 			{
-				sb.Append(value, i, 4);
-				if (i < value.Length - 4)
+				sb.Append(value, i, BitsPerBlock);
+				if (i < value.Length - BitsPerBlock)
 				{
 					sb.Append(' ');
 				}
diff --git a/ReClass.NET_Tests/MemoryScanner/Comparer/ByteMemoryComparerTest.cs b/ReClass.NET_Tests/MemoryScanner/Comparer/ByteMemoryComparerTest.cs
@@ -23,10 +23,6 @@ public void TestConstructor(ScanCompareType compareType, byte value1, byte value
 			Check.That(sut.ValueSize).IsEqualTo(sizeof(byte));
 			Check.That(sut.Value1).IsOneOf(value1, value2);
 			Check.That(sut.Value2).IsOneOf(value1, value2);
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				Check.That(sut.Value1 <= sut.Value2).IsTrue();
-			}
 		}
 
 		public static TheoryData<ScanCompareType, byte, byte, byte[], bool, ScanResult> GetTestCompareBasicData() => new TheoryData<ScanCompareType, byte, byte, byte[], bool, ScanResult>
diff --git a/ReClass.NET_Tests/MemoryScanner/Comparer/IntegerMemoryComparerTest.cs b/ReClass.NET_Tests/MemoryScanner/Comparer/IntegerMemoryComparerTest.cs
@@ -23,10 +23,6 @@ public void TestConstructor(ScanCompareType compareType, int value1, int value2)
 			Check.That(sut.ValueSize).IsEqualTo(sizeof(int));
 			Check.That(sut.Value1).IsOneOf(value1, value2);
 			Check.That(sut.Value2).IsOneOf(value1, value2);
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				Check.That(sut.Value1 <= sut.Value2).IsTrue();
-			}
 		}
 
 		public static TheoryData<ScanCompareType, int, int, byte[], bool, ScanResult> GetTestCompareBasicData() => new TheoryData<ScanCompareType, int, int, byte[], bool, ScanResult>
diff --git a/ReClass.NET_Tests/MemoryScanner/Comparer/LongMemoryComparerTest.cs b/ReClass.NET_Tests/MemoryScanner/Comparer/LongMemoryComparerTest.cs
@@ -23,10 +23,6 @@ public void TestConstructor(ScanCompareType compareType, long value1, long value
 			Check.That(sut.ValueSize).IsEqualTo(sizeof(long));
 			Check.That(sut.Value1).IsOneOf(value1, value2);
 			Check.That(sut.Value2).IsOneOf(value1, value2);
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				Check.That(sut.Value1 <= sut.Value2).IsTrue();
-			}
 		}
 
 		public static TheoryData<ScanCompareType, long, long, byte[], bool, ScanResult> GetTestCompareBasicData() => new TheoryData<ScanCompareType, long, long, byte[], bool, ScanResult>
diff --git a/ReClass.NET_Tests/MemoryScanner/Comparer/ShortMemoryComparerTest.cs b/ReClass.NET_Tests/MemoryScanner/Comparer/ShortMemoryComparerTest.cs
@@ -23,10 +23,6 @@ public void TestConstructor(ScanCompareType compareType, short value1, short val
 			Check.That(sut.ValueSize).IsEqualTo(sizeof(short));
 			Check.That(sut.Value1).IsOneOf(value1, value2);
 			Check.That(sut.Value2).IsOneOf(value1, value2);
-			if (compareType == ScanCompareType.Between || compareType == ScanCompareType.BetweenOrEqual)
-			{
-				Check.That(sut.Value1 <= sut.Value2).IsTrue();
-			}
 		}
 
 		public static TheoryData<ScanCompareType, short, short, byte[], bool, ScanResult> GetTestCompareBasicData() => new TheoryData<ScanCompareType, short, short, byte[], bool, ScanResult>
diff --git a/ReClass.NET_Tests/ReClass.NET_Tests.csproj b/ReClass.NET_Tests/ReClass.NET_Tests.csproj
@@ -41,7 +41,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RECLASSNET64</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
@@ -50,7 +50,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;RECLASSNET64</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x64</PlatformTarget>
@@ -81,6 +81,7 @@
     <Compile Include="Extensions\StringReaderExtensionTest.cs" />
     <Compile Include="MemoryScanner\BytePatternTest.cs" />
     <Compile Include="MemoryScanner\Comparer\ByteMemoryComparerTest.cs" />
+    <Compile Include="MemoryScanner\Comparer\FloatMemoryComparerTest.cs" />
     <Compile Include="MemoryScanner\Comparer\ShortMemoryComparerTest.cs" />
     <Compile Include="MemoryScanner\Comparer\LongMemoryComparerTest.cs" />
     <Compile Include="MemoryScanner\Comparer\IntegerMemoryComparerTest.cs" />

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,6 @@ public ByteMemoryComparer(ScanCompareType compareType, byte value1, byte value2)`
`15`	`15`	`{`
`16`	`16`	`CompareType = compareType;`
`17`	`17`
`18`		`- if (compareType == ScanCompareType.Between \|\| compareType == ScanCompareType.BetweenOrEqual)`
`19`		`- {`
`20`		`- if (value1 > value2)`
`21`		`- {`
`22`		`- Utils.Swap(ref value1, ref value2);`
`23`		`- }`
`24`		`- }`
`25`		`-`
`26`	`18`	`Value1 = value1;`
`27`	`19`	`Value2 = value2;`
`28`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,6 @@ public IntegerMemoryComparer(ScanCompareType compareType, int value1, int value2`
`15`	`15`	`{`
`16`	`16`	`CompareType = compareType;`
`17`	`17`
`18`		`- if (compareType == ScanCompareType.Between \|\| compareType == ScanCompareType.BetweenOrEqual)`
`19`		`- {`
`20`		`- if (value1 > value2)`
`21`		`- {`
`22`		`- Utils.Swap(ref value1, ref value2);`
`23`		`- }`
`24`		`- }`
`25`		`-`
`26`	`18`	`Value1 = value1;`
`27`	`19`	`Value2 = value2;`
`28`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,6 @@ public LongMemoryComparer(ScanCompareType compareType, long value1, long value2)`
`15`	`15`	`{`
`16`	`16`	`CompareType = compareType;`
`17`	`17`
`18`		`- if (compareType == ScanCompareType.Between \|\| compareType == ScanCompareType.BetweenOrEqual)`
`19`		`- {`
`20`		`- if (value1 > value2)`
`21`		`- {`
`22`		`- Utils.Swap(ref value1, ref value2);`
`23`		`- }`
`24`		`- }`
`25`		`-`
`26`	`18`	`Value1 = value1;`
`27`	`19`	`Value2 = value2;`
`28`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,6 @@ public ShortMemoryComparer(ScanCompareType compareType, short value1, short valu`
`15`	`15`	`{`
`16`	`16`	`CompareType = compareType;`
`17`	`17`
`18`		`- if (compareType == ScanCompareType.Between \|\| compareType == ScanCompareType.BetweenOrEqual)`
`19`		`- {`
`20`		`- if (value1 > value2)`
`21`		`- {`
`22`		`- Utils.Swap(ref value1, ref value2);`
`23`		`- }`
`24`		`- }`
`25`		`-`
`26`	`18`	`Value1 = value1;`
`27`	`19`	`Value2 = value2;`
`28`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,8 @@ private string ConvertValueToBitString(MemoryBuffer memory)`
`109`	`109`
`110`	`110`	`public override Size Draw(ViewInfo view, int x, int y)`
`111`	`111`	`{`
	`112`	`+ const int BitsPerBlock = 4;`
	`113`	`+`
`112`	`114`	`if (IsHidden && !IsWrapped)`
`113`	`115`	`{`
`114`	`116`	`return DrawHidden(view, x, y);`
`@@ -135,7 +137,7 @@ public override Size Draw(ViewInfo view, int x, int y)`
`135`	`137`
`136`	`138`	`for (var i = 0; i < bits; ++i)`
`137`	`139`	`{`
`138`		`- var rect = new Rectangle(x + i * view.Font.Width, y, view.Font.Width, view.Font.Height);`
	`140`	`+ var rect = new Rectangle(x + (i + i / BitsPerBlock) * view.Font.Width, y, view.Font.Width, view.Font.Height);`
`139`	`141`	`AddHotSpot(view, rect, string.Empty, i, HotSpotType.Edit);`
`140`	`142`	`}`
`141`	`143`
Original file line number	Diff line number	Diff line change
`@@ -51,15 +51,17 @@ public static string ToString(long value)`
`51`	`51`
`52`	`52`	`private static string AddPaddingAndBuildBlocks(int bits, string value)`
`53`	`53`	`{`
	`54`	`+ const int BitsPerBlock = 4;`
	`55`	`+`
`54`	`56`	`var sb = new StringBuilder(bits);`
`55`	`57`
`56`	`58`	`var padding = bits - value.Length;`
`57`	`59`
`58`	`60`	`// Add full padding blocks.`
`59`		`- while (padding > 4)`
	`61`	`+ while (padding > BitsPerBlock)`
`60`	`62`	`{`
`61`	`63`	`sb.Append("0000 ");`
`62`		`- padding -= 4;`
	`64`	`+ padding -= BitsPerBlock;`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`// Add only a part of a block.`
`@@ -72,7 +74,7 @@ private static string AddPaddingAndBuildBlocks(int bits, string value)`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`// and {4 - padding} bits of the value.`
`75`		`- sb.Append(value, 0, 4 - padding);`
	`77`	`+ sb.Append(value, 0, BitsPerBlock - padding);`
`76`	`78`
`77`	`79`	`if (value.Length > padding)`
`78`	`80`	`{`
`@@ -81,10 +83,10 @@ private static string AddPaddingAndBuildBlocks(int bits, string value)`
`81`	`83`	`}`
`82`	`84`
`83`	`85`	`// Add all remaining blocks.`
`84`		`- for (var i = padding == 0 ? 0 : 4 - padding; i < value.Length; i += 4)`
	`86`	`+ for (var i = padding == 0 ? 0 : BitsPerBlock - padding; i < value.Length; i += BitsPerBlock)`
`85`	`87`	`{`
`86`		`- sb.Append(value, i, 4);`
`87`		`- if (i < value.Length - 4)`
	`88`	`+ sb.Append(value, i, BitsPerBlock);`
	`89`	`+ if (i < value.Length - BitsPerBlock)`
`88`	`90`	`{`
`89`	`91`	`sb.Append(' ');`
`90`	`92`	`}`