Merge branch 'dev' into 'master'

Dev

See merge request vmp2/vmprofiler-cli!1

.clang-format

@@ -0,0 +1,18 @@
+---
+BasedOnStyle: Microsoft
+AlignAfterOpenBracket: Align
+AllowAllArgumentsOnNextLine: 'true'
+AllowAllParametersOfDeclarationOnNextLine: 'true'
+AllowShortIfStatementsOnASingleLine: Never
+BreakBeforeBraces: Allman
+IndentWidth: '4'
+Language: Cpp
+NamespaceIndentation: All
+SpacesInAngles: 'true'
+SpacesInCStyleCastParentheses: 'true'
+SpacesInContainerLiterals: 'true'
+SpacesInParentheses: 'true'
+SpacesInSquareBrackets: 'true'
+UseTab: Never
+
+...

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "dependencies/cli-parser"]
 	path = dependencies/cli-parser
 	url = https://githacks.org/_xeroxz/cli-parser.git
+[submodule "dependencies/xtils"]
+	path = dependencies/xtils
+	url = https://githacks.org/_xeroxz/xtils.git

dependencies/vmprofiler

@@ -1 +1 @@
-Subproject commit 05ba2cc84ba94e1d526168ad686fc2e167ad2eab
+Subproject commit 4832530dfb2ef7522ed960d3393d44906c42eb74

dependencies/xtils

@@ -0,0 +1 @@
+Subproject commit 7c32517322c29a866cbb1e67fb9051efa2e05553

src/main.cpp

@@ -1,150 +1,136 @@
-#include <iostream>
 #include <Windows.h>
-#include <fstream>
 #include <filesystem>
-#include <vmp2.hpp>
-#include <vmctx.h>
-#include <vm.h>
+#include <fstream>
+#include <iostream>
+
 #include <cli-parser.hpp>
+#include <vmp2.hpp>
+#include <vmprofiler.hpp>
+#include <xtils.hpp>
+#include <ZydisExportConfig.h>
 
