More decoupling.

Author: KN4CK3R

ReClass.NET/Forms/InputCorrelatorForm.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using ReClassNET.Input;
+using ReClassNET.Memory;
 using ReClassNET.MemoryScanner;
 using ReClassNET.UI;
 
@@ -15,17 +16,21 @@ public partial class InputCorrelatorForm : IconForm
 		private static readonly TimeSpan refineInterval = TimeSpan.FromMilliseconds(400);
 
 		private readonly ScannerForm scannerForm;
+		private readonly RemoteProcess process;
+
 		private readonly KeyboardInput input;
 		private InputCorrelatedScanner scanner;
 
 		private bool isScanning = false;
 		private DateTime lastRefineTime;
 
-		public InputCorrelatorForm(ScannerForm sf)
+		public InputCorrelatorForm(ScannerForm scannerForm, RemoteProcess process)
 		{
-			Contract.Requires(sf != null);
+			Contract.Requires(scannerForm != null);
+			Contract.Requires(process != null);
 
-			scannerForm = sf;
+			this.scannerForm = scannerForm;
+			this.process = process;
 
 			InitializeComponent();
 
@@ -122,7 +127,7 @@ private async void startStopButton_Click(object sender, EventArgs e)
 				}
 
 				scanner = new InputCorrelatedScanner(
-					Program.RemoteProcess,
+					process,
 					input,
 					hotkeyListBox.Items.Cast<KeyboardHotkey>(),
 					valueTypeComboBox.SelectedValue

ReClass.NET/Forms/MainForm.cs

@@ -323,7 +323,7 @@ private void memoryViewerToolStripMenuItem_Click(object sender, EventArgs e)
 
 		private void memorySearcherToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			new ScannerForm().Show();
+			new ScannerForm(Program.RemoteProcess).Show();
 		}
 
 		private void namedAddressesToolStripMenuItem_Click(object sender, EventArgs e)

ReClass.NET/Forms/ScannerForm.cs

@@ -27,15 +27,21 @@ internal class ScanValueTypeComboBox : EnumComboBox<ScanValueType> { }
 
 		private const int MaxVisibleResults = 10000;
 
+		private readonly RemoteProcess process;
+
 		private bool isFirstScan;
 
 		private Scanner scanner;
 		private CancellationTokenSource cts;
 
 		private string addressFilePath;
 
-		public ScannerForm()
+		public ScannerForm(RemoteProcess process)
 		{
+			Contract.Requires(process != null);
+
+			this.process = process;
+
 			InitializeComponent();
 
 			toolStripPanel.Renderer = new CustomToolStripProfessionalRenderer(true, false);
@@ -47,10 +53,10 @@ public ScannerForm()
 
 			Reset();
 
-			firstScanButton.Enabled = flowLayoutPanel.Enabled = Program.RemoteProcess.IsValid;
+			firstScanButton.Enabled = flowLayoutPanel.Enabled = process.IsValid;
 
-			Program.RemoteProcess.ProcessAttached += RemoteProcessOnProcessAttached;
-			Program.RemoteProcess.ProcessClosing += RemoteProcessOnProcessClosing;
+			process.ProcessAttached += RemoteProcessOnProcessAttached;
+			process.ProcessClosing += RemoteProcessOnProcessClosing;
 		}
 
 		protected override void OnLoad(EventArgs e)
@@ -85,8 +91,8 @@ private void RemoteProcessOnProcessAttached(RemoteProcess remoteProcess)
 				{
 					foreach (var record in addressListMemoryRecordList.Records)
 					{
-						record.ResolveAddress(Program.RemoteProcess);
-						record.RefreshValue(Program.RemoteProcess);
+						record.ResolveAddress(process);
+						record.RefreshValue(process);
 					}
 				}
 			}
@@ -103,14 +109,14 @@ private void MemorySearchForm_FormClosing(object sender, FormClosingEventArgs e)
 		{
 			scanner?.Dispose();
 
-			Program.RemoteProcess.ProcessAttached -= RemoteProcessOnProcessAttached;
-			Program.RemoteProcess.ProcessClosing -= RemoteProcessOnProcessClosing;
+			process.ProcessAttached -= RemoteProcessOnProcessAttached;
+			process.ProcessClosing -= RemoteProcessOnProcessClosing;
 		}
 
 		private void updateValuesTimer_Tick(object sender, EventArgs e)
 		{
-			resultMemoryRecordList.RefreshValues(Program.RemoteProcess);
-			addressListMemoryRecordList.RefreshValues(Program.RemoteProcess);
+			resultMemoryRecordList.RefreshValues(process);
+			addressListMemoryRecordList.RefreshValues(process);
 		}
 
 		private void scanTypeComboBox_SelectionChangeCommitted(object sender, EventArgs e)
@@ -147,7 +153,7 @@ private async void firstScanButton_Click(object sender, EventArgs e)
 
 		private async void nextScanButton_Click(object sender, EventArgs e)
 		{
-			if (!Program.RemoteProcess.IsValid)
+			if (!process.IsValid)
 			{
 				return;
 			}
@@ -245,8 +251,8 @@ private void openAddressFileToolStripButton_Click(object sender, EventArgs e)
 							import.Load(ofd.FileName, Program.Logger)
 								.Select(r =>
 								{
-									r.ResolveAddress(Program.RemoteProcess);
-									r.RefreshValue(Program.RemoteProcess);
+									r.ResolveAddress(process);
+									r.RefreshValue(process);
 									return r;
 								})
 						);
@@ -301,7 +307,7 @@ private void clearAddressListToolStripButton_Click(object sender, EventArgs e)
 
 		private void showInputCorrelatorIconButton_Click(object sender, EventArgs e)
 		{
-			new InputCorrelatorForm(this).Show();
+			new InputCorrelatorForm(this, process).Show();
 		}
 
 		private void resultListContextMenuStrip_Opening(object sender, CancelEventArgs e)
@@ -415,7 +421,7 @@ public void ShowScannerResults(Scanner scanner)
 					.Select(r =>
 					{
 						var record = new MemoryRecord(r);
-						record.ResolveAddress(Program.RemoteProcess);
+						record.ResolveAddress(process);
 						return record;
 					})
 			);
@@ -586,7 +592,7 @@ public void ExcuteScan(ScanSettings settings, IScanComparer comparer)
 		/// <param name="comparer">The comparer.</param>
 		private async Task StartFirstScanEx(ScanSettings settings, IScanComparer comparer)
 		{
-			if (!Program.RemoteProcess.IsValid)
+			if (!process.IsValid)
 			{
 				return;
 			}
@@ -596,7 +602,7 @@ private async Task StartFirstScanEx(ScanSettings settings, IScanComparer compare
 
 			try
 			{
-				scanner = new Scanner(Program.RemoteProcess, settings);
+				scanner = new Scanner(process, settings);
 
 				var report = new Progress<int>(i =>
 				{

ReClass.NET/UI/LinkedWindowFeatures.cs

@@ -92,7 +92,7 @@ public static void StartMemoryScan(IScanComparer comparer)
 			}
 			if (sf == null)
 			{
-				sf = new ScannerForm();
+				sf = new ScannerForm(Program.RemoteProcess);
 				sf.Show();
 			}