Sync with current ReClass.NET project.

Author: KN4CK3R

Diff for: LoadBinaryPlugin.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\x86\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN32</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RECLASSNET32</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\x86\</OutputPath>
-    <DefineConstants>TRACE;WIN32;RELEASE</DefineConstants>
+    <DefineConstants>TRACE;RECLASSNET32;RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -38,7 +38,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\x64\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WIN64</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RECLASSNET64</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -48,7 +48,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\x64\</OutputPath>
-    <DefineConstants>TRACE;WIN64;RELEASE</DefineConstants>
+    <DefineConstants>TRACE;RECLASSNET64;RELEASE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -76,12 +76,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ReClass.NET\ReClass.NET.csproj">
-      <Project>{BFB8917D-E9B4-463F-A6E8-612C35728C78}</Project>
-      <Name>ReClass.NET</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -92,6 +86,12 @@
   <ItemGroup>
     <None Include="Resources\icon.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ReClass.NET\ReClass.NET\ReClass.NET.csproj">
+      <Project>{bfb8917d-e9b4-463f-a6e8-612c35728c78}</Project>
+      <Name>ReClass.NET</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Diff for: LoadBinaryPlugin.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2002
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoadBinaryPlugin", "LoadBinaryPlugin.csproj", "{CA79BA0B-0D80-476A-B793-FC7EF7DCEAD8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReClass.NET", "..\ReClass.NET\ReClass.NET.csproj", "{BFB8917D-E9B4-463F-A6E8-612C35728C78}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReClass.NET", "..\ReClass.NET\ReClass.NET\ReClass.NET.csproj", "{BFB8917D-E9B4-463F-A6E8-612C35728C78}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,4 +35,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C9677E15-D4EA-4082-B65D-27B208118986}
+	EndGlobalSection
 EndGlobal

Diff for: LoadBinaryPluginExt.cs

@@ -6,14 +6,13 @@
 using System.Windows.Forms;
 using ReClassNET.Core;
 using ReClassNET.Debugger;
-using ReClassNET.Memory;
 using ReClassNET.Plugins;
 
 namespace LoadBinaryPlugin
 {
 	public class LoadBinaryPluginExt : Plugin, ICoreProcessFunctions
 	{
-		private object sync = new object();
+		private readonly object sync = new object();
 
 		private IPluginHost host;
 
@@ -26,15 +25,7 @@ public class LoadBinaryPluginExt : Plugin, ICoreProcessFunctions
 		public override bool Initialize(IPluginHost host)
 		{
 			Contract.Requires(host != null);
-
-			//System.Diagnostics.Debugger.Launch();
-
-			if (host == null)
-			{
-				throw new ArgumentNullException(nameof(host));
-			}
-
-			this.host = host;
+			this.host = host ?? throw new ArgumentNullException(nameof(host));
 
 			host.Process.CoreFunctions.RegisterFunctions("Load Binary", this);
 
@@ -59,8 +50,7 @@ public override void Terminate()
 		/// <returns>The file or null if the identifier doesn't exist.</returns>
 		private MemoryMappedFile GetMappedFileById(IntPtr id)
 		{
-			MemoryMappedFile file;
-			openFiles.TryGetValue(id, out file);
+			openFiles.TryGetValue(id, out var file);
 			return file;
 		}
 
@@ -71,8 +61,7 @@ private void LogErrorAndRemoveFile(IntPtr id, Exception ex)
 		{
 			Contract.Requires(ex != null);
 
-			MemoryMappedFile file;
-			if (openFiles.TryGetValue(id, out file))
+			if (openFiles.TryGetValue(id, out var file))
 			{
 				file.Dispose();
 			}
@@ -94,7 +83,7 @@ public bool IsProcessValid(IntPtr process)
 		}
 
 		/// <summary>Opens the file.</summary>
-		/// <param name="pid">The file id.</param>
+		/// <param name="id">The file id.</param>
 		/// <param name="desiredAccess">The desired access. (ignored)</param>
 		/// <returns>A plugin internal handle to the file.</returns>
 		public IntPtr OpenRemoteProcess(IntPtr id, ProcessAccess desiredAccess)
@@ -129,8 +118,7 @@ public void CloseRemoteProcess(IntPtr process)
 		{
 			lock (sync)
 			{
-				MemoryMappedFile file;
-				if (openFiles.TryGetValue(process, out file))
+				if (openFiles.TryGetValue(process, out var file))
 				{
 					openFiles.Remove(process);