Merge branch 'master' of github.com:ReClassNET/ReClass.NET

Author: Timboy67678

ReClass.NET/AddressParser/Interpreter.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Diagnostics.Contracts;
+using ReClassNET.Extensions;
 using ReClassNET.Memory;
 using ReClassNET.Util;
 

ReClass.NET/CodeGenerator/CSharpCodeGenerator.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Text;
+using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
 using ReClassNET.Util;

ReClass.NET/CodeGenerator/CppCodeGenerator.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Text;
+using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
 using ReClassNET.Util;

ReClass.NET/Core/CoreFunctionsManager.cs

@@ -4,6 +4,7 @@
 using System.IO;
 using System.Windows.Forms;
 using ReClassNET.Debugger;
+using ReClassNET.Extensions;
 using ReClassNET.Memory;
 using ReClassNET.Util;
 

ReClass.NET/Core/InternalCoreFunctions.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using ReClassNET.Extensions;
 using ReClassNET.Native;
 using ReClassNET.Util;
 

ReClass.NET/Core/NativeCoreWrapper.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using ReClassNET.Debugger;
+using ReClassNET.Extensions;
 using ReClassNET.Native;
 using ReClassNET.Util;
 

ReClass.NET/DataExchange/ReClass/ReClass2007File.cs

@@ -4,6 +4,7 @@
 using System.Data.SQLite;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
 using ReClassNET.Util;

ReClass.NET/DataExchange/ReClass/ReClassFile.cs

@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.Linq;
 using System.Xml.Linq;
+using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
 using ReClassNET.UI;

ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs

@@ -5,6 +5,7 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Xml.Linq;
+using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
 using ReClassNET.Util;

ReClass.NET/DataExchange/ReClass/ReClassQtFile.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Xml.Linq;
+using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
 using ReClassNET.Util;

ReClass.NET/Debugger/RemoteDebugger.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using ReClassNET.Extensions;
 using ReClassNET.Forms;
 using ReClassNET.Memory;
 using ReClassNET.Util;

ReClass.NET/Util/Extension.BinaryReaderWriter.cs renamed to ReClass.NET/Extensions/BinaryReaderWriterExtensions.cs

