Moved Module and Section class to seperate files.

Author: KN4CK3R

Memory/Module.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace ReClassNET.Memory
+{
+	public class Module
+	{
+		public IntPtr Start;
+		public IntPtr End;
+		public IntPtr Size;
+		public string Name;
+		public string Path;
+	}
+}

Memory/NativeHelper.cs

@@ -343,6 +343,54 @@ public void EnumerateRemoteSectionsAndModules(IntPtr process, EnumerateRemoteSec
 			enumerateRemoteSectionsAndModulesDelegate(process, callbackSection, callbackModule);
 		}
 
+		public void EnumerateRemoteSectionsAndModules(IntPtr process, Action<Section> callbackSection, Action<Module> callbackModule)
+		{
+			var c1 = callbackSection == null ? (EnumerateRemoteSectionCallback)null : delegate (IntPtr baseAddress, IntPtr regionSize, string name, NativeMethods.StateEnum state, NativeMethods.AllocationProtectEnum protection, NativeMethods.TypeEnum type, string modulePath)
+			{
+				var section = new Section
+				{
+					Start = baseAddress,
+					End = baseAddress.Add(regionSize),
+					Size = regionSize,
+					Name = name,
+					State = state,
+					Protection = protection,
+					Type = type,
+					ModulePath = modulePath,
+					ModuleName = Path.GetFileName(modulePath),
+					Category = type == NativeMethods.TypeEnum.MEM_PRIVATE ? SectionCategory.HEAP : SectionCategory.Unknown
+				};
+				switch (section.Name)
+				{
+					case ".text":
+					case "code":
+						section.Category = SectionCategory.CODE;
+						break;
+					case ".data":
+					case "data":
+					case ".rdata":
+					case ".idata":
+						section.Category = SectionCategory.DATA;
+						break;
+				}
+				callbackSection(section);
+			};
+			
+			var c2 = callbackModule == null ? (EnumerateRemoteModuleCallback)null : delegate (IntPtr baseAddress, IntPtr size, string modulePath)
+			{
+				callbackModule(new Module
+				{
+					Start = baseAddress,
+					End = baseAddress.Add(size),
+					Size = size,
+					Path = modulePath,
+					Name = Path.GetFileName(modulePath)
+				});
+			};
+
+			EnumerateRemoteSectionsAndModules(process, c1, c2);
+		}
+
 		public void DisassembleRemoteCode(IntPtr process, IntPtr address, int length, DisassembleRemoteCodeCallback remoteCodeCallback)
 		{
 			disassembleRemoteCodeDelegate(process, address, length, remoteCodeCallback);

Memory/NodeDissector.cs

@@ -116,18 +116,18 @@ private static Type GuessPointerType(IntPtr address, MemoryBuffer memory)
 			var section = memory.Process.GetSectionToPointer(address);
 			if (section != null) // If the address points to a section it's valid memory.
 			{
-				if (section.Category == RemoteProcess.SectionCategory.CODE) // If the section contains code, it should be a function pointer.
+				if (section.Category == SectionCategory.CODE) // If the section contains code, it should be a function pointer.
 				{
 					return typeof(FunctionPtrNode);
 				}
-				else if (section.Category == RemoteProcess.SectionCategory.DATA || section.Category == RemoteProcess.SectionCategory.HEAP) // If the section contains data, it is at least a pointer to a class or something.
+				else if (section.Category == SectionCategory.DATA || section.Category == SectionCategory.HEAP) // If the section contains data, it is at least a pointer to a class or something.
 				{
 					// Check if it is a vtable. Check if the first 3 values are pointers to a code section.
 					bool valid = true;
 					for (var i = 0; i < 3; ++i)
 					{
 						var pointee = memory.Process.ReadRemoteObject<IntPtr>(address);
-						if (memory.Process.GetSectionToPointer(pointee)?.Category != RemoteProcess.SectionCategory.CODE)
+						if (memory.Process.GetSectionToPointer(pointee)?.Category != SectionCategory.CODE)
 						{
 							valid = false;
 							break;

Memory/RemoteProcess.cs

@@ -30,35 +30,6 @@ public ProcessInfo Process
 
 		private readonly Dictionary<IntPtr, string> rttiCache = new Dictionary<IntPtr, string>();
 
-		public class Module
-		{
-			public IntPtr Start;
-			public IntPtr End;
-			public string Name;
-			public string Path;
-		}
-
-		public enum SectionCategory
-		{
-			Unknown,
-			CODE,
-			DATA,
-			HEAP
-		}
-
-		public class Section
-		{
-			public IntPtr Start;
-			public IntPtr End;
-			public string Name;
-			public SectionCategory Category;
-			public NativeMethods.StateEnum State;
-			public NativeMethods.AllocationProtectEnum Protection;
-			public NativeMethods.TypeEnum Type;
-			public string ModuleName;
-			public string ModulePath;
-		}
-
 		private readonly List<Module> modules = new List<Module>();
 
 		private readonly List<Section> sections = new List<Section>();
@@ -455,48 +426,7 @@ public Task UpdateProcessInformationsAsync()
 				var newModules = new List<Module>();
 				var newSections = new List<Section>();
 
-				nativeHelper.EnumerateRemoteSectionsAndModules(
-					process.Handle,
-					delegate (IntPtr baseAddress, IntPtr regionSize, string name, NativeMethods.StateEnum state, NativeMethods.AllocationProtectEnum protection, NativeMethods.TypeEnum type, string modulePath)
-					{
-						var section = new Section
-						{
-							Start = baseAddress,
-							End = baseAddress.Add(regionSize),
-							Name = name,
-							State = state,
-							Protection = protection,
-							Type = type,
-							ModulePath = modulePath,
-							ModuleName = Path.GetFileName(modulePath),
-							Category = type == NativeMethods.TypeEnum.MEM_PRIVATE ? SectionCategory.HEAP : SectionCategory.Unknown
-						};
-						switch (section.Name)
-						{
-							case ".text":
-							case "code":
-								section.Category = SectionCategory.CODE;
-								break;
-							case ".data":
-							case "data":
-							case ".rdata":
-							case ".idata":
-								section.Category = SectionCategory.DATA;
-								break;
-						}
-						newSections.Add(section);
-					},
-					delegate (IntPtr baseAddress, IntPtr regionSize, string modulePath)
-					{
-						newModules.Add(new Module
-						{
-							Start = baseAddress,
-							End = baseAddress.Add(regionSize),
-							Path = modulePath,
-							Name = Path.GetFileName(modulePath)
-						});
-					}
-				);
+				nativeHelper.EnumerateRemoteSectionsAndModules(process.Handle, newSections.Add, newModules.Add);
 
 				newModules.Sort((m1, m2) => m1.Start.CompareTo(m2.Start));
 				newSections.Sort((s1, s2) => s1.Start.CompareTo(s2.Start));

Memory/Section.cs

@@ -0,0 +1,27 @@
+using System;
+using ReClassNET.Util;
+
+namespace ReClassNET.Memory
+{
+	public enum SectionCategory
+	{
+		Unknown,
+		CODE,
+		DATA,
+		HEAP
+	}
+
+	public class Section
+	{
+		public IntPtr Start;
+		public IntPtr End;
+		public IntPtr Size;
+		public string Name;
+		public SectionCategory Category;
+		public NativeMethods.StateEnum State;
+		public NativeMethods.AllocationProtectEnum Protection;
+		public NativeMethods.TypeEnum Type;
+		public string ModuleName;
+		public string ModulePath;
+	}
+}

ReClass.NET.csproj

@@ -152,7 +152,9 @@
     <Compile Include="Forms\InputBytesForm.Designer.cs">
       <DependentUpon>InputBytesForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Memory\Module.cs" />
     <Compile Include="Memory\NodeDissector.cs" />
+    <Compile Include="Memory\Section.cs" />
     <Compile Include="Memory\UnionDataType.cs" />
     <Compile Include="Nodes\BoolNode.cs" />
     <Compile Include="Nodes\ClassUtil.cs" />

Symbols/SymbolReader.cs

@@ -47,7 +47,7 @@ public void Dispose()
 			GC.SuppressFinalize(this);
 		}
 
-		public static void TryResolveSymbolsForModule(RemoteProcess.Module module, string searchPath)
+		public static void TryResolveSymbolsForModule(Module module, string searchPath)
 		{
 			Contract.Requires(module != null);
 
@@ -57,7 +57,7 @@ public static void TryResolveSymbolsForModule(RemoteProcess.Module module, strin
 			}
 		}
 
-		public static SymbolReader FromModule(RemoteProcess.Module module, string searchPath)
+		public static SymbolReader FromModule(Module module, string searchPath)
 		{
 			Contract.Requires(module != null);
 
@@ -85,7 +85,7 @@ private void CreateSession()
 			diaSession = new ComDisposableWrapper<IDiaSession>(session);
 		}
 
-		public string GetSymbolString(IntPtr address, RemoteProcess.Module module)
+		public string GetSymbolString(IntPtr address, Module module)
 		{
 			Contract.Requires(module != null);
 

Symbols/SymbolStore.cs

@@ -107,7 +107,7 @@ private void ResolveSearchPath()
 			}
 		}
 
-		public void TryResolveSymbolsForModule(RemoteProcess.Module module)
+		public void TryResolveSymbolsForModule(Module module)
 		{
 			Contract.Requires(module != null);
 
@@ -140,7 +140,7 @@ public void TryResolveSymbolsForModule(RemoteProcess.Module module)
 			}
 		}
 
-		public void LoadSymbolsForModule(RemoteProcess.Module module)
+		public void LoadSymbolsForModule(Module module)
 		{
 			Contract.Requires(module != null);
 
@@ -186,7 +186,7 @@ public void LoadSymbolsFromPDB(string path)
 			}
 		}
 
-		public SymbolReader GetSymbolsForModule(RemoteProcess.Module module)
+		public SymbolReader GetSymbolsForModule(Module module)
 		{
 			Contract.Requires(module != null);