Merge branch 'master' into master

Author: KN4CK3R

NativeCore/Windows/EnumerateProcesses.cpp

@@ -1,8 +1,7 @@
 #include <windows.h>
 #include <tlhelp32.h>
 #include <psapi.h>
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
+#include <filesystem>
 
 #include "NativeCore.hpp"
 
@@ -73,7 +72,7 @@ void RC_CallConv EnumerateProcesses(EnumerateProcessCallback callbackProcess)
 						EnumerateProcessData data = { };
 						data.Id = pe32.th32ProcessID;
 						GetModuleFileNameExW(process, nullptr, reinterpret_cast<LPWSTR>(data.Path), PATH_MAXIMUM_LENGTH);
-						const auto name = fs::path(data.Path).filename().u16string();
+						const auto name = std::filesystem::path(data.Path).filename().u16string();
 						str16cpy(data.Name, name.c_str(), std::min<size_t>(name.length(), PATH_MAXIMUM_LENGTH - 1));
 
 						callbackProcess(&data);

NativeCore/Windows/EnumerateRemoteSectionsAndModules.cpp

@@ -192,26 +192,31 @@ void RC_CallConv EnumerateRemoteSectionsAndModules(RC_Pointer process, Enumerate
 				const auto sectionAddress = reinterpret_cast<size_t>(data->BaseAddress) + sectionHeader.VirtualAddress;
 				for (auto j = it; j != std::end(sections); ++j)
 				{
-					if (sectionAddress >= reinterpret_cast<size_t>(j->BaseAddress) && sectionAddress < reinterpret_cast<size_t>(j->BaseAddress) + static_cast<size_t>(j->Size))
-					{
-						// Copy the name because it is not null padded.
-						char buffer[IMAGE_SIZEOF_SHORT_NAME + 1] = { 0 };
-						std::memcpy(buffer, sectionHeader.Name, IMAGE_SIZEOF_SHORT_NAME);
-
-						if (std::strcmp(buffer, ".text") == 0 || std::strcmp(buffer, "code") == 0)
-						{
-							j->Category = SectionCategory::CODE;
-						}
-						else if (std::strcmp(buffer, ".data") == 0 || std::strcmp(buffer, "data") == 0 || std::strcmp(buffer, ".rdata") == 0 || std::strcmp(buffer, ".idata") == 0)
-						{
-							j->Category = SectionCategory::DATA;
-						}
-
-						MultiByteToUnicode(buffer, j->Name, IMAGE_SIZEOF_SHORT_NAME);
-						std::memcpy(j->ModulePath, data->Path, std::min(MAX_PATH, PATH_MAXIMUM_LENGTH));
-
-						break;
-					}
+					if (sectionAddress >= reinterpret_cast<size_t>(j->BaseAddress) 
+								&& sectionAddress < reinterpret_cast<size_t>(j->BaseAddress) + static_cast<size_t>(j->Size)
+								&& sectionHeader.VirtualAddress + sectionHeader.Misc.VirtualSize <= me32.modBaseSize )
+							{
+								if ((sectionHeader.Characteristics & IMAGE_SCN_CNT_CODE) == IMAGE_SCN_CNT_CODE)
+								{
+									j->Category = SectionCategory::CODE;
+								}
+								else if (sectionHeader.Characteristics & (IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_CNT_UNINITIALIZED_DATA))
+								{
+									j->Category = SectionCategory::DATA;
+								}
+
+								try {
+									// Copy the name because it is not null padded.
+									char buffer[IMAGE_SIZEOF_SHORT_NAME + 1] = { 0 };
+									std::memcpy(buffer, sectionHeader.Name, IMAGE_SIZEOF_SHORT_NAME);
+									MultiByteToUnicode(buffer, j->Name, IMAGE_SIZEOF_SHORT_NAME);
+								} catch (std::range_error &) {
+									std::memset(j->Name, 0, sizeof j->Name);
+								}
+								std::memcpy(j->ModulePath, me32.szExePath, std::min(MAX_PATH, PATH_MAXIMUM_LENGTH));
+
+								break;
+							}
 				}
 
 			}

NativeCore/Windows/NativeCore.vcxproj

