Use int instead of IntPtr. Added IntPtr address for ClassNode.

KN4CK3R · KN4CK3R · commit d3777343a77f · 2019-03-23T23:07:39.000+01:00
diff --git a/ReClass.NET/CodeGenerator/CSharpCodeGenerator.cs b/ReClass.NET/CodeGenerator/CSharpCodeGenerator.cs
@@ -171,15 +171,15 @@ private static void WriteClass(IndentedTextWriter writer, ClassNode @class, ILog
 				if (type != null)
 				{
 					writer.Write("[FieldOffset(");
-					writer.Write(node.Offset.ToInt32());
+					writer.Write(node.Offset);
 					writer.WriteLine(")]");
 
 					writer.Write("public ");
 					writer.Write(type);
 					writer.Write(" ");
 					writer.Write(node.Name);
 					writer.Write("; //0x");
-					writer.Write($"{node.Offset.ToInt32():X04}");
+					writer.Write($"{node.Offset:X04}");
 					if (!string.IsNullOrEmpty(node.Comment))
 					{
 						writer.Write(" ");
diff --git a/ReClass.NET/CodeGenerator/CppCodeGenerator.cs b/ReClass.NET/CodeGenerator/CppCodeGenerator.cs
@@ -368,7 +368,7 @@ BaseNode CreatePaddingMember(int offset, int count)
 			{
 				var node = new ArrayNode
 				{
-					Offset = (IntPtr)offset,
+					Offset = offset,
 					Count = count,
 					Name = $"pad_{offset:X04}"
 				};
@@ -384,7 +384,7 @@ BaseNode CreatePaddingMember(int offset, int count)
 				{
 					if (fill == 0)
 					{
-						fillStart = member.Offset.ToInt32();
+						fillStart = member.Offset;
 					}
 					fill += member.MemorySize;
 
@@ -437,7 +437,7 @@ private void WriteNode(IndentedTextWriter writer, BaseNode node, ILogger logger)
 				writer.Write(" ");
 				writer.Write(node.Name);
 				writer.Write("; //0x");
-				writer.Write($"{node.Offset.ToInt32():X04}");
+				writer.Write($"{node.Offset:X04}");
 				if (!string.IsNullOrEmpty(node.Comment))
 				{
 					writer.Write(" ");
@@ -449,7 +449,7 @@ private void WriteNode(IndentedTextWriter writer, BaseNode node, ILogger logger)
 			{
 				writer.Write(ResolveWrappedType(node, false, logger));
 				writer.Write("; //0x");
-				writer.Write($"{node.Offset.ToInt32():X04}");
+				writer.Write($"{node.Offset:X04}");
 				if (!string.IsNullOrEmpty(node.Comment))
 				{
 					writer.Write(" ");
diff --git a/ReClass.NET/Forms/MainForm.Functions.cs b/ReClass.NET/Forms/MainForm.Functions.cs
@@ -296,7 +296,7 @@ public void ReplaceSelectedNodesWithType(Type type)
 				.WhereNot(s => s.Node is ClassNode)
 				.GroupBy(s => s.Node.GetParentContainer())
 				.SelectMany(g => g
-					.OrderBy(s => s.Node.Offset, IntPtrComparer.Instance)
+					.OrderBy(s => s.Node.Offset)
 					.GroupWhile((h1, h2) => h1.Node.Offset + h1.Node.MemorySize == h2.Node.Offset)
 				);
 
@@ -323,7 +323,7 @@ public void ReplaceSelectedNodesWithType(Type type)
 					{
 						foreach (var createdNode in createdNodes)
 						{
-							hotSpotsToReplace.Enqueue(new MemoryViewControl.SelectedNodeInfo(createdNode, selected.Memory, selected.Address.Add(createdNode.Offset.Sub(node.Offset)), selected.Level));
+							hotSpotsToReplace.Enqueue(new MemoryViewControl.SelectedNodeInfo(createdNode, selected.Memory, selected.Address + createdNode.Offset - node.Offset, selected.Level));
 						}
 					}
 				}
diff --git a/ReClass.NET/Memory/NodeDissector.cs b/ReClass.NET/Memory/NodeDissector.cs
@@ -30,7 +30,7 @@ public static BaseNode GuessExplicitNode(BaseHexNode node, MemoryBuffer memory)
 			Contract.Requires(node != null);
 			Contract.Requires(memory != null);
 
-			var offset = node.Offset.ToInt32();
+			var offset = node.Offset;
 			var is4ByteAligned = offset % 4 == 0;
 			var is8ByteAligned = offset % 8 == 0;
 
diff --git a/ReClass.NET/Nodes/ArrayNode.cs b/ReClass.NET/Nodes/ArrayNode.cs
@@ -31,9 +31,9 @@ public override Size Draw(ViewInfo view, int x, int y)
 		protected override Size DrawChild(ViewInfo view, int x, int y)
 		{
 			var v = view.Clone();
-			v.Address = view.Address.Add(Offset) + InnerNode.MemorySize * CurrentIndex;
+			v.Address = view.Address + Offset + InnerNode.MemorySize * CurrentIndex;
 			v.Memory = view.Memory.Clone();
-			v.Memory.Offset += Offset.ToInt32() + InnerNode.MemorySize * CurrentIndex;
+			v.Memory.Offset += Offset + InnerNode.MemorySize * CurrentIndex;
 
 			return InnerNode.Draw(v, x, y);
 		}
diff --git a/ReClass.NET/Nodes/BaseContainerNode.cs b/ReClass.NET/Nodes/BaseContainerNode.cs
@@ -44,7 +44,7 @@ public override void ClearSelection()
 		/// <summary>Calculates the offset of every child node.</summary>
 		public void UpdateOffsets()
 		{
-			var offset = IntPtr.Zero;
+			var offset = 0;
 			foreach (var node in Nodes)
 			{
 				node.Offset = offset;
diff --git a/ReClass.NET/Nodes/BaseHexCommentNode.cs b/ReClass.NET/Nodes/BaseHexCommentNode.cs
@@ -81,7 +81,7 @@ protected int AddComment(ViewInfo view, int x, int y, float fvalue, IntPtr ivalu
 
 				if (view.Settings.ShowCommentPluginInfo)
 				{
-					var nodeAddress = view.Address.Add(Offset);
+					var nodeAddress = view.Address + Offset;
 
 					foreach (var reader in NodeInfoReader)
 					{
diff --git a/ReClass.NET/Nodes/BaseHexNode.cs b/ReClass.NET/Nodes/BaseHexNode.cs
@@ -57,7 +57,7 @@ protected Size Draw(ViewInfo view, int x, int y, string text, int length)
 			var color = view.Settings.HexColor;
 			if (view.Settings.HighlightChangedValues)
 			{
-				var address = view.Address.Add(Offset);
+				var address = view.Address + Offset;
 
 				highlightTimer.RemoveWhere(kv => kv.Value.Value < view.CurrentTime);
 
diff --git a/ReClass.NET/Nodes/BaseNode.cs b/ReClass.NET/Nodes/BaseNode.cs
@@ -29,7 +29,7 @@ public abstract class BaseNode
 		private string comment = string.Empty;
 
 		/// <summary>Gets or sets the offset of the node.</summary>
-		public IntPtr Offset { get; set; }
+		public int Offset { get; set; }
 
 		/// <summary>Gets or sets the name of the node. If a new name was set the property changed event gets fired.</summary>
 		public virtual string Name { get => name; set { if (value != null && name != value) { name = value; NameChanged?.Invoke(this); } } }
@@ -62,7 +62,7 @@ private void ObjectInvariants()
 		{
 			Contract.Invariant(name != null);
 			Contract.Invariant(comment != null);
-			Contract.Invariant(Offset.ToInt32() >= 0);
+			Contract.Invariant(Offset >= 0);
 			Contract.Invariant(LevelsOpen != null);
 		}
 
@@ -292,7 +292,7 @@ protected void AddHotSpot(ViewInfo view, Rectangle spot, string text, int id, Ho
 			{
 				Rect = spot,
 				Text = text,
-				Address = view.Address.Add(Offset),
+				Address = view.Address + Offset,
 				Id = id,
 				Type = type,
 				Node = this,
@@ -349,12 +349,12 @@ protected int AddAddressOffset(ViewInfo view, int x, int y)
 
 			if (view.Settings.ShowNodeOffset)
 			{
-				x = AddText(view, x, y, view.Settings.OffsetColor, HotSpot.NoneId, $"{Offset.ToInt32():X04}") + view.Font.Width;
+				x = AddText(view, x, y, view.Settings.OffsetColor, HotSpot.NoneId, $"{Offset:X04}") + view.Font.Width;
 			}
 
 			if (view.Settings.ShowNodeAddress)
 			{
-				x = AddText(view, x, y, view.Settings.AddressColor, HotSpot.AddressId, view.Address.Add(Offset).ToString(Constants.AddressHexFormat)) + view.Font.Width;
+				x = AddText(view, x, y, view.Settings.AddressColor, HotSpot.AddressId, (view.Address + Offset).ToString(Constants.AddressHexFormat)) + view.Font.Width;
 			}
 
 			return x;
diff --git a/ReClass.NET/Nodes/ClassInstanceNode.cs b/ReClass.NET/Nodes/ClassInstanceNode.cs
@@ -56,9 +56,9 @@ public override Size Draw(ViewInfo view, int x, int y)
 			if (LevelsOpen[view.Level])
 			{
 				var v = view.Clone();
-				v.Address = view.Address.Add(Offset);
+				v.Address = view.Address + Offset;
 				v.Memory = view.Memory.Clone();
-				v.Memory.Offset += Offset.ToInt32();
+				v.Memory.Offset += Offset;
 
 				var innerSize = InnerNode.Draw(v, tx, y);
 				size.Width = Math.Max(size.Width, innerSize.Width + tx - origX);
diff --git a/ReClass.NET/Nodes/ClassNode.cs b/ReClass.NET/Nodes/ClassNode.cs
@@ -39,12 +39,15 @@ public NodeUuid Uuid
 			}
 		}
 
+		private IntPtr address;
+
 		public IntPtr Address
 		{
+			get => address;
 			set
 			{
 				Contract.Ensures(AddressFormula != null);
-
+				address = value;
 				AddressFormula = value.ToString("X");
 			}
 		}
@@ -191,7 +194,7 @@ public override void Update(HotSpot spot)
 
 			if (spot.Id == 0)
 			{
-				Offset = spot.Memory.Process.ParseAddress(spot.Text);
+				Address = spot.Memory.Process.ParseAddress(spot.Text);
 
 				AddressFormula = spot.Text;
 			}
@@ -203,11 +206,11 @@ public void UpdateAddress(RemoteProcess process)
 
 			try
 			{
-				Offset = process.ParseAddress(AddressFormula);
+				Address = process.ParseAddress(AddressFormula);
 			}
 			catch (ParseException)
 			{
-				Offset = IntPtr.Zero;
+				Address = IntPtr.Zero;
 			}
 		}
 
diff --git a/ReClass.NET/Nodes/FunctionNode.cs b/ReClass.NET/Nodes/FunctionNode.cs
@@ -67,7 +67,7 @@ public override Size Draw(ViewInfo view, int x, int y)
 
 			var size = new Size(x - origX, view.Font.Height);
 
-			var ptr = view.Address.Add(Offset);
+			var ptr = view.Address + Offset;
 			DisassembleRemoteCode(view.Memory, ptr);
 
 			if (LevelsOpen[view.Level])
diff --git a/ReClass.NET/Nodes/VirtualMethodNode.cs b/ReClass.NET/Nodes/VirtualMethodNode.cs
@@ -7,7 +7,7 @@ namespace ReClassNET.Nodes
 {
 	public class VirtualMethodNode : BaseFunctionPtrNode
 	{
-		public string MethodName => string.IsNullOrEmpty(Name) ? $"Function{Offset.ToInt32() / IntPtr.Size}" : Name;
+		public string MethodName => string.IsNullOrEmpty(Name) ? $"Function{Offset / IntPtr.Size}" : Name;
 
 		public override void GetUserInterfaceInfo(out string name, out Image icon)
 		{
@@ -23,7 +23,7 @@ public VirtualMethodNode()
 
 		public override Size Draw(ViewInfo view, int x, int y)
 		{
-			return Draw(view, x, y, $"({Offset.ToInt32() / IntPtr.Size})", MethodName);
+			return Draw(view, x, y, $"({Offset / IntPtr.Size})", MethodName);
 		}
 	}
 }
diff --git a/ReClass.NET/UI/MemoryPreviewPopUp.cs b/ReClass.NET/UI/MemoryPreviewPopUp.cs
@@ -54,11 +54,15 @@ private void SetNodeCount(int count)
 			{
 				BaseHexNode CreateNode(int index)
 				{
+					return new
 #if RECLASSNET64
-					return new Hex64Node { Offset = (IntPtr)(index * 8) };
+					Hex64Node
 #else
-					return new Hex32Node { Offset = (IntPtr)(index * 4) };
+					Hex32Node
 #endif
+					{
+						Offset = index * IntPtr.Size
+					};
 				}
 
 				if (nodes.Count < count)
diff --git a/ReClass.NET/UI/MemoryViewControl.cs b/ReClass.NET/UI/MemoryViewControl.cs
@@ -159,7 +159,7 @@ protected override void OnPaint(PaintEventArgs e)
 			}
 
 			Memory.Size = ClassNode.MemorySize;
-			Memory.Update(ClassNode.Offset);
+			Memory.Update(ClassNode.Address);
 
 			var view = new ViewInfo
 			{
@@ -170,7 +170,7 @@ protected override void OnPaint(PaintEventArgs e)
 				CurrentTime = DateTime.UtcNow,
 				ClientArea = ClientRectangle,
 				HotSpots = hotSpots,
-				Address = ClassNode.Offset,
+				Address = classNode.Address,
 				Level = 0,
 				MultipleNodesSelected = selectedNodes.Count > 1
 			};
@@ -306,7 +306,7 @@ protected override void OnMouseClick(MouseEventArgs e)
 										continue;
 									}
 
-									var first = Utils.Min(selectedNodes[0], hotSpot, h => h.Node.Offset.ToInt32());
+									var first = Utils.Min(selectedNodes[0], hotSpot, h => h.Node.Offset);
 									var last = first == hotSpot ? selectedNodes[0] : hotSpot;
 
 									ClearSelection();
@@ -317,7 +317,7 @@ protected override void OnMouseClick(MouseEventArgs e)
 										.TakeUntil(n => n == last.Node)
 										.Select(n => new HotSpot
 										{
-											Address = containerNode.Offset.Add(n.Offset),
+											Address = (IntPtr)(containerNode.Offset + n.Offset),
 											Node = n,
 											Memory = first.Memory,
 											Level = first.Level
@@ -584,7 +584,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
 								selectionCaret = toSelect;
 							}
 
-							var first = Utils.Min(selectionAnchor, selectionCaret, h => h.Node.Offset.ToInt32());
+							var first = Utils.Min(selectionAnchor, selectionCaret, h => h.Node.Offset);
 							var last = first == selectionAnchor ? selectionCaret : selectionAnchor;
 
 							selectedNodes.ForEach(h => h.Node.ClearSelection());
@@ -596,7 +596,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
 								.TakeUntil(n => n == last.Node)
 								.Select(n => new HotSpot
 								{
-									Address = containerNode.Offset.Add(n.Offset),
+									Address = (IntPtr)(containerNode.Offset + n.Offset),
 									Node = n,
 									Memory = toSelect.Memory,
 									Level = toSelect.Level

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ BaseNode CreatePaddingMember(int offset, int count)`
`368`	`368`	`{`
`369`	`369`	`var node = new ArrayNode`
`370`	`370`	`{`
`371`		`- Offset = (IntPtr)offset,`
	`371`	`+ Offset = offset,`
`372`	`372`	`Count = count,`
`373`	`373`	`Name = $"pad_{offset:X04}"`
`374`	`374`	`};`
`@@ -384,7 +384,7 @@ BaseNode CreatePaddingMember(int offset, int count)`
`384`	`384`	`{`
`385`	`385`	`if (fill == 0)`
`386`	`386`	`{`
`387`		`- fillStart = member.Offset.ToInt32();`
	`387`	`+ fillStart = member.Offset;`
`388`	`388`	`}`
`389`	`389`	`fill += member.MemorySize;`
`390`	`390`
`@@ -437,7 +437,7 @@ private void WriteNode(IndentedTextWriter writer, BaseNode node, ILogger logger)`
`437`	`437`	`writer.Write(" ");`
`438`	`438`	`writer.Write(node.Name);`
`439`	`439`	`writer.Write("; //0x");`
`440`		`- writer.Write($"{node.Offset.ToInt32():X04}");`
	`440`	`+ writer.Write($"{node.Offset:X04}");`
`441`	`441`	`if (!string.IsNullOrEmpty(node.Comment))`
`442`	`442`	`{`
`443`	`443`	`writer.Write(" ");`
`@@ -449,7 +449,7 @@ private void WriteNode(IndentedTextWriter writer, BaseNode node, ILogger logger)`
`449`	`449`	`{`
`450`	`450`	`writer.Write(ResolveWrappedType(node, false, logger));`
`451`	`451`	`writer.Write("; //0x");`
`452`		`- writer.Write($"{node.Offset.ToInt32():X04}");`
	`452`	`+ writer.Write($"{node.Offset:X04}");`
`453`	`453`	`if (!string.IsNullOrEmpty(node.Comment))`
`454`	`454`	`{`
`455`	`455`	`writer.Write(" ");`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ public void ReplaceSelectedNodesWithType(Type type)`
`296`	`296`	`.WhereNot(s => s.Node is ClassNode)`
`297`	`297`	`.GroupBy(s => s.Node.GetParentContainer())`
`298`	`298`	`.SelectMany(g => g`
`299`		`- .OrderBy(s => s.Node.Offset, IntPtrComparer.Instance)`
	`299`	`+ .OrderBy(s => s.Node.Offset)`
`300`	`300`	`.GroupWhile((h1, h2) => h1.Node.Offset + h1.Node.MemorySize == h2.Node.Offset)`
`301`	`301`	`);`
`302`	`302`
`@@ -323,7 +323,7 @@ public void ReplaceSelectedNodesWithType(Type type)`
`323`	`323`	`{`
`324`	`324`	`foreach (var createdNode in createdNodes)`
`325`	`325`	`{`
`326`		`- hotSpotsToReplace.Enqueue(new MemoryViewControl.SelectedNodeInfo(createdNode, selected.Memory, selected.Address.Add(createdNode.Offset.Sub(node.Offset)), selected.Level));`
	`326`	`+ hotSpotsToReplace.Enqueue(new MemoryViewControl.SelectedNodeInfo(createdNode, selected.Memory, selected.Address + createdNode.Offset - node.Offset, selected.Level));`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public override Size Draw(ViewInfo view, int x, int y)`
`31`	`31`	`protected override Size DrawChild(ViewInfo view, int x, int y)`
`32`	`32`	`{`
`33`	`33`	`var v = view.Clone();`
`34`		`- v.Address = view.Address.Add(Offset) + InnerNode.MemorySize * CurrentIndex;`
	`34`	`+ v.Address = view.Address + Offset + InnerNode.MemorySize * CurrentIndex;`
`35`	`35`	`v.Memory = view.Memory.Clone();`
`36`		`- v.Memory.Offset += Offset.ToInt32() + InnerNode.MemorySize * CurrentIndex;`
	`36`	`+ v.Memory.Offset += Offset + InnerNode.MemorySize * CurrentIndex;`
`37`	`37`
`38`	`38`	`return InnerNode.Draw(v, x, y);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public override void ClearSelection()`
`44`	`44`	`/// <summary>Calculates the offset of every child node.</summary>`
`45`	`45`	`public void UpdateOffsets()`
`46`	`46`	`{`
`47`		`- var offset = IntPtr.Zero;`
	`47`	`+ var offset = 0;`
`48`	`48`	`foreach (var node in Nodes)`
`49`	`49`	`{`
`50`	`50`	`node.Offset = offset;`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ protected int AddComment(ViewInfo view, int x, int y, float fvalue, IntPtr ivalu`
`81`	`81`
`82`	`82`	`if (view.Settings.ShowCommentPluginInfo)`
`83`	`83`	`{`
`84`		`- var nodeAddress = view.Address.Add(Offset);`
	`84`	`+ var nodeAddress = view.Address + Offset;`
`85`	`85`
`86`	`86`	`foreach (var reader in NodeInfoReader)`
`87`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected Size Draw(ViewInfo view, int x, int y, string text, int length)`
`57`	`57`	`var color = view.Settings.HexColor;`
`58`	`58`	`if (view.Settings.HighlightChangedValues)`
`59`	`59`	`{`
`60`		`- var address = view.Address.Add(Offset);`
	`60`	`+ var address = view.Address + Offset;`
`61`	`61`
`62`	`62`	`highlightTimer.RemoveWhere(kv => kv.Value.Value < view.CurrentTime);`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public abstract class BaseNode`
`29`	`29`	`private string comment = string.Empty;`
`30`	`30`
`31`	`31`	`/// <summary>Gets or sets the offset of the node.</summary>`
`32`		`- public IntPtr Offset { get; set; }`
	`32`	`+ public int Offset { get; set; }`
`33`	`33`
`34`	`34`	`/// <summary>Gets or sets the name of the node. If a new name was set the property changed event gets fired.</summary>`
`35`	`35`	`public virtual string Name { get => name; set { if (value != null && name != value) { name = value; NameChanged?.Invoke(this); } } }`
`@@ -62,7 +62,7 @@ private void ObjectInvariants()`
`62`	`62`	`{`
`63`	`63`	`Contract.Invariant(name != null);`
`64`	`64`	`Contract.Invariant(comment != null);`
`65`		`- Contract.Invariant(Offset.ToInt32() >= 0);`
	`65`	`+ Contract.Invariant(Offset >= 0);`
`66`	`66`	`Contract.Invariant(LevelsOpen != null);`
`67`	`67`	`}`
`68`	`68`
`@@ -292,7 +292,7 @@ protected void AddHotSpot(ViewInfo view, Rectangle spot, string text, int id, Ho`
`292`	`292`	`{`
`293`	`293`	`Rect = spot,`
`294`	`294`	`Text = text,`
`295`		`- Address = view.Address.Add(Offset),`
	`295`	`+ Address = view.Address + Offset,`
`296`	`296`	`Id = id,`
`297`	`297`	`Type = type,`
`298`	`298`	`Node = this,`
`@@ -349,12 +349,12 @@ protected int AddAddressOffset(ViewInfo view, int x, int y)`
`349`	`349`
`350`	`350`	`if (view.Settings.ShowNodeOffset)`
`351`	`351`	`{`
`352`		`- x = AddText(view, x, y, view.Settings.OffsetColor, HotSpot.NoneId, $"{Offset.ToInt32():X04}") + view.Font.Width;`
	`352`	`+ x = AddText(view, x, y, view.Settings.OffsetColor, HotSpot.NoneId, $"{Offset:X04}") + view.Font.Width;`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`if (view.Settings.ShowNodeAddress)`
`356`	`356`	`{`
`357`		`- x = AddText(view, x, y, view.Settings.AddressColor, HotSpot.AddressId, view.Address.Add(Offset).ToString(Constants.AddressHexFormat)) + view.Font.Width;`
	`357`	`+ x = AddText(view, x, y, view.Settings.AddressColor, HotSpot.AddressId, (view.Address + Offset).ToString(Constants.AddressHexFormat)) + view.Font.Width;`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`return x;`