Created Memory namespace and moved files.

KN4CK3R · KN4CK3R · commit 984ced4b11df · 2016-11-04T20:40:29.000+01:00
diff --git a/AddressParser/Interpreter.cs b/AddressParser/Interpreter.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using ReClassNET.Memory;
 using ReClassNET.Util;
 
 namespace ReClassNET.AddressParser
diff --git a/Forms/MainForm.cs b/Forms/MainForm.cs
@@ -9,6 +9,7 @@
 using ReClassNET.CodeGenerator;
 using ReClassNET.DataExchange;
 using ReClassNET.Logger;
+using ReClassNET.Memory;
 using ReClassNET.Nodes;
 using ReClassNET.Plugins;
 using ReClassNET.UI;
@@ -21,7 +22,7 @@ public partial class MainForm : IconForm
 		private readonly NativeHelper nativeHelper;
 
 		private readonly RemoteProcess remoteProcess;
-		private readonly Memory memory;
+		private readonly MemoryBuffer memory;
 
 		private readonly PluginManager pluginManager;
 
@@ -58,7 +59,7 @@ public MainForm(NativeHelper nativeHelper)
 				}
 			};
 
-			memory = new Memory
+			memory = new MemoryBuffer
 			{
 				Process = remoteProcess
 			};
diff --git a/Forms/PluginForm.cs b/Forms/PluginForm.cs
@@ -4,9 +4,9 @@
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using ReClassNET.Memory;
 using ReClassNET.Plugins;
 using ReClassNET.UI;
