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

Author: KN4CK3R

CodeGenerator/CSharpCodeGenerator.cs

@@ -5,6 +5,7 @@
 using System.Text;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
+using ReClassNET.Util;
 
 namespace ReClassNET.CodeGenerator
 {
@@ -84,7 +85,7 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod
 			Contract.Ensures(Contract.Result<IEnumerable<MemberDefinition>>() != null);
 			Contract.Ensures(Contract.ForAll(Contract.Result<IEnumerable<MemberDefinition>>(), d => d != null));
 
-			foreach (var member in members.Where(n => !(n is BaseHexNode)))
+			foreach (var member in members.WhereNot(n => n is BaseHexNode))
 			{
 				if (member is BitFieldNode)
 				{

CodeGenerator/CppCodeGenerator.cs

@@ -5,6 +5,7 @@
 using System.Text;
 using ReClassNET.Logger;
 using ReClassNET.Nodes;
+using ReClassNET.Util;
 
 namespace ReClassNET.CodeGenerator
 {
@@ -48,7 +49,7 @@ public string GenerateCode(IEnumerable<ClassNode> classes, ILogger logger)
 			sb.AppendLine(
 				string.Join(
 					"\n\n",
-					OrderByInheritance(classes).Select(c =>
+					OrderByInheritance(classes.Where(c => c.Nodes.None(n => n is FunctionNode))).Select(c =>
 					{
 						var csb = new StringBuilder();
 						csb.Append($"class {c.Name}");
@@ -74,7 +75,7 @@ public string GenerateCode(IEnumerable<ClassNode> classes, ILogger logger)
 						csb.AppendLine(
 							string.Join(
 								"\n",
-								YieldMemberDefinitions(c.Nodes.Skip(skipFirstMember ? 1 : 0), logger)
+								YieldMemberDefinitions(c.Nodes.Skip(skipFirstMember ? 1 : 0).WhereNot(n => n is FunctionNode), logger)
 									.Select(m => MemberDefinitionToString(m))
 									.Select(s => "\t" + s)
 							)
@@ -92,6 +93,18 @@ public string GenerateCode(IEnumerable<ClassNode> classes, ILogger logger)
 							);
 						}
 
+						var functions = classes.SelectMany(c2 => c2.Nodes).OfType<FunctionNode>().Where(f => f.BelongsToClass == c);
+						if (functions.Any())
+						{
+							csb.AppendLine();
+							csb.AppendLine(
+								string.Join(
+									"\n",
+									functions.Select(f => $"\t{f.Signature} {{ }}")
+								)
+							);
+						}
+
 						csb.Append($"}}; //Size: 0x{c.MemorySize:X04}");
 						return csb.ToString();
 					})
@@ -145,7 +158,7 @@ private IEnumerable<MemberDefinition> YieldMemberDefinitions(IEnumerable<BaseNod
 			int fill = 0;
 			int fillStart = 0;
 
-			foreach (var member in members.Where(m => !(m is VTableNode)))
+			foreach (var member in members.WhereNot(m => m is VTableNode))
 			{
 				if (member is BaseHexNode)
 				{

DataExchange/ReClassFile.cs

@@ -381,7 +381,8 @@ public override int Draw(ViewInfo view, int x, int y)
 			typeof(UTF8TextPtrNode),
 			typeof(UTF16TextPtrNode),
 			typeof(BitFieldNode),
-			typeof(UInt64Node)
+			typeof(UInt64Node),
+			typeof(FunctionNode)
 		};
 
 		#endregion

DataExchange/ReClassNetFile.Read.cs

@@ -175,6 +175,17 @@ private IEnumerable<BaseNode> ReadNodeElements(IEnumerable<XElement> elements, C
 					TryGetAttributeValue(element, XmlBitsAttribute, out bits, logger);
 					bitFieldNode.Bits = bits;
 				}
+				var functionNode = node as FunctionNode;
+				if (functionNode != null)
+				{
+					functionNode.Signature = element.Attribute(XmlSignatureAttribute)?.Value ?? string.Empty;
+
+					var reference = NodeUuid.FromBase64String(element.Attribute(XmlReferenceAttribute)?.Value, false);
+					if (project.ContainsClass(reference))
+					{
+						functionNode.BelongsToClass = project.GetClassByUuid(reference);
+					}
+				}
 
 				yield return node;
 			}

DataExchange/ReClassNetFile.Write.cs

@@ -121,6 +121,13 @@ private IEnumerable<XElement> CreateNodeElements(IEnumerable<BaseNode> nodes, IL
 				{
 					element.SetAttributeValue(XmlBitsAttribute, bitFieldNode.Bits);
 				}
+				var functionNode = node as FunctionNode;
+				if (functionNode != null)
+				{
+					var uuid = functionNode.BelongsToClass == null ? NodeUuid.Zero : functionNode.BelongsToClass.Uuid;
+					element.SetAttributeValue(XmlReferenceAttribute, uuid.ToBase64String());
+					element.SetAttributeValue(XmlSignatureAttribute, functionNode.Signature);
+				}
 
 				yield return element;
 			}

DataExchange/ReClassNetFile.cs

@@ -37,6 +37,7 @@ public partial class ReClassNetFile : IReClassImport, IReClassExport
 		public const string XmlCountAttribute = "count";
 		public const string XmlBitsAttribute = "bits";
 		public const string XmlLengthAttribute = "length";
+		public const string XmlSignatureAttribute = "signature";
 
 		private readonly ReClassNetProject project;
 
@@ -49,13 +50,15 @@ public ReClassNetFile(ReClassNetProject project)
 
 		private static Dictionary<string, Type> BuildInStringToTypeMap = new Type[]
 		{
+			typeof(BoolNode),
 			typeof(BitFieldNode),
 			typeof(ClassInstanceArrayNode),
 			typeof(ClassInstanceNode),
 			typeof(ClassPtrArrayNode),
 			typeof(ClassPtrNode),
 			typeof(DoubleNode),
 			typeof(FloatNode),
+			typeof(FunctionNode),
 			typeof(FunctionPtrNode),
 			typeof(Hex8Node),
 			typeof(Hex16Node),

Forms/MainForm.Designer.cs

@@ -79,7 +79,7 @@ public byte ReadByte(int offset)
 		{
 			Contract.Requires(offset >= 0);
 
-			if (Offset + offset > data.Length)
+			if (Offset + offset >= data.Length)
 			{
 				return 0;
 			}
@@ -150,6 +150,11 @@ public string ReadPrintableASCIIString(int offset, int 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)
 			{

Memory/MemoryBuffer.cs

@@ -10,7 +10,7 @@ namespace ReClassNET.Nodes
 	public abstract class BaseFunctionPtrNode : BaseNode
 	{
 		private IntPtr address = IntPtr.Zero;
-		private readonly List<string> assembledCode = new List<string>();
+		private readonly List<string> instructions = new List<string>();
 
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => IntPtr.Size;
@@ -21,7 +21,7 @@ public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 
 			DisassembleRemoteCode(memory, ptr);
 
-			return string.Join("\n", assembledCode);
+			return string.Join("\n", instructions);
 		}
 
 		protected int Draw(ViewInfo view, int x, int y, string type, string name)
@@ -42,10 +42,11 @@ protected int Draw(ViewInfo view, int x, int y, string type, string name)
 			x += TextPadding;
 
 			x = AddIcon(view, x, y, Icons.Function, -1, HotSpotType.None);
-			x = AddAddressOffset(view, x, y);
 
 			var tx = x;
 
+			x = AddAddressOffset(view, x, y);
+
 			x = AddText(view, x, y, Program.Settings.TypeColor, HotSpot.NoneId, type) + view.Font.Width;
 			x = AddText(view, x, y, Program.Settings.NameColor, HotSpot.NameId, name) + view.Font.Width;
 
@@ -78,7 +79,7 @@ protected int Draw(ViewInfo view, int x, int y, string type, string name)
 
 				DisassembleRemoteCode(view.Memory, ptr);
 
-				foreach (var line in assembledCode)
+				foreach (var line in instructions)
 				{
 					y += view.Font.Height;
 
@@ -99,7 +100,7 @@ public override int CalculateHeight(ViewInfo view)
 			var h = view.Font.Height;
 			if (levelsOpen[view.Level])
 			{
-				h += assembledCode.Count * view.Font.Height;
+				h += instructions.Count * view.Font.Height;
 			}
 			return h;
 		}
@@ -110,7 +111,7 @@ private void DisassembleRemoteCode(MemoryBuffer memory, IntPtr address)
 
 			if (this.address != address)
 			{
-				assembledCode.Clear();
+				instructions.Clear();
 
 				this.address = address;
 
@@ -121,9 +122,9 @@ private void DisassembleRemoteCode(MemoryBuffer memory, IntPtr address)
 						address,
 						200,
 #if WIN64
-						(a, l, i) => assembledCode.Add($"{a.ToString("X08")} {i}")
+						(a, l, i) => instructions.Add($"{a.ToString("X08")} {i}")
 #else
-						(a, l, i) => assembledCode.Add($"{a.ToString("X04")} {i}")
+						(a, l, i) => instructions.Add($"{a.ToString("X04")} {i}")
 #endif
 					);
 				}