@@ -103,7 +103,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NATIVECORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;RECLASSNET32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NATIVECORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;RECLASSNET32;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -118,7 +119,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;NATIVECORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;RECLASSNET64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;NATIVECORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;RECLASSNET64;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -135,7 +137,8 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NATIVECORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;RECLASSNET32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NATIVECORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;RECLASSNET32;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -154,7 +157,8 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;NATIVECORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;RECLASSNET64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;NATIVECORE_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;RECLASSNET64;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

README.md

@@ -53,6 +53,7 @@ This is a port of ReClass to the .NET platform with lots of additional features.
 - [LoadBinary Plugin](https://github.com/ReClassNET/ReClass.NET-LoadBinaryPlugin)
 - [Handle Abuser Plugin](https://github.com/ReClassNET/ReClass.NET-HandleAbuser)
 - [Unreal Plugin](https://github.com/DrP3pp3r/ReClass.NET-UnrealPlugin) (by [DrP3pp3r](https://github.com/DrP3pp3r))
+- [DriverReader](https://github.com/niemand-sec/ReClass.NET-DriverReader) (by [Niemand](https://github.com/niemand-sec))
 
 To install a plugin just copy it in the "Plugins" folder.
 If you want to develop your own plugin just learn from the code of the [Sample Plugins](https://github.com/ReClassNET/ReClass.NET-SamplePlugin) and [Frostbite Plugin](https://github.com/ReClassNET/ReClass.NET-FrostbitePlugin) repositories. If you have developed a nice plugin, leave me a message and I will add it to the list above.
@@ -118,4 +119,4 @@ Settings
 - leveln
 - [buddyfavors](https://github.com/buddyfavors)
 - [DrP3pp3r](https://github.com/DrP3pp3r)
-- [ko1N](https://github.com/ko1N)
+- [ko1N](https://github.com/ko1N)

ReClass.NET/CodeGenerator/CSharpCodeGenerator.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
@@ -32,8 +32,12 @@ public class CSharpCodeGenerator : ICodeGenerator
 			[typeof(Utf16TextPtrNode)] = "IntPtr",
 			[typeof(Utf32TextPtrNode)] = "IntPtr",
 			[typeof(PointerNode)] = "IntPtr",
-			[typeof(VirtualMethodTableNode)] = "IntPtr"
-		};
+			[typeof(VirtualMethodTableNode)] = "IntPtr",
+
+			[typeof(Vector2Node)] = "Vector2",
+			[typeof(Vector3Node)] = "Vector3",
+			[typeof(Vector4Node)] = "Vector4"
+        };
 
 		public Language Language => Language.CSharp;
 
@@ -48,6 +52,9 @@ public string GenerateCode(IReadOnlyList<ClassNode> classes, IReadOnlyList<EnumD
 					iw.WriteLine("// Warning: The C# code generator doesn't support all node types!");
 					iw.WriteLine();
 					iw.WriteLine("using System.Runtime.InteropServices;");
+
+					iw.WriteLine("// optional namespace, only for vectors");
+					iw.WriteLine("using System.Numerics;");
 					iw.WriteLine();
 
 					using (var en = enums.GetEnumerator())
@@ -149,7 +156,7 @@ private static void WriteClass(IndentedTextWriter writer, ClassNode @class, ILog
 			Contract.Requires(logger != null);
 
 			writer.WriteLine("[StructLayout(LayoutKind.Explicit)]");
-			writer.Write("class ");
+			writer.Write("public struct ");
 			writer.Write(@class.Name);
 
 			if (!string.IsNullOrEmpty(@class.Comment))
@@ -170,16 +177,7 @@ private static void WriteClass(IndentedTextWriter writer, ClassNode @class, ILog
 				var type = GetTypeDefinition(node);
 				if (type != null)
 				{
-					writer.Write("[FieldOffset(");
-					writer.Write(node.Offset);
-					writer.WriteLine(")]");
-
-					writer.Write("public ");
-					writer.Write(type);
-					writer.Write(" ");
-					writer.Write(node.Name);
-					writer.Write("; //0x");
-					writer.Write($"{node.Offset:X04}");
+					writer.Write($"[FieldOffset(0x{node.Offset:X})] public readonly {type} {node.Name};");
 					if (!string.IsNullOrEmpty(node.Comment))
 					{
 						writer.Write(" ");