Removed ProcessInfo functionality.

Author: KN4CK3R

Forms/MainForm.cs

@@ -53,14 +53,14 @@ public MainForm(NativeHelper nativeHelper)
 			remoteProcess = new RemoteProcess(nativeHelper);
 			remoteProcess.ProcessChanged += delegate (RemoteProcess sender)
 			{
-				if (sender.Process == null)
+				if (!sender.IsValid)
 				{
 					Text = Constants.ApplicationName;
 					processInfoToolStripStatusLabel.Text = "No process selected";
 				}
 				else
 				{
-					var text = $"{sender.Process.Name} (PID: {sender.Process.Id})";
+					var text = $"{sender.UnderlayingProcess.Name} (PID: {sender.UnderlayingProcess.Id.ToString()})";
 
 					Text = $"{Constants.ApplicationName} - {text}";
 					processInfoToolStripStatusLabel.Text = text;
@@ -146,10 +146,7 @@ private async void MainForm_FormClosing(object sender, FormClosingEventArgs e)
 				Close();
 			}
 
-			if (remoteProcess.Process != null)
-			{
-				remoteProcess.Process.Close();
-			}
+			remoteProcess.Dispose();
 		}
 
 		#region Menustrip
@@ -162,32 +159,32 @@ private void attachToProcessToolStripMenuItem_Click(object sender, EventArgs e)
 				{
 					if (pb.SelectedProcess != null)
 					{
-						DetachFromCurrentProcess();
+						remoteProcess.Close();
 
-						remoteProcess.Process = pb.SelectedProcess;
+						remoteProcess.Open(pb.SelectedProcess);
 						remoteProcess.UpdateProcessInformations();
 						if (pb.LoadSymbols)
 						{
 							LoadAllSymbolsForCurrentProcess();
 						}
 
-						Program.Settings.LastProcess = remoteProcess.Process.Name;
+						Program.Settings.LastProcess = remoteProcess.UnderlayingProcess.Name;
 					}
 				}
 			}
 		}
 
 		private void detachToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			DetachFromCurrentProcess();
+			remoteProcess.Close();
 		}
 
 		private void newClassToolStripButton_Click(object sender, EventArgs e)
 		{
 			var node = ClassNode.Create();
 			node.AddBytes(64);
 
-			var mainModule = remoteProcess.GetModuleByName(remoteProcess.Process?.Name);
+			var mainModule = remoteProcess.GetModuleByName(remoteProcess.UnderlayingProcess?.Name);
 			if (mainModule != null)
 			{
 				node.Address = mainModule.Start;
@@ -327,7 +324,7 @@ private void ControlRemoteProcessToolStripMenuItem_Click(object sender, EventArg
 				action = ControlRemoteProcessAction.Suspend;
 			}
 
-			nativeHelper.ControlRemoteProcess(remoteProcess.Process.Handle, action);
+			remoteProcess.ControlRemoteProcess(action);
 		}
 
 		private void loadSymbolToolStripMenuItem_Click(object sender, EventArgs e)
@@ -579,16 +576,6 @@ internal void DeregisterNodeType(Type type)
 			memoryViewControl.DeregisterNodeType(type);
 		}
 
-		/// <summary>Detach from current process.</summary>
-		private void DetachFromCurrentProcess()
-		{
-			if (remoteProcess.Process != null)
-			{
-				remoteProcess.Process.Close();
-				remoteProcess.Process = null;
-			}
-		}
-
 		/// <summary>Shows the code form with the given <paramref name="generator"/>.</summary>
 		/// <param name="generator">The generator.</param>
 		private void ShowCodeForm(ICodeGenerator generator)

Forms/ProcessBrowserForm.cs

@@ -31,7 +31,7 @@ public ProcessInfo SelectedProcess
 				var row = (processDataGridView.SelectedRows.Cast<DataGridViewRow>().FirstOrDefault()?.DataBoundItem as DataRowView)?.Row;
 				if (row != null)
 				{
-					return new ProcessInfo(nativeHelper, row.Field<IntPtr>("id"), row.Field<string>("name"), row.Field<string>("path"));
+					return new ProcessInfo(row.Field<IntPtr>("id"), row.Field<string>("name"), row.Field<string>("path"));
 				}
 				return null;
 			}

Forms/ProcessInfoForm.cs

@@ -57,8 +57,7 @@ public ProcessInfoForm(RemoteProcess process, ClassNodeView classesView)
 				modules.Columns.Add("path", typeof(string));
 				modules.Columns.Add("module", typeof(Module));
 