-int __cdecl main(int argc, const char* argv[])
+int __cdecl main( int argc, const char *argv[] )
 {
-	argparse::argument_parser_t parser(
-		"vmprofiler-cli", "virtual instruction pseudo code generator");
-
-	parser.add_argument()
-		.names({ "--bin", "--vmpbin" })
-		.description("unpacked binary protected with VMProtect 2")
-		.required(true);
+    argparse::argument_parser_t parser( "vmprofiler-cli", "virtual instruction pseudo code generator" );
 
     parser.add_argument()
-		.names({ "--vmentry", "--entry" })
-		.description("rva to push prior to a vm_entry")
-		.required(true);
+        .names( { "--bin", "--vmpbin" } )
+        .description( "unpacked binary protected with VMProtect 2" )
+        .required( true );
 
     parser.add_argument()
-		.names({ "--imagebase", "--base" })
-		.description("image base from OptionalHeader::ImageBase")
-		.required(true);
+        .names( { "--vmentry", "--entry" } )
+        .description( "rva to push prior to a vm_entry" )
+        .required( true );
 
-	parser.add_argument()
-		.names({ "--vmtrace", "--trace" })
-		.description("a vmp2 file generated by a vmtracer");
+    parser.add_argument().name( "--showhandlers" ).description( "show all vm handlers..." );
 
     parser.enable_help();
-	auto err = parser.parse(argc, argv);
+    auto err = parser.parse( argc, argv );
 
-	if (err)
+    if ( err )
     {
         std::cout << err << std::endl;
         return -1;
     }
 
-	if (parser.exists("help"))
+    if ( parser.exists( "help" ) )
     {
         parser.print_help();
         return 0;
     }
 
-	const auto module_base = 
-		reinterpret_cast<std::uintptr_t>(
-			LoadLibraryExA(parser.get<std::string>("bin").c_str(),
-				NULL, DONT_RESOLVE_DLL_REFERENCES));
+    const auto module_base = reinterpret_cast< std::uintptr_t >(
+        LoadLibraryExA( parser.get< std::string >( "bin" ).c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES ) );
 
     const auto vm_entry_ptr =
-		module_base + std::strtoull(
-			parser.get<std::string>("vmentry").c_str(), nullptr, 16);
+        module_base + std::strtoull( parser.get< std::string >( "vmentry" ).c_str(), nullptr, 16 );
 
-	const auto image_base = std::strtoull(
-		parser.get<std::string>("imagebase").c_str(), nullptr, 16);
+    const auto image_base = xtils::um_t::get_instance()->image_base( parser.get< std::string >( "bin" ).c_str() );
 
     zydis_routine_t vm_entry;
-	std::printf("> vm entry start = 0x%p\n", vm_entry_ptr);
+    std::printf( "> vm entry start = 0x%p\n", vm_entry_ptr );
 
-	if (!vm::util::flatten(vm_entry, vm_entry_ptr))
+    if ( !vm::util::flatten( vm_entry, vm_entry_ptr ) )
     {
-		std::printf("> failed to flatten vm entry...\n");
+        std::printf( "> failed to flatten vm entry...\n" );
         return -1;
     }
 
-	vm::util::deobfuscate(vm_entry);
-	std::printf("> flattened vm entry...\n");
-	std::printf("> deobfuscated vm entry...\n");
-	vm::util::print(vm_entry);
+    vm::util::deobfuscate( vm_entry );
+    std::printf( "> flattened vm entry...\n" );
+    std::printf( "> deobfuscated vm entry...\n" );
+    std::printf( "==================================================================================\n" );
+    vm::util::print( vm_entry );
 
-	const auto vm_handler_table = vm::handler::table::get(vm_entry);
+    const auto vm_handler_table = vm::handler::table::get( vm_entry );
 
-	if (!vm_handler_table)
+    if ( !vm_handler_table )
     {
-		std::printf("> failed to locate vm handler table...\n");
+        std::printf( "> failed to locate vm handler table...\n" );
         return -1;
     }
 
-	std::printf("> located vm handler table... at = 0x%p, rva = 0x%p\n", vm_handler_table,
-		(reinterpret_cast<std::uintptr_t>(vm_handler_table) - module_base) + image_base);
+    std::printf( "==================================================================================\n" );
+    std::printf( "> located vm handler table... at = 0x%p, rva = 0x%p\n", vm_handler_table,
+                 ( reinterpret_cast< std::uintptr_t >( vm_handler_table ) - module_base ) + image_base );
 
-	std::vector<vm::handler_t> vm_handlers;
-	if (!vm::handler::get_all(module_base, image_base, vm_entry, vm_handler_table, vm_handlers))
+    zydis_decoded_instr_t vm_handler_transform;
+    if ( !vm::handler::table::get_transform( vm_entry, &vm_handler_transform ) )
     {
-		std::printf("> failed to get all vm handler meta data...\n");
+        std::printf( "[!] failed to locate vm handler table entry transformation...\n" );
         return -1;
     }
 
-	for (auto idx = 0u; idx < vm_handlers.size(); ++idx)
-	{
-		auto vm_handler = vm_handlers[idx];
-		std::printf("==========[vm handler %s, idx = %d, imm size = %d]========\n", 
-			vm_handler.profile ? vm_handler.profile->name : "UNKNOWN", idx,
-			vm_handler.imm_size);
+    std::printf( "> vm handler table entries decrypted with = " );
+    vm::util::print( vm_handler_transform );
 
-		std::printf("================[vm handler instructions]==============\n");
-		vm::util::print(vm_handler.instrs);
+    vm_handler_transform.mnemonic = vm::transform::inverse[ vm_handler_transform.mnemonic ];
+    std::printf( "> vm handler table entries encrypted with = " );
+    vm::util::print( vm_handler_transform );
 
-		if (vm_handler.imm_size)
+    std::printf( "==================================================================================\n" );
+    std::vector< zydis_decoded_instr_t > vinstr_rva_decrypt_instrs;
+    if ( !vm::instrs::get_rva_decrypt( vm_entry, vinstr_rva_decrypt_instrs ) )
     {
-			std::printf("=================[vm handler transforms]===============\n");
-			for (const auto& [transform_type, transform] : vm_handler.transforms)
-				vm::util::print(transform);
+        std::printf( "[!] failed to get virtual instruction rva decrypt transformations...\n" );
+        return -1;
     }
 
-		std::printf("=======================================================\n\n");
+    std::printf( "> virtual instruction rva decryption instructions:\n" );
+    for ( auto &transform : vinstr_rva_decrypt_instrs )
+    {
+        std::printf( "\t" );
+        vm::util::print( transform );
     }
 
-	if (parser.exists("vmtrace"))
+    std::vector< vm::handler::handler_t > vm_handlers;
+    if ( !vm::handler::get_all( module_base, image_base, vm_entry, vm_handler_table, vm_handlers ) )
     {
-		std::ifstream vmp2_file(
-			parser.get<std::string>("vmtrace").c_str(), std::ios::binary);
-
-		const auto file_size =
-			std::filesystem::file_size(
-				parser.get<std::string>("vmtrace").c_str());
-
-		const auto file_header =
-			reinterpret_cast<vmp2::file_header*>(malloc(file_size));
-
-		vmp2_file.read((char*)file_header, file_size);
-
-		const auto entry_list =
-			reinterpret_cast<vmp2::entry_t*>(
-				reinterpret_cast<std::uintptr_t>(
-					file_header) + file_header->entry_offset);
+        std::printf( "> failed to get all vm handler meta data...\n" );
+        return -1;
+    }
 
-		std::printf("> module base = 0x%p\n", file_header->module_base);
-		std::getchar();
+    if ( parser.exists( "showhandlers" ) )
+    {
+        for ( auto idx = 0u; idx < vm_handlers.size(); ++idx )
+        {
+            auto vm_handler = vm_handlers[ idx ];
+            std::printf( "==========[vm handler %s, idx = %d, imm size = %d]========\n",
+                         vm_handler.profile ? vm_handler.profile->name : "UNKNOWN", idx, vm_handler.imm_size );
 
-		vm::vmctx_t vmctx(
-			file_header,
-			entry_list,
-			vm_handlers,
-			module_base,
-			image_base
-		);
+            std::printf( "================[vm handler instructions]==============\n" );
+            vm::util::print( vm_handler.instrs );
 
-		for (auto [virt_instr, log_entry] = vmctx.step(); log_entry && !virt_instr.empty();
-			std::tie(virt_instr, log_entry) = vmctx.step())
-				std::printf("> %s\n", virt_instr.c_str());
+            if ( vm_handler.imm_size )
+            {
+                std::printf( "=================[vm handler transforms]===============\n" );
+                for ( const auto &[ transform_type, transform ] : vm_handler.transforms )
+                    vm::util::print( transform );
             }
 
-	std::printf("> finished...\n");
-	std::getchar();
+            std::printf( "=======================================================\n\n" );
+        }
+    }
+    std::printf( "> finished...\n" );
 }

src/vmprofiler-cli.vcxproj

@@ -33,7 +33,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\dependencies\vmprofiler\include\;$(ProjectDir)..\dependencies\vmprofiler\dependencies\zydis\include;$(ProjectDir)..\dependencies\vmprofiler\dependencies\zydis\msvc;$(ProjectDir)..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include;$(ProjectDir)..\dependencies\cli-parser\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)..\dependencies\vmprofiler\include\;$(ProjectDir)..\dependencies\vmprofiler\dependencies\zydis\include;$(ProjectDir)..\dependencies\vmprofiler\dependencies\zydis\msvc;$(ProjectDir)..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include;$(ProjectDir)..\dependencies\cli-parser\;$(ProjectDir)..\dependencies\xtils\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -41,7 +41,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ZYDIS_STATIC_DEFINE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <Optimization>Disabled</Optimization>
@@ -64,56 +64,54 @@
     <ResourceCompile Include="icon.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Allocator.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\API\Memory.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\API\Synchronization.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\API\Terminal.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\API\Thread.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\ArgParse.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Bitset.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Comparison.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Defines.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Format.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\LibC.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\List.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Object.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Status.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\String.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Types.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Vector.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Zycore.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Decoder.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\DecoderTypes.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Formatter.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\FormatterBuffer.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumInstructionCategory.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumISAExt.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumISASet.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumMnemonic.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumRegister.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\DecoderData.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\FormatterATT.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\FormatterBase.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\FormatterIntel.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\SharedData.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\String.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\MetaInfo.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Mnemonic.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Register.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\SharedTypes.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\ShortString.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Status.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Utils.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Zydis.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\msvc\ZycoreExportConfig.h" />
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\msvc\ZydisExportConfig.h" />
     <ClInclude Include="..\dependencies\vmprofiler\include\transform.hpp" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\vm.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\vmctx.h" />
     <ClInclude Include="..\dependencies\vmprofiler\include\vmp2.hpp" />
     <ClInclude Include="..\dependencies\vmprofiler\include\vmprofiler.hpp" />
     <ClInclude Include="..\dependencies\vmprofiler\include\vmutils.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\ZycoreExportConfig.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Allocator.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Memory.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Process.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Synchronization.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Terminal.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Thread.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\ArgParse.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Bitset.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Comparison.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Defines.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Format.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\LibC.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\List.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Object.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Status.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\String.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Types.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Vector.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Zycore.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\ZydisExportConfig.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Decoder.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\DecoderTypes.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Formatter.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\FormatterBuffer.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumInstructionCategory.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumISAExt.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumISASet.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumMnemonic.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumRegister.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\DecoderData.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\FormatterATT.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\FormatterBase.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\FormatterIntel.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\SharedData.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\String.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\MetaInfo.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Mnemonic.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Register.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\SharedTypes.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\ShortString.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Status.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Utils.h" />
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Zydis.h" />
+    <ClInclude Include="..\dependencies\xtils\xtils.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\dependencies\vmprofiler\dependencies\zydis\msvc\zydis\Zydis.vcxproj">
@@ -123,6 +121,9 @@
       <Project>{d0b6092a-9944-4f24-9486-4b7dae372619}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\.clang-format" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

