Added a null check for a case where all processes got filtered out of the attach form and enter/attach key got pressed.

jesterret · jesterret · commit 0f3f85b9ea1e · 2016-12-04T01:10:12.000+01:00
Added an optional parameter to ClassNode constructor allowing to specify a base address.
Added using remote process image base on class node creation as base address.
Modified output file paths for projects to allow for automated copy on build event for plugins.
diff --git a/Forms/MainForm.cs b/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.IsValid ? remoteProcess.GetModuleByName(remoteProcess.Process.Name).Start : IntPtr.Zero;
+			var node = ClassNode.Create(Address);
 			node.AddBytes(64);
 
 			classesView.SelectedClass = node;
diff --git a/NativeHelper/NativeHelper.vcxproj b/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'">
diff --git a/Nodes/ClassNode.cs b/Nodes/ClassNode.cs
@@ -45,29 +45,32 @@ public IntPtr Address
 
 		public event NodeEventHandler NodesChanged;
 
-		internal ClassNode(bool notifyClassCreated)
+		internal ClassNode(bool notifyClassCreated, IntPtr Address = default(IntPtr))
 		{
 			Contract.Ensures(AddressFormula != null);
 
 			Uuid = new NodeUuid(true);
-
+			if (Address == IntPtr.Zero)
+			{
 #if WIN64
-			Address = (IntPtr)0x140000000;
+				this.Address = (IntPtr)0x140000000;
 #else
-			Address = (IntPtr)0x400000;
+				this.Address = (IntPtr)0x400000;
 #endif
-
+			}
+			else
+				this.Address = Address;
 			if (notifyClassCreated)
 			{
 				ClassCreated?.Invoke(this);
 			}
 		}
 
-		public static ClassNode Create()
+		public static ClassNode Create(IntPtr Address = default(IntPtr))
 		{
 			Contract.Ensures(Contract.Result<ClassNode>() != null);
 
-			return new ClassNode(true);
+			return new ClassNode(true, Address);
 		}
 
 		public override void Intialize()
diff --git a/ReClass.NET.csproj b/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>

Original file line number	Diff line number	Diff line change
`@@ -159,16 +159,19 @@ private void attachToProcessToolStripMenuItem_Click(object sender, EventArgs e)`
`159`	`159`	`{`
`160`	`160`	`if (pb.ShowDialog() == DialogResult.OK)`
`161`	`161`	`{`
`162`		`- DetachFromCurrentProcess();`
`163`		`-`
`164`		`- remoteProcess.Process = pb.SelectedProcess;`
`165`		`- remoteProcess.UpdateProcessInformations();`
`166`		`- if (pb.LoadSymbols)`
	`162`	`+ if (pb.SelectedProcess != null)`
`167`	`163`	`{`
`168`		`- LoadAllSymbolsForCurrentProcess();`
`169`		`- }`
	`164`	`+ DetachFromCurrentProcess();`
`170`	`165`
`171`		`- Program.Settings.LastProcess = remoteProcess.Process.Name;`
	`166`	`+ remoteProcess.Process = pb.SelectedProcess;`
	`167`	`+ remoteProcess.UpdateProcessInformations();`
	`168`	`+ if (pb.LoadSymbols)`
	`169`	`+ {`
	`170`	`+ LoadAllSymbolsForCurrentProcess();`
	`171`	`+ }`
	`172`	`+`
	`173`	`+ Program.Settings.LastProcess = remoteProcess.Process.Name;`
	`174`	`+ }`
`172`	`175`	`}`
`173`	`176`	`}`
`174`	`177`	`}`
`@@ -180,7 +183,8 @@ private void detachToolStripMenuItem_Click(object sender, EventArgs e)`
`180`	`183`
`181`	`184`	`private void newClassToolStripButton_Click(object sender, EventArgs e)`
`182`	`185`	`{`
`183`		`- var node = ClassNode.Create();`
	`186`	`+ var Address = remoteProcess.IsValid ? remoteProcess.GetModuleByName(remoteProcess.Process.Name).Start : IntPtr.Zero;`
	`187`	`+ var node = ClassNode.Create(Address);`
`184`	`188`	`node.AddBytes(64);`
`185`	`189`
`186`	`190`	`classesView.SelectedClass = node;`
Original file line number	Diff line number	Diff line change
`@@ -45,29 +45,32 @@ public IntPtr Address`
`45`	`45`
`46`	`46`	`public event NodeEventHandler NodesChanged;`
`47`	`47`
`48`		`- internal ClassNode(bool notifyClassCreated)`
	`48`	`+ internal ClassNode(bool notifyClassCreated, IntPtr Address = default(IntPtr))`
`49`	`49`	`{`
`50`	`50`	`Contract.Ensures(AddressFormula != null);`
`51`	`51`
`52`	`52`	`Uuid = new NodeUuid(true);`
`53`		`-`
	`53`	`+ if (Address == IntPtr.Zero)`
	`54`	`+ {`
`54`	`55`	`#if WIN64`
`55`		`- Address = (IntPtr)0x140000000;`
	`56`	`+ this.Address = (IntPtr)0x140000000;`
`56`	`57`	`#else`
`57`		`- Address = (IntPtr)0x400000;`
	`58`	`+ this.Address = (IntPtr)0x400000;`
`58`	`59`	`#endif`
`59`		`-`
	`60`	`+ }`
	`61`	`+ else`
	`62`	`+ this.Address = Address;`
`60`	`63`	`if (notifyClassCreated)`
`61`	`64`	`{`
`62`	`65`	`ClassCreated?.Invoke(this);`
`63`	`66`	`}`
`64`	`67`	`}`
`65`	`68`
`66`		`- public static ClassNode Create()`
	`69`	`+ public static ClassNode Create(IntPtr Address = default(IntPtr))`
`67`	`70`	`{`
`68`	`71`	`Contract.Ensures(Contract.Result<ClassNode>() != null);`
`69`	`72`
`70`		`- return new ClassNode(true);`
	`73`	`+ return new ClassNode(true, Address);`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`public override void Intialize()`