@@ -2,7 +2,7 @@
 using System.Diagnostics.Contracts;
 using System.IO;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class BinaryReaderWriterExtension
 	{

ReClass.NET/Util/Extension.Color.cs renamed to ReClass.NET/Extensions/ColorExtensions.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class ExtensionColor
 	{

ReClass.NET/Util/Extension.DataGridView.cs renamed to ReClass.NET/Extensions/DataGridViewExtensions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class DataGridViewExtension
 	{

ReClass.NET/Util/Extension.Dictionary.cs renamed to ReClass.NET/Extensions/DictionaryExtensions.cs

@@ -3,7 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class DictionaryExtension
 	{

ReClass.NET/Util/Extension.Encoding.cs renamed to ReClass.NET/Extensions/EncodingExtensions.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class EncodingExtension
 	{

ReClass.NET/Util/Extensions.cs renamed to ReClass.NET/Extensions/Extensions.cs

@@ -6,7 +6,7 @@
 using System.Linq;
 using ReClassNET.Nodes;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class Extensions
 	{

ReClass.NET/Util/Extension.FloatingPoint.cs renamed to ReClass.NET/Extensions/FloatingPointExtensions.cs

@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class FloatingPointExtension
 	{

ReClass.NET/Util/Extension.Graphics.cs renamed to ReClass.NET/Extensions/GraphicsExtensions.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class GraphicsExtension
 	{

ReClass.NET/Util/Extension.IntPtr.cs renamed to ReClass.NET/Extensions/IntPtrExtensions.cs

@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class IntPtrExtension
 	{

ReClass.NET/Util/Extension.Linq.cs renamed to ReClass.NET/Extensions/LinqExtensions.cs

@@ -4,7 +4,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class LinqExtension
 	{

ReClass.NET/Util/Extension.RichTextBox.cs renamed to ReClass.NET/Extensions/RichTextBoxExtensions.cs

@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class RichTextBoxExtension
 	{

ReClass.NET/Util/Extension.Size.cs renamed to ReClass.NET/Extensions/SizeExtensions.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class SizeExtension
 	{

ReClass.NET/Util/Extension.String.cs renamed to ReClass.NET/Extensions/StringExtensions.cs

@@ -3,8 +3,9 @@
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Text.RegularExpressions;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class StringExtension
 	{
@@ -84,5 +85,14 @@ public static string LimitLength(this string s, int length)
 			}
 			return s.Substring(0, length);
 		}
+
+		private static readonly Regex HexRegex = new Regex("(0x|h)?([0-9A-F]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+		public static bool TryGetHexString(this string s, out string value)
+		{
+			var match = HexRegex.Match(s);
+			value = match.Success ? match.Groups[2].Value : null;
+
+			return match.Success;
+		}
 	}
 }

ReClass.NET/Util/Extension.StringReader.cs renamed to ReClass.NET/Extensions/StringReaderExtensions.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Extensions
 {
 	public static class StringReaderExtension
 	{

ReClass.NET/Forms/CodeForm.cs

@@ -8,6 +8,7 @@
 using ColorCode;
 using ColorCode.Parsing;
 using ReClassNET.CodeGenerator;
+using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
 using ReClassNET.UI;

ReClass.NET/Forms/FoundCodeForm.cs

@@ -6,6 +6,7 @@
 using System.Text;
 using System.Windows.Forms;
 using ReClassNET.Debugger;
+using ReClassNET.Extensions;
 using ReClassNET.Memory;
 using ReClassNET.Nodes;
 using ReClassNET.UI;

ReClass.NET/Forms/MainForm.cs

@@ -10,6 +10,7 @@
 using ReClassNET.CodeGenerator;
 using ReClassNET.Core;
 using ReClassNET.DataExchange.ReClass;
+using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Memory;
 using ReClassNET.Nodes;

ReClass.NET/Forms/NamedAddressesForm.cs

@@ -4,6 +4,7 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Windows.Forms;
+using ReClassNET.Extensions;
 using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;

ReClass.NET/Forms/ScannerForm.cs

@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ReClassNET.DataExchange.Scanner;
+using ReClassNET.Extensions;
 using ReClassNET.Logger;
 using ReClassNET.Memory;
 using ReClassNET.MemoryScanner;

ReClass.NET/Forms/SettingsForm.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics.Contracts;
 using System.Windows.Forms;
+using ReClassNET.Extensions;
 using ReClassNET.Native;
 using ReClassNET.UI;
 using ReClassNET.Util;

ReClass.NET/Memory/Disassembler.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Runtime.InteropServices;
 using ReClassNET.Core;
+using ReClassNET.Extensions;
 using ReClassNET.Util;
 
 namespace ReClassNET.Memory

ReClass.NET/Memory/MemoryBuffer.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics.Contracts;
 using System.Runtime.InteropServices;
 using System.Text;
+using ReClassNET.Extensions;
 using ReClassNET.Util;
 
 namespace ReClassNET.Memory

ReClass.NET/Memory/NodeDissector.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using ReClassNET.Extensions;
 using ReClassNET.Nodes;
 using ReClassNET.Util;
 
@@ -123,17 +124,10 @@ private static Type GuessPointerType(IntPtr address, MemoryBuffer memory)
 				if (section.Category == SectionCategory.DATA || section.Category == SectionCategory.HEAP) // If the section contains data, it is at least a pointer to a class or something.
 				{
 					// Check if it is a vtable. Check if the first 3 values are pointers to a code section.
-					bool valid = true;
-					for (var i = 0; i < 3; ++i)
-					{
-						var pointee = memory.Process.ReadRemoteIntPtr(address);
-						if (memory.Process.GetSectionToPointer(pointee)?.Category != SectionCategory.CODE)
-						{
-							valid = false;
-							break;
-						}
-					}
-					if (valid)
+					var possibleVmt = memory.Process.ReadRemoteObject<ThreePointersData>(address);
+					if (memory.Process.GetSectionToPointer(possibleVmt.Pointer1)?.Category == SectionCategory.CODE
+						&& memory.Process.GetSectionToPointer(possibleVmt.Pointer2)?.Category == SectionCategory.CODE
+						&& memory.Process.GetSectionToPointer(possibleVmt.Pointer3)?.Category == SectionCategory.CODE)
 					{
 						return typeof(VTableNode);
 					}

ReClass.NET/Memory/RemoteProcess.cs

@@ -9,6 +9,7 @@
 using ReClassNET.AddressParser;
 using ReClassNET.Core;
 using ReClassNET.Debugger;
+using ReClassNET.Extensions;
 using ReClassNET.Native;
 using ReClassNET.Symbols;
 using ReClassNET.Util;

ReClass.NET/Memory/UnionDataType.cs

@@ -69,4 +69,12 @@ public struct UInt64FloatDoubleData
 		[FieldOffset(0)]
 		public double DoubleValue;
 	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	public struct ThreePointersData
+	{
+		public IntPtr Pointer1;
+		public IntPtr Pointer2;
+		public IntPtr Pointer3;
+	}
 }

ReClass.NET/MemoryScanner/BytePattern.cs

@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using ReClassNET.Extensions;
 using ReClassNET.Util;
 
 namespace ReClassNET.MemoryScanner

ReClass.NET/MemoryScanner/Comparer/DoubleMemoryComparer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using ReClassNET.Extensions;
 using ReClassNET.Util;
 
 namespace ReClassNET.MemoryScanner.Comparer

ReClass.NET/MemoryScanner/Comparer/FloatMemoryComparer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using ReClassNET.Extensions;
 using ReClassNET.Util;
 
 namespace ReClassNET.MemoryScanner.Comparer

ReClass.NET/MemoryScanner/Comparer/StringMemoryComparer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Text;
+using ReClassNET.Extensions;
 using ReClassNET.Util;
 
 namespace ReClassNET.MemoryScanner.Comparer

ReClass.NET/MemoryScanner/MemoryRecord.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Globalization;
 using System.Text;
+using ReClassNET.Extensions;
 using ReClassNET.Memory;
 using ReClassNET.Util;
 

ReClass.NET/MemoryScanner/ScanResultBlock.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using ReClassNET.Extensions;
 using ReClassNET.Util;
 
 namespace ReClassNET.MemoryScanner

ReClass.NET/MemoryScanner/ScanResultStore.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Text;
+using ReClassNET.Extensions;
 using ReClassNET.Util;
 
 namespace ReClassNET.MemoryScanner