src/vmprofiler-cli.vcxproj.filters

@@ -13,19 +13,19 @@
       <UniqueIdentifier>{faf4cf50-0bc3-4674-80ff-fec015d82127}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files\Zydis">
-      <UniqueIdentifier>{4e807ab2-7dfc-48a3-a092-039f09dd57f4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Zydis\Generated">
-      <UniqueIdentifier>{a10f8ff1-7349-4a48-9061-facf5a836ee4}</UniqueIdentifier>
+      <UniqueIdentifier>{ab5cf1fc-f056-4d4c-b00f-d111109aa610}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files\Zydis\Internal">
-      <UniqueIdentifier>{82afe7a2-4ff1-4e12-806d-297e714bad9c}</UniqueIdentifier>
+      <UniqueIdentifier>{9bd82e24-4e3f-4444-b5df-98d02537beea}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Zydis\Generated">
+      <UniqueIdentifier>{a9886b41-1872-4765-ad66-e61c999d61fc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files\Zycore">
-      <UniqueIdentifier>{a8d11bd2-d945-406f-aeb4-c28feb79a31d}</UniqueIdentifier>
+      <UniqueIdentifier>{ef756627-8757-4365-9367-e9f880b6af45}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files\Zycore\API">
-      <UniqueIdentifier>{94c3a376-8f65-450f-9b11-740f95bef4d6}</UniqueIdentifier>
+      <UniqueIdentifier>{b21444ff-896e-4fad-931e-306b139b5b47}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -44,155 +44,154 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Allocator.h">
-      <Filter>Header Files\Zycore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\ArgParse.h">
-      <Filter>Header Files\Zycore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Bitset.h">
-      <Filter>Header Files\Zycore</Filter>
-    </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Comparison.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\include\transform.hpp">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Defines.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\include\vmp2.hpp">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Format.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\include\vmprofiler.hpp">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\LibC.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\include\vmutils.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\List.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\xtils\xtils.hpp">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Object.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\DecoderData.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Status.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\FormatterATT.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\String.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\FormatterBase.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Types.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\FormatterIntel.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Vector.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\SharedData.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\Zycore.h">
-      <Filter>Header Files\Zycore</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Internal\String.h">
+      <Filter>Header Files\Zydis\Internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Memory.h">
-      <Filter>Header Files\Zycore\API</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumInstructionCategory.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Process.h">
-      <Filter>Header Files\Zycore\API</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumISAExt.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Synchronization.h">
-      <Filter>Header Files\Zycore\API</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumISASet.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Terminal.h">
-      <Filter>Header Files\Zycore\API</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumMnemonic.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zycore\API\Thread.h">
-      <Filter>Header Files\Zycore\API</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Generated\EnumRegister.h">
+      <Filter>Header Files\Zydis\Generated</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Decoder.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Decoder.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\DecoderTypes.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\DecoderTypes.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Formatter.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Formatter.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\FormatterBuffer.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\FormatterBuffer.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\MetaInfo.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\MetaInfo.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Mnemonic.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Mnemonic.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Register.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Register.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\SharedTypes.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\SharedTypes.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\ShortString.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\ShortString.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Status.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Status.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Utils.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Utils.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Zydis.h">
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\include\Zydis\Zydis.h">
       <Filter>Header Files\Zydis</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumInstructionCategory.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\msvc\ZycoreExportConfig.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumISAExt.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\msvc\ZydisExportConfig.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumISASet.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Allocator.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumMnemonic.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\ArgParse.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Generated\EnumRegister.h">
-      <Filter>Header Files\Zydis\Generated</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Bitset.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\DecoderData.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Comparison.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\FormatterATT.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Defines.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\FormatterBase.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Format.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\FormatterIntel.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\LibC.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\SharedData.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\List.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\Zydis\Internal\String.h">
-      <Filter>Header Files\Zydis\Internal</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Object.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\transform.hpp">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Status.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\vm.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\String.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\vmctx.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Types.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\vmp2.hpp">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Vector.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\vmprofiler.hpp">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\Zycore.h">
+      <Filter>Header Files\Zycore</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\vmutils.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\API\Memory.h">
+      <Filter>Header Files\Zycore\API</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\ZycoreExportConfig.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\API\Synchronization.h">
+      <Filter>Header Files\Zycore\API</Filter>
     </ClInclude>
-    <ClInclude Include="..\dependencies\vmprofiler\include\ZydisExportConfig.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\API\Terminal.h">
+      <Filter>Header Files\Zycore\API</Filter>
     </ClInclude>
+    <ClInclude Include="..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include\Zycore\API\Thread.h">
+      <Filter>Header Files\Zycore\API</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\.clang-format">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
 </Project>