Made methods static.

KN4CK3R · KN4CK3R · commit c4851e48c776 · 2019-05-05T12:05:11.000+02:00
diff --git a/ReClass.NET/Forms/ProcessInfoForm.cs b/ReClass.NET/Forms/ProcessInfoForm.cs
@@ -142,7 +142,7 @@ private void createClassAtAddressToolStripMenuItem_Click(object sender, EventArg
 		private void dumpToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			Func<SaveFileDialog> createDialogFn;
-			Action<Dumper, Stream> dumpFn;
+			Action<IRemoteMemoryReader, Stream> dumpFn;
 
 			if (GetToolStripSourceControl(sender) == modulesDataGridView)
 			{
@@ -158,9 +158,9 @@ private void dumpToolStripMenuItem_Click(object sender, EventArgs e)
 					InitialDirectory = Path.GetDirectoryName(module.Path)
 				};
 
-				dumpFn = (d, s) =>
+				dumpFn = (reader, stream) =>
 				{
-					d.DumpModule(module, s);
+					Dumper.DumpModule(reader, module, stream);
 
 					MessageBox.Show("Module successfully dumped.", Constants.ApplicationName, MessageBoxButtons.OK, MessageBoxIcon.Information);
 				};
@@ -178,9 +178,9 @@ private void dumpToolStripMenuItem_Click(object sender, EventArgs e)
 					FileName = $"Section_{section.Start.ToString("X")}_{section.End.ToString("X")}.dat"
 				};
 
-				dumpFn = (d, s) =>
+				dumpFn = (reader, stream) =>
 				{
-					d.DumpSection(section, s);
+					Dumper.DumpSection(reader, section, stream);
 
 					MessageBox.Show("Section successfully dumped.", Constants.ApplicationName, MessageBoxButtons.OK, MessageBoxIcon.Information);
 				};
@@ -195,13 +195,11 @@ private void dumpToolStripMenuItem_Click(object sender, EventArgs e)
 					return;
 				}
 
-				var dumper = new Dumper(process);
-
 				try
 				{
 					using (var stream = sfd.OpenFile())
 					{
-						dumpFn(dumper, stream);
+						dumpFn(process, stream);
 					}
 				}
 				catch (Exception ex)
diff --git a/ReClass.NET/Memory/Dumper.cs b/ReClass.NET/Memory/Dumper.cs
@@ -4,52 +4,45 @@
 
 namespace ReClassNET.Memory
 {
-	public class Dumper
+	public static class Dumper
 	{
-		private readonly IRemoteMemoryReader process;
-
-		public Dumper(IRemoteMemoryReader process)
-		{
-			Contract.Requires(process != null);
-			Contract.Ensures(this.process != null);
-
-			this.process = process;
-		}
-
 		/// <summary>Dumps a chunk of memory to the given stream.</summary>
+		/// <param name="reader">The memory reader to use.</param>
 		/// <param name="address">The begin of the chunk.</param>
 		/// <param name="size">The size of the chunk.</param>
 		/// <param name="stream">The stream to dump to.</param>
-		public void DumpRaw(IntPtr address, int size, Stream stream)
+		public static void DumpRaw(IRemoteMemoryReader reader, IntPtr address, int size, Stream stream)
 		{
 			Contract.Requires(size >= 0);
 			Contract.Requires(stream != null);
 
-			var data = process.ReadRemoteMemory(address, size);
+			var data = reader.ReadRemoteMemory(address, size);
 
 			stream.Write(data, 0, data.Length);
 		}
 
 		/// <summary>Dumps a section to the given stream.</summary>
+		/// <param name="reader">The memory reader to use.</param>
 		/// <param name="section">The section to dump.</param>
 		/// <param name="stream">The stream to dump to.</param>
-		public void DumpSection(Section section, Stream stream)
+		public static void DumpSection(IRemoteMemoryReader reader, Section section, Stream stream)
 		{
 			Contract.Requires(section != null);
 			Contract.Requires(stream != null);
 
-			DumpRaw(section.Start, section.Size.ToInt32(), stream);
+			DumpRaw(reader, section.Start, section.Size.ToInt32(), stream);
 		}
 
 		/// <summary>Dumps a module to the given stream. The section headers of the pe header get fixed to build a valid pe file.</summary>
+		/// <param name="reader">The memory reader to use.</param>
 		/// <param name="module">The module to dump.</param>
 		/// <param name="stream">The stream to dump to.</param>
-		public void DumpModule(Module module, Stream stream)
+		public static void DumpModule(IRemoteMemoryReader reader, Module module, Stream stream)
 		{
 			Contract.Requires(module != null);
 			Contract.Requires(stream != null);
 
-			var data = process.ReadRemoteMemory(module.Start, module.Size.ToInt32());
+			var data = reader.ReadRemoteMemory(module.Start, module.Size.ToInt32());
 
 			SimplePeHeader.FixSectionHeaders(data);
 

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ private void createClassAtAddressToolStripMenuItem_Click(object sender, EventArg`
`142`	`142`	`private void dumpToolStripMenuItem_Click(object sender, EventArgs e)`
`143`	`143`	`{`
`144`	`144`	`Func<SaveFileDialog> createDialogFn;`
`145`		`- Action<Dumper, Stream> dumpFn;`
	`145`	`+ Action<IRemoteMemoryReader, Stream> dumpFn;`
`146`	`146`
`147`	`147`	`if (GetToolStripSourceControl(sender) == modulesDataGridView)`
`148`	`148`	`{`
`@@ -158,9 +158,9 @@ private void dumpToolStripMenuItem_Click(object sender, EventArgs e)`
`158`	`158`	`InitialDirectory = Path.GetDirectoryName(module.Path)`
`159`	`159`	`};`
`160`	`160`
`161`		`- dumpFn = (d, s) =>`
	`161`	`+ dumpFn = (reader, stream) =>`
`162`	`162`	`{`
`163`		`- d.DumpModule(module, s);`
	`163`	`+ Dumper.DumpModule(reader, module, stream);`
`164`	`164`
`165`	`165`	`MessageBox.Show("Module successfully dumped.", Constants.ApplicationName, MessageBoxButtons.OK, MessageBoxIcon.Information);`
`166`	`166`	`};`
`@@ -178,9 +178,9 @@ private void dumpToolStripMenuItem_Click(object sender, EventArgs e)`
`178`	`178`	`FileName = $"Section_{section.Start.ToString("X")}_{section.End.ToString("X")}.dat"`
`179`	`179`	`};`
`180`	`180`
`181`		`- dumpFn = (d, s) =>`
	`181`	`+ dumpFn = (reader, stream) =>`
`182`	`182`	`{`
`183`		`- d.DumpSection(section, s);`
	`183`	`+ Dumper.DumpSection(reader, section, stream);`
`184`	`184`
`185`	`185`	`MessageBox.Show("Section successfully dumped.", Constants.ApplicationName, MessageBoxButtons.OK, MessageBoxIcon.Information);`
`186`	`186`	`};`
`@@ -195,13 +195,11 @@ private void dumpToolStripMenuItem_Click(object sender, EventArgs e)`
`195`	`195`	`return;`
`196`	`196`	`}`
`197`	`197`
`198`		`- var dumper = new Dumper(process);`
`199`		`-`
`200`	`198`	`try`
`201`	`199`	`{`
`202`	`200`	`using (var stream = sfd.OpenFile())`
`203`	`201`	`{`
`204`		`- dumpFn(dumper, stream);`
	`202`	`+ dumpFn(process, stream);`
`205`	`203`	`}`
`206`	`204`	`}`
`207`	`205`	`catch (Exception ex)`