Sync with latest ReClass.NET source.

Author: KN4CK3R

FrostBiteNodeInfoReader.cs

@@ -9,20 +9,20 @@ namespace FrostbitePlugin
 	/// <summary>A custom node info reader which outputs Frostbite type infos.</summary>
 	public class FrostBiteNodeInfoReader : INodeInfoReader
 	{
-		public string ReadNodeInfo(BaseHexCommentNode node, IntPtr nodeAddress, IntPtr nodeValue, MemoryBuffer memory)
+		public string ReadNodeInfo(BaseHexCommentNode node, IRemoteMemoryReader reader, MemoryBuffer memory, IntPtr nodeAddress, IntPtr nodeValue)
 		{
 			// 1. try the direct value
-			var info = ReadPtrInfo(nodeValue, memory);
+			var info = ReadPtrInfo(nodeValue, reader);
 			if (!string.IsNullOrEmpty(info))
 			{
 				return info;
 			}
 
 			// 2. try indirect pointer
-			var indirectPtr = memory.Process.ReadRemoteIntPtr(nodeValue);
+			var indirectPtr = reader.ReadRemoteIntPtr(nodeValue);
 			if (indirectPtr.MayBeValid())
 			{
-				info = ReadPtrInfo(indirectPtr, memory);
+				info = ReadPtrInfo(indirectPtr, reader);
 				if (!string.IsNullOrEmpty(info))
 				{
 					return $"Ptr -> {info}";
@@ -32,10 +32,10 @@ public string ReadNodeInfo(BaseHexCommentNode node, IntPtr nodeAddress, IntPtr n
 				var weakTempPtr = indirectPtr - IntPtr.Size;
 				if (weakTempPtr.MayBeValid())
 				{
-					var weakPtr = memory.Process.ReadRemoteIntPtr(weakTempPtr);
+					var weakPtr = reader.ReadRemoteIntPtr(weakTempPtr);
 					if (weakPtr.MayBeValid())
 					{
-						info = ReadPtrInfo(weakPtr, memory);
+						info = ReadPtrInfo(weakPtr, reader);
 						if (!string.IsNullOrEmpty(info))
 						{
 							return $"WeakPtr -> {info}";
@@ -47,26 +47,26 @@ public string ReadNodeInfo(BaseHexCommentNode node, IntPtr nodeAddress, IntPtr n
 			return null;
 		}
 
-		private static string ReadPtrInfo(IntPtr value, MemoryBuffer memory)
+		private static string ReadPtrInfo(IntPtr value, IRemoteMemoryReader process)
 		{
-			var getTypeFnPtr = memory.Process.ReadRemoteIntPtr(value);
+			var getTypeFnPtr = process.ReadRemoteIntPtr(value);
 			if (getTypeFnPtr.MayBeValid())
 			{
 #if RECLASSNET64
-				var offset = memory.Process.ReadRemoteInt32(getTypeFnPtr + 3);
+				var offset = process.ReadRemoteInt32(getTypeFnPtr + 3);
 				var typeInfoPtr = getTypeFnPtr + offset + 7;
 #else
-				var typeInfoPtr = memory.Process.ReadRemoteIntPtr(getTypeFnPtr + 1);
+				var typeInfoPtr = process.ReadRemoteIntPtr(getTypeFnPtr + 1);
 #endif
 				if (typeInfoPtr.MayBeValid())
 				{
-					var typeInfoDataPtr = memory.Process.ReadRemoteIntPtr(typeInfoPtr);
+					var typeInfoDataPtr = process.ReadRemoteIntPtr(typeInfoPtr);
 					if (typeInfoDataPtr.MayBeValid())
 					{
-						var namePtr = memory.Process.ReadRemoteIntPtr(typeInfoDataPtr);
+						var namePtr = process.ReadRemoteIntPtr(typeInfoDataPtr);
 						if (namePtr.MayBeValid())
 						{
-							var info = memory.Process.ReadRemoteStringUntilFirstNullCharacter(Encoding.UTF8, namePtr, 64);
+							var info = process.ReadRemoteStringUntilFirstNullCharacter(Encoding.UTF8, namePtr, 64);
 							if (info.Length > 0 && info[0].IsPrintable())
 							{
 								return info;

FrostbitePlugin.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FrostbitePlugin</RootNamespace>
     <AssemblyName>FrostbitePlugin</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>

Properties/Resources.Designer.cs

@@ -26,7 +26,7 @@ public override void Initialize()
 			var node = ClassNode.Create();
 			node.Initialize();
 			node.AddBytes(64);
-			InnerNode = node;
+			ChangeInnerNode(node);
 		}
 
 		public override Size Draw(ViewInfo view, int x, int y)
@@ -69,16 +69,15 @@ public override Size Draw(ViewInfo view, int x, int y)
 				var ptr = view.Memory.ReadObject<IntPtr>(Offset);
 				if (!ptr.IsNull())
 				{
-					ptr = view.Memory.Process.ReadRemoteObject<IntPtr>(ptr);
+					ptr = view.Process.ReadRemoteObject<IntPtr>(ptr);
 					if (!ptr.IsNull())
 					{
 						ptr -= IntPtr.Size;
 					}
 				}
 
 				memory.Size = InnerNode.MemorySize;
-				memory.Process = view.Memory.Process;
-				memory.Update(ptr);
+				memory.UpdateFrom(view.Process, ptr);
 
 				var v = view.Clone();
 				v.Address = ptr;