Merge pull request #7 from jesterret/master

Added a null check for a case where all processes got filtered out of…

Author: KN4CK3R

Forms/MainForm.cs

@@ -159,16 +159,19 @@ private void attachToProcessToolStripMenuItem_Click(object sender, EventArgs e)
 			{
 				if (pb.ShowDialog() == DialogResult.OK)
 				{
-					DetachFromCurrentProcess();
-
-					remoteProcess.Process = pb.SelectedProcess;
-					remoteProcess.UpdateProcessInformations();
-					if (pb.LoadSymbols)
+					if (pb.SelectedProcess != null)
 					{
-						LoadAllSymbolsForCurrentProcess();
-					}
+						DetachFromCurrentProcess();
 
-					Program.Settings.LastProcess = remoteProcess.Process.Name;
+						remoteProcess.Process = pb.SelectedProcess;
+						remoteProcess.UpdateProcessInformations();
+						if (pb.LoadSymbols)
+						{
+							LoadAllSymbolsForCurrentProcess();
+						}
+
+						Program.Settings.LastProcess = remoteProcess.Process.Name;
+					}
 				}
 			}
 		}
@@ -180,7 +183,8 @@ private void detachToolStripMenuItem_Click(object sender, EventArgs e)
 
 		private void newClassToolStripButton_Click(object sender, EventArgs e)
 		{
-			var node = ClassNode.Create();
+			var address = remoteProcess.GetModuleByName(remoteProcess.Process?.Name)?.Start ?? IntPtr.Zero;
+			var node = ClassNode.Create(address);
 			node.AddBytes(64);
 
 			classesView.SelectedClass = node;

NativeHelper/NativeHelper.vcxproj

@@ -72,25 +72,25 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)bin\$(PlatformTarget)\$(Configuration)\</OutDir>
     <IncludePath>.\beaengine\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)\bin\$(Configuration)\x64\</OutDir>
+    <OutDir>$(SolutionDir)bin\$(PlatformTarget)\$(Configuration)\</OutDir>
     <IncludePath>.\beaengine\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)bin\$(PlatformTarget)\$(Configuration)\</OutDir>
     <IncludePath>.\beaengine\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\x64\</OutDir>
+    <OutDir>$(SolutionDir)bin\$(PlatformTarget)\$(Configuration)\</OutDir>
     <IncludePath>.\beaengine\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

Nodes/ClassNode.cs

@@ -44,30 +44,44 @@ public IntPtr Address
 		public string AddressFormula { get; set; }
 
 		public event NodeEventHandler NodesChanged;
-
-		internal ClassNode(bool notifyClassCreated)
+	
+		internal ClassNode(bool notifyClassCreated, IntPtr address)
 		{
 			Contract.Ensures(AddressFormula != null);
 
 			Uuid = new NodeUuid(true);
 
+			if (address == IntPtr.Zero)
+			{
 #if WIN64
-			Address = (IntPtr)0x140000000;
+				Address = (IntPtr)0x140000000;
 #else
-			Address = (IntPtr)0x400000;
+				Address = (IntPtr)0x400000;
 #endif
-
+			}
+			else
+				Address = address;
 			if (notifyClassCreated)
 			{
 				ClassCreated?.Invoke(this);
 			}
 		}
 
-		public static ClassNode Create()
+		internal ClassNode(bool notifyClassCreated) : this(notifyClassCreated, IntPtr.Zero)
+		{
+
+		}
+
+		public static ClassNode Create(IntPtr address)
 		{
 			Contract.Ensures(Contract.Result<ClassNode>() != null);
 
-			return new ClassNode(true);
+			return new ClassNode(true, address);
+		}
+
+		public static ClassNode Create()
+		{
+			return Create(IntPtr.Zero);
 		}
 
 		public override void Intialize()

ReClass.NET.csproj

@@ -21,7 +21,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\x86\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN32</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -74,7 +74,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\x86\Release\</OutputPath>
     <DefineConstants>TRACE;WIN32;RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -84,7 +84,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\x64\</OutputPath>
+    <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;WIN64</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -94,7 +94,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\x64\</OutputPath>
+    <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE;WIN64;RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>