-				process.NativeHelper.EnumerateRemoteSectionsAndModules(
-					process.Process.Handle,
+				process.EnumerateRemoteSectionsAndModules(
 					delegate (Section section)
 					{
 						var row = sections.NewRow();

Memory/ProcessInfo.cs

@@ -1,70 +1,22 @@
 using System;
 using System.Diagnostics.Contracts;
-using ReClassNET.Native;
-using ReClassNET.Util;
 
 namespace ReClassNET.Memory
 {
-	public class ProcessInfo : IDisposable
+	public class ProcessInfo
 	{
-		private readonly object sync = new object();
-
-		private readonly NativeHelper nativeHelper;
-
-		private IntPtr handle;
-
 		public IntPtr Id { get; }
-		public IntPtr Handle => Open();
 		public string Name { get; }
 		public string Path { get; }
 
-		public ProcessInfo(NativeHelper nativeHelper, IntPtr id, string name, string path)
+		public ProcessInfo(IntPtr id, string name, string path)
 		{
-			Contract.Requires(nativeHelper != null);
 			Contract.Requires(name != null);
 			Contract.Requires(path != null);
 
-			this.nativeHelper = nativeHelper;
-
 			Id = id;
 			Name = name;
 			Path = path;
 		}
-
-		public void Dispose()
-		{
-			Close();
-		}
-
-		public IntPtr Open()
-		{
-			if (handle.IsNull())
-			{
-				lock (sync)
-				{
-					if (handle.IsNull())
-					{
-						handle = nativeHelper.OpenRemoteProcess(Id, ProcessAccess.Full);
-					}
-				}
-			}
-			return handle;
-		}
-
-		public void Close()
-		{
-			if (!handle.IsNull())
-			{
-				lock (sync)
-				{
-					if (!handle.IsNull())
-					{
-						nativeHelper.CloseRemoteProcess(handle);
-
-						handle = IntPtr.Zero;
-					}
-				}
-			}
-		}
 	}
 }

Memory/RemoteProcess.cs

@@ -14,17 +14,16 @@
 
 namespace ReClassNET.Memory
 {
-	public class RemoteProcess
+	public class RemoteProcess : IDisposable
 	{
+		private readonly object processSync = new object();
+
 		private readonly NativeHelper nativeHelper;
 		public NativeHelper NativeHelper => nativeHelper;
 
 		private ProcessInfo process;
-		public ProcessInfo Process
-		{
-			get { return process; }
-			set { if (process != value) { process = value; rttiCache.Clear(); ProcessChanged?.Invoke(this); } }
-		}
+		private IntPtr handle;
+		public ProcessInfo UnderlayingProcess => process;
 
 		public delegate void RemoteProcessChangedEvent(RemoteProcess sender);
 		public event RemoteProcessChangedEvent ProcessChanged;
@@ -38,7 +37,7 @@ public ProcessInfo Process
 		private readonly SymbolStore symbols = new SymbolStore();
 		public SymbolStore Symbols => symbols;
 
-		public bool IsValid => process != null && nativeHelper.IsProcessValid(process.Handle);
+		public bool IsValid => process != null && nativeHelper.IsProcessValid(handle);
 
 		public RemoteProcess(NativeHelper nativeHelper)
 		{
@@ -47,6 +46,51 @@ public RemoteProcess(NativeHelper nativeHelper)
 			this.nativeHelper = nativeHelper;
 		}
 
+		public void Dispose()
+		{
+			Close();
+		}
+
+		public void Open(ProcessInfo info)
+		{
+			Contract.Requires(info != null);
+
+			if (process != info)
+			{
+				lock (processSync)
+				{
+					Close();
+
+					rttiCache.Clear();
+
+					process = info;
+
+					handle = nativeHelper.OpenRemoteProcess(process.Id, ProcessAccess.Full);
+				}
+
+				ProcessChanged?.Invoke(this);
+			}
+		}
+
+		public void Close()
+		{
+			if (process != null)
+			{
+				lock (processSync)
+				{
+					//detach debugger, remove breakpoints
+
+					nativeHelper.CloseRemoteProcess(handle);
+
+					handle = IntPtr.Zero;
+
+					process = null;
+				}
+
+				ProcessChanged?.Invoke(this);
+			}
+		}
+
 		#region ReadMemory
 
 		/// <summary>Reads remote memory from the address into the buffer.</summary>
@@ -76,14 +120,14 @@ public bool ReadRemoteMemoryIntoBuffer(IntPtr address, ref byte[] buffer, int of
 
 			if (!IsValid)
 			{
-				Process = null;
+				Close();
 
 				buffer.FillWithZero();
 
 				return false;
 			}
 
-			return nativeHelper.ReadRemoteMemory(Process.Handle, address, buffer, offset, length);
+			return nativeHelper.ReadRemoteMemory(handle, address, buffer, offset, length);
 		}
 
 		/// <summary>Reads <paramref name="size"/> bytes from the address in the remote process.</summary>
@@ -344,7 +388,7 @@ public bool WriteRemoteMemory(IntPtr address, byte[] data)
 				return false;
 			}
 
-			return nativeHelper.WriteRemoteMemory(Process.Handle, address, data, data.Length);
+			return nativeHelper.WriteRemoteMemory(handle, address, data, data.Length);
 		}
 
 		/// <summary>Writes the given <paramref name="value"/> to the <paramref name="address"/> in the remote process.</summary>
@@ -417,6 +461,16 @@ public string GetNamedAddress(IntPtr address)
 			return null;
 		}
 
+		public void EnumerateRemoteSectionsAndModules(Action<Section> callbackSection, Action<Module> callbackModule)
+		{
+			if (!IsValid)
+			{
+				return;
+			}
+
+			nativeHelper.EnumerateRemoteSectionsAndModules(handle, callbackSection, callbackModule);
+		}
+
 		/// <summary>Updates the process informations.</summary>
 		public void UpdateProcessInformations()
 		{
@@ -448,7 +502,7 @@ public Task UpdateProcessInformationsAsync()
 				var newModules = new List<Module>();
 				var newSections = new List<Section>();
 
-				nativeHelper.EnumerateRemoteSectionsAndModules(process.Handle, newSections.Add, newModules.Add);
+				EnumerateRemoteSectionsAndModules(newSections.Add, newModules.Add);
 
 				newModules.Sort((m1, m2) => m1.Start.CompareTo(m2.Start));
 				newSections.Sort((s1, s2) => s1.Start.CompareTo(s2.Start));
@@ -535,5 +589,15 @@ public Task LoadAllSymbolsAsync(IProgress<Tuple<Module, IEnumerable<Module>>> pr
 				TaskScheduler.FromCurrentSynchronizationContext()
 			);
 		}
+
+		public void ControlRemoteProcess(ControlRemoteProcessAction action)
+		{
+			if (!IsValid)
+			{
+				return;
+			}
+
+			nativeHelper.ControlRemoteProcess(handle, action);
+		}
 	}
 }