Changed 'Auto-name' into 'Init from RTTI' and it now also inits the v…

…table pointer automatically.
ReClassNET · FransBouma · Jul 3, 2023 · Jul 3, 2023 · Jul 3, 2023 · Jul 3, 2023
commit b61edca698a3c7111c2d328e289ea966340b81f4
diff --git a/ReClass.NET/Controls/MemoryViewControl.cs b/ReClass.NET/Controls/MemoryViewControl.cs
@@ -706,7 +706,7 @@ public void Reset()
 		}


-		public void AutoNameCurrentClassFromRTTI(ClassNode classNode)
+		public void InitCurrentClassFromRTTI(ClassNode classNode)
 		{
 			var args = new DrawContextRequestEventArgs { Node = classNode };

@@ -721,7 +721,7 @@ public void AutoNameCurrentClassFromRTTI(ClassNode classNode)
 						   Address = args.BaseAddress,
 						   Level = 0,
 					   };
-			classNode.AutoNameFromRTTI(view);
+			classNode.InitFromRTTI(view);
 		}
 	}
 }
diff --git a/ReClass.NET/Forms/MainForm.Designer.cs b/ReClass.NET/Forms/MainForm.Designer.cs
diff --git a/ReClass.NET/Forms/MainForm.cs b/ReClass.NET/Forms/MainForm.cs
@@ -835,7 +835,7 @@ private void memoryViewControl_SelectionChanged(object sender, EventArgs e)

 			addBytesToolStripDropDownButton.Enabled = parentContainer != null || isContainerNode;
 			insertBytesToolStripDropDownButton.Enabled = selectedNodes.Count == 1 && parentContainer != null && !isContainerNode;
-			autoNameClassToolStripMenuItem.Enabled = nodeIsClass;
+			initClassToolStripMenuItem.Enabled = nodeIsClass;

 			var enabled = selectedNodes.Count > 0 && !nodeIsClass;
 			toolStrip.Items.OfType<TypeToolStripButton>().ForEach(b => b.Enabled = enabled);
@@ -1054,15 +1054,15 @@ private void memoryViewControl_DrawContextRequested(object sender, DrawContextRe
 		}


-		private void autoNameClassToolStripMenuItem_Click(object sender, EventArgs e)
+		private void initClassToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			var selectedNodes = memoryViewControl.GetSelectedNodes();
 			var node = selectedNodes.FirstOrDefault()?.Node;
 			if (node == null || !(node is ClassNode))
 			{
 				return;
 			}
-			memoryViewControl.AutoNameCurrentClassFromRTTI(node as ClassNode);
+			memoryViewControl.InitCurrentClassFromRTTI(node as ClassNode);
 		}
 	}
 }
diff --git a/ReClass.NET/Nodes/BaseNode.cs b/ReClass.NET/Nodes/BaseNode.cs
@@ -39,8 +39,11 @@ public abstract class BaseNode
 		/// <summary>Gets or sets the parent node.</summary>
 		public BaseNode ParentNode { get; internal set; }

-		/// <summary>Gets a value indicating whether this node is wrapped into an other node. We see classnodes never as wrapped.</summary>
-		public bool IsWrapped => (ParentNode is BaseWrapperNode && !(this is ClassNode));
+		/// <summary>Gets a value indicating whether this node is wrapped into an other node. </summary>
+		public bool IsWrapped => (ParentNode is BaseWrapperNode);
+
+		/// <summary>All nodes that are wrapped can't be selected except classnodes because they have a context menu</summary>
+		public bool CanBeSelected => (!IsWrapped || (this is ClassNode));

 		/// <summary>Gets or sets a value indicating whether this node is hidden.</summary>
 		public bool IsHidden { get; set; }
@@ -376,7 +379,7 @@ protected void AddSelection(DrawContext context, int x, int y, int height)
 			Contract.Requires(context != null);
 			Contract.Requires(context.Graphics != null);

-			if (y > context.ClientArea.Bottom || y + height < 0 || IsWrapped)
+			if (y > context.ClientArea.Bottom || y + height < 0 || !CanBeSelected)
 			{
 				return;
 			}

diff --git a/ReClass.NET/Nodes/ClassNode.cs b/ReClass.NET/Nodes/ClassNode.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Drawing;
 using System.Linq;
@@ -52,8 +53,12 @@ public static ClassNode Create()
 			return new ClassNode(true);
 		}

-
-		public void AutoNameFromRTTI(DrawContext context)
+
+		/// <summary>
+		/// Initializes the class' name and vtable node from RTTI information, if it's not set already 
+		/// </summary>
+		/// <param name="context"></param>
+		public void InitFromRTTI(DrawContext context)
 		{
 			// first node should be a VTable node or a hex64/32 node
 			if (Nodes.Count <= 0)
@@ -77,7 +82,9 @@ public void AutoNameFromRTTI(DrawContext context)
 					if (!string.IsNullOrEmpty(rttiInfoFromFirstNode))
 					{
 						// convert first node to vtable node
-#warning IMPLEMENT: CONVERT NODE TO VTABLE NODE
+						var newVTableNode = BaseNode.CreateInstanceFromType(typeof(VirtualMethodTableNode));
+						var createdNodes = new List<BaseNode>();
+						this.ReplaceChildNode(firstNode, newVTableNode, ref createdNodes);
 					}
 				}
 			}