-using ReClassNET.Util;
 
 namespace ReClassNET.Forms
 {
diff --git a/Forms/ProcessBrowserForm.cs b/Forms/ProcessBrowserForm.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using ReClassNET.Forms;
+using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;
 
diff --git a/Forms/ProcessMemoryViewForm.cs b/Forms/ProcessMemoryViewForm.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using ReClassNET.Forms;
+using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;
 
diff --git a/Memory/Memory.cs b/Memory/Memory.cs
@@ -2,10 +2,11 @@
 using System.Diagnostics.Contracts;
 using System.Runtime.InteropServices;
 using System.Text;
+using ReClassNET.Util;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Memory
 {
-	public class Memory
+	public class MemoryBuffer
 	{
 		public RemoteProcess Process { get; set; }
 
@@ -28,26 +29,26 @@ public int Size
 
 		public int Offset { get; set; }
 
-		public Memory()
+		public MemoryBuffer()
 		{
 			Contract.Ensures(data != null);
 
 			data = new byte[0];
 		}
 
-		public Memory(Memory other)
+		public MemoryBuffer(MemoryBuffer other)
 		{
 			Contract.Requires(other != null);
 			Contract.Ensures(data != null);
 
 			data = other.data;
 		}
 
-		public Memory Clone()
+		public MemoryBuffer Clone()
 		{
-			Contract.Ensures(Contract.Result<Memory>() != null);
+			Contract.Ensures(Contract.Result<MemoryBuffer>() != null);
 
-			return new Memory(this)
+			return new MemoryBuffer(this)
 			{
 				Offset = Offset,
 				Process = Process
diff --git a/Memory/NativeHelper.cs b/Memory/NativeHelper.cs
@@ -3,8 +3,9 @@
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Runtime.InteropServices;
+using ReClassNET.Util;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Memory
 {
 	public class NativeHelper : IDisposable
 	{
diff --git a/Memory/ProcessInfo.cs b/Memory/ProcessInfo.cs
@@ -1,7 +1,8 @@
 ﻿using System;
 using System.Diagnostics.Contracts;
+using ReClassNET.Util;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Memory
 {
 	public class ProcessInfo : IDisposable
 	{
diff --git a/Memory/RemoteProcess.cs b/Memory/RemoteProcess.cs
@@ -9,8 +9,9 @@
 using System.Threading.Tasks;
 using ReClassNET.AddressParser;
 using ReClassNET.SymbolReader;
+using ReClassNET.Util;
 
-namespace ReClassNET.Util
+namespace ReClassNET.Memory
 {
 	public class RemoteProcess
 	{
diff --git a/Nodes/BaseFunctionPtrNode.cs b/Nodes/BaseFunctionPtrNode.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
+using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;
 
@@ -14,7 +15,7 @@ public abstract class BaseFunctionPtrNode : BaseNode
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => IntPtr.Size;
 
-		public override string GetToolTipText(HotSpot spot, Memory memory)
+		public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 		{
 			var ptr = memory.ReadObject<IntPtr>(Offset);
 
@@ -84,7 +85,7 @@ public override int CalculateHeight(ViewInfo view)
 			return h;
 		}
 
-		private void DisassembleRemoteCode(Memory memory, IntPtr address)
+		private void DisassembleRemoteCode(MemoryBuffer memory, IntPtr address)
 		{
 			Contract.Requires(memory != null);
 
diff --git a/Nodes/BaseNode.cs b/Nodes/BaseNode.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
 using System.Drawing;
+using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;
 
@@ -92,7 +93,7 @@ public virtual void Intialize()
 		/// <param name="spot">The spot.</param>
 		/// <param name="memory">The process memory.</param>
 		/// <returns>The information to show in a tool tip or null if no information should be shown.</returns>
-		public virtual string GetToolTipText(HotSpot spot, Memory memory)
+		public virtual string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 		{
 			Contract.Requires(spot != null);
 			Contract.Requires(memory != null);
diff --git a/Nodes/BitFieldNode.cs b/Nodes/BitFieldNode.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Diagnostics.Contracts;
 using System.Drawing;
+using ReClassNET.Memory;
 using ReClassNET.UI;
-using ReClassNET.Util;
 
 namespace ReClassNET.Nodes
 {
@@ -63,7 +63,7 @@ public override void CopyFromNode(BaseNode node)
 		/// <summary>Converts the memory value to a bit string.</summary>
 		/// <param name="memory">The process memory.</param>
 		/// <returns>The value converted to a bit string.</returns>
-		private string ConvertValueToBitString(Memory memory)
+		private string ConvertValueToBitString(MemoryBuffer memory)
 		{
 			Contract.Requires(memory != null);
 			Contract.Ensures(Contract.Result<string>() != null);
diff --git a/Nodes/ClassNode.cs b/Nodes/ClassNode.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics.Contracts;
 using System.Drawing;
 using System.Linq;
+using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;
 
@@ -137,7 +138,7 @@ public override void Update(HotSpot spot)
 			}
 		}
 
-		public void UpdateAddress(Memory memory)
+		public void UpdateAddress(MemoryBuffer memory)
 		{
 			Contract.Requires(memory != null);
 
diff --git a/Nodes/ClassPtrArrayNode.cs b/Nodes/ClassPtrArrayNode.cs
@@ -1,12 +1,13 @@
 ﻿using System;
+using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;
 
 namespace ReClassNET.Nodes
 {
 	public class ClassPtrArrayNode : BaseArrayNode
 	{
-		private readonly Memory memory = new Memory();
+		private readonly MemoryBuffer memory = new MemoryBuffer();
 
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => IntPtr.Size * Count;
diff --git a/Nodes/ClassPtrNode.cs b/Nodes/ClassPtrNode.cs
@@ -1,12 +1,13 @@
 ﻿using System;
+using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;
 
 namespace ReClassNET.Nodes
 {
 	public class ClassPtrNode : BaseReferenceNode
 	{
-		private readonly Memory memory = new Memory();
+		private readonly MemoryBuffer memory = new MemoryBuffer();
 
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => IntPtr.Size;
diff --git a/Nodes/Hex16Node.cs b/Nodes/Hex16Node.cs
@@ -1,6 +1,6 @@
 ﻿using System.Runtime.InteropServices;
+using ReClassNET.Memory;
 using ReClassNET.UI;
-using ReClassNET.Util;
 
 namespace ReClassNET.Nodes
 {
@@ -23,7 +23,7 @@ struct UInt16Data
 		/// <param name="spot">The spot.</param>
 		/// <param name="memory">The process memory.</param>
 		/// <returns>The information to show in a tool tip.</returns>
-		public override string GetToolTipText(HotSpot spot, Memory memory)
+		public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 		{
 			var value = memory.ReadObject<UInt16Data>(Offset);
 
diff --git a/Nodes/Hex32Node.cs b/Nodes/Hex32Node.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Runtime.InteropServices;
+using ReClassNET.Memory;
 using ReClassNET.UI;
-using ReClassNET.Util;
 
 namespace ReClassNET.Nodes
 {
@@ -31,7 +31,7 @@ struct UInt32FloatData
 		/// <param name="spot">The spot.</param>
 		/// <param name="memory">The process memory.</param>
 		/// <returns>The information to show in a tool tip.</returns>
-		public override string GetToolTipText(HotSpot spot, Memory memory)
+		public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 		{
 			var value = memory.ReadObject<UInt32FloatData>(Offset);
 
diff --git a/Nodes/Hex64Node.cs b/Nodes/Hex64Node.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Runtime.InteropServices;
+using ReClassNET.Memory;
 using ReClassNET.UI;
-using ReClassNET.Util;
 
 namespace ReClassNET.Nodes
 {
@@ -44,7 +44,7 @@ struct UInt64FloatDoubleData
 		/// <param name="spot">The spot.</param>
 		/// <param name="memory">The process memory.</param>
 		/// <returns>The information to show in a tool tip.</returns>
-		public override string GetToolTipText(HotSpot spot, Memory memory)
+		public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 		{
 			var value = memory.ReadObject<UInt64FloatDoubleData>(Offset);
 
diff --git a/Nodes/Hex8Node.cs b/Nodes/Hex8Node.cs
@@ -1,6 +1,6 @@
 ﻿using System.Runtime.InteropServices;
+using ReClassNET.Memory;
 using ReClassNET.UI;
-using ReClassNET.Util;
 
 namespace ReClassNET.Nodes
 {
@@ -23,7 +23,7 @@ struct UInt8Data
 		/// <param name="spot">The spot.</param>
 		/// <param name="memory">The process memory.</param>
 		/// <returns>The information to show in a tool tip.</returns>
-		public override string GetToolTipText(HotSpot spot, Memory memory)
+		public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)
 		{
 			var b = memory.ReadByte(Offset);
 
diff --git a/Nodes/INodeInfoReader.cs b/Nodes/INodeInfoReader.cs
@@ -1,10 +1,10 @@
 ﻿using System;
-using ReClassNET.Util;
+using ReClassNET.Memory;
 
 namespace ReClassNET.Nodes
 {
 	public interface INodeInfoReader
 	{
-		string ReadNodeInfo(BaseNode node, IntPtr value, Memory memory);
+		string ReadNodeInfo(BaseNode node, IntPtr value, MemoryBuffer memory);
 	}
 }
diff --git a/Nodes/VTableNode.cs b/Nodes/VTableNode.cs
@@ -1,14 +1,13 @@
 ﻿using System;
-using System.Diagnostics.Contracts;
 using System.Linq;
+using ReClassNET.Memory;
 using ReClassNET.UI;
-using ReClassNET.Util;
 
 namespace ReClassNET.Nodes
 {
 	public class VTableNode : BaseContainerNode
 	{
-		private readonly Memory memory = new Memory();
+		private readonly MemoryBuffer memory = new MemoryBuffer();
 
 		/// <summary>Size of the node in bytes.</summary>
 		public override int MemorySize => IntPtr.Size;
diff --git a/Plugins/DefaultPluginHost.cs b/Plugins/DefaultPluginHost.cs
@@ -2,12 +2,12 @@
 using System.Diagnostics.Contracts;
 using System.Drawing;
 using System.Resources;
+using ReClassNET.CodeGenerator;
+using ReClassNET.DataExchange;
 using ReClassNET.Forms;
 using ReClassNET.Logger;
+using ReClassNET.Memory;
 using ReClassNET.Nodes;
-using ReClassNET.DataExchange;
-using ReClassNET.Util;
-using ReClassNET.CodeGenerator;
 
 namespace ReClassNET.Plugins
 {
diff --git a/Plugins/IPluginHost.cs b/Plugins/IPluginHost.cs
@@ -2,12 +2,12 @@
 using System.Diagnostics.Contracts;
 using System.Drawing;
 using System.Resources;
+using ReClassNET.CodeGenerator;
 using ReClassNET.DataExchange;
 using ReClassNET.Forms;
 using ReClassNET.Logger;
+using ReClassNET.Memory;
 using ReClassNET.Nodes;
-using ReClassNET.Util;
-using ReClassNET.CodeGenerator;
 
 namespace ReClassNET.Plugins
 {
diff --git a/Plugins/PluginManager.cs b/Plugins/PluginManager.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Runtime.InteropServices;
+using ReClassNET.Memory;
 using ReClassNET.Util;
 
 namespace ReClassNET.Plugins
diff --git a/Program.cs b/Program.cs
@@ -2,9 +2,10 @@
 using System.Globalization;
 using System.Windows.Forms;
 using ReClassNET.Forms;
+using ReClassNET.Logger;
+using ReClassNET.Memory;
 using ReClassNET.UI;
 using ReClassNET.Util;
-using ReClassNET.Logger;
 
 namespace ReClassNET
 {
diff --git a/ReClass.NET.csproj b/ReClass.NET.csproj
diff --git a/SymbolReader/SymbolReader.cs b/SymbolReader/SymbolReader.cs
diff --git a/SymbolReader/Symbols.cs b/SymbolReader/Symbols.cs
diff --git a/UI/HotSpot.cs b/UI/HotSpot.cs
diff --git a/UI/MemoryViewControl.cs b/UI/MemoryViewControl.cs
diff --git a/UI/ViewInfo.cs b/UI/ViewInfo.cs

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,11 @@`
`2`	`2`	`using System.Diagnostics.Contracts;`
`3`	`3`	`using System.Runtime.InteropServices;`
`4`	`4`	`using System.Text;`
	`5`	`+using ReClassNET.Util;`
`5`	`6`
`6`		`-namespace ReClassNET.Util`
	`7`	`+namespace ReClassNET.Memory`
`7`	`8`	`{`
`8`		`- public class Memory`
	`9`	`+ public class MemoryBuffer`
`9`	`10`	`{`
`10`	`11`	`public RemoteProcess Process { get; set; }`
`11`	`12`
`@@ -28,26 +29,26 @@ public int Size`
`28`	`29`
`29`	`30`	`public int Offset { get; set; }`
`30`	`31`
`31`		`- public Memory()`
	`32`	`+ public MemoryBuffer()`
`32`	`33`	`{`
`33`	`34`	`Contract.Ensures(data != null);`
`34`	`35`
`35`	`36`	`data = new byte[0];`
`36`	`37`	`}`
`37`	`38`
`38`		`- public Memory(Memory other)`
	`39`	`+ public MemoryBuffer(MemoryBuffer other)`
`39`	`40`	`{`
`40`	`41`	`Contract.Requires(other != null);`
`41`	`42`	`Contract.Ensures(data != null);`
`42`	`43`
`43`	`44`	`data = other.data;`
`44`	`45`	`}`
`45`	`46`
`46`		`- public Memory Clone()`
	`47`	`+ public MemoryBuffer Clone()`
`47`	`48`	`{`
`48`		`- Contract.Ensures(Contract.Result<Memory>() != null);`
	`49`	`+ Contract.Ensures(Contract.Result<MemoryBuffer>() != null);`
`49`	`50`
`50`		`- return new Memory(this)`
	`51`	`+ return new MemoryBuffer(this)`
`51`	`52`	`{`
`52`	`53`	`Offset = Offset,`
`53`	`54`	`Process = Process`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`using System.Diagnostics.Contracts;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Runtime.InteropServices;`
	`6`	`+using ReClassNET.Util;`
`6`	`7`
`7`		`-namespace ReClassNET.Util`
	`8`	`+namespace ReClassNET.Memory`
`8`	`9`	`{`
`9`	`10`	`public class NativeHelper : IDisposable`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Diagnostics.Contracts;`
	`3`	`+using ReClassNET.Util;`
`3`	`4`
`4`		`-namespace ReClassNET.Util`
	`5`	`+namespace ReClassNET.Memory`
`5`	`6`	`{`
`6`	`7`	`public class ProcessInfo : IDisposable`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,9 @@`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`	`using ReClassNET.AddressParser;`
`11`	`11`	`using ReClassNET.SymbolReader;`
	`12`	`+using ReClassNET.Util;`
`12`	`13`
`13`		`-namespace ReClassNET.Util`
	`14`	`+namespace ReClassNET.Memory`
`14`	`15`	`{`
`15`	`16`	`public class RemoteProcess`
`16`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Diagnostics.Contracts;`
	`4`	`+using ReClassNET.Memory;`
`4`	`5`	`using ReClassNET.UI;`
`5`	`6`	`using ReClassNET.Util;`
`6`	`7`
`@@ -14,7 +15,7 @@ public abstract class BaseFunctionPtrNode : BaseNode`
`14`	`15`	`/// <summary>Size of the node in bytes.</summary>`
`15`	`16`	`public override int MemorySize => IntPtr.Size;`
`16`	`17`
`17`		`- public override string GetToolTipText(HotSpot spot, Memory memory)`
	`18`	`+ public override string GetToolTipText(HotSpot spot, MemoryBuffer memory)`
`18`	`19`	`{`
`19`	`20`	`var ptr = memory.ReadObject<IntPtr>(Offset);`
`20`	`21`
`@@ -84,7 +85,7 @@ public override int CalculateHeight(ViewInfo view)`
`84`	`85`	`return h;`
`85`	`86`	`}`
`86`	`87`
`87`		`- private void DisassembleRemoteCode(Memory memory, IntPtr address)`
	`88`	`+ private void DisassembleRemoteCode(MemoryBuffer memory, IntPtr address)`
`88`	`89`	`{`
`89`	`90`	`Contract.Requires(memory != null);`
`90`	`91`