diff --git a/dependencies/vmprofiler b/dependencies/vmprofiler index 1fad857..e75104f 160000 --- a/dependencies/vmprofiler +++ b/dependencies/vmprofiler @@ -1 +1 @@ -Subproject commit 1fad85707785843ec96b7d052a601aad69b47213 +Subproject commit e75104fbb3b07540be51fcef169e9eaffd1cfee2 diff --git a/dependencies/xtils b/dependencies/xtils index 7c32517..fdcafdb 160000 --- a/dependencies/xtils +++ b/dependencies/xtils @@ -1 +1 @@ -Subproject commit 7c32517322c29a866cbb1e67fb9051efa2e05553 +Subproject commit fdcafdbbcb3f34c33b9cffb2be569b9aa5f42a57 diff --git a/src/main.cpp b/src/main.cpp index bc818df..9a0c86d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,32 +1,38 @@ +#define NOMINMAX #include #include #include #include +#include +#include #include #include #include #include -#include + +#define ABS_TO_IMG( addr, mod_base, img_base ) ( addr - mod_base ) + img_base 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" ); + parser.add_argument().names( { "--vmentry", "--entry" } ).description( "rva to push prior to a vm_entry" ); + parser.add_argument().name( "--showhandlers" ).description( "show all vm handlers..." ); + parser.add_argument().name( "--showhandler" ).description( "show a specific vm handler given its index..." ); + parser.add_argument().name( "--vmp2file" ).description( "path to .vmp2 file..." ); parser.add_argument() - .names( { "--bin", "--vmpbin" } ) - .description( "unpacked binary protected with VMProtect 2" ) - .required( true ); - + .name( "--showblockinstrs" ) + .description( "show the virtual instructions of a specific code block..." ); + parser.add_argument().name( "--showallblocks" ).description( "shows all information for all code blocks..." ); parser.add_argument() - .names( { "--vmentry", "--entry" } ) - .description( "rva to push prior to a vm_entry" ) - .required( true ); - - parser.add_argument().name( "--showhandlers" ).description( "show all vm handlers..." ); + .name( "--devirt" ) + .description( "lift to VTIL IR and apply optimizations, then display the output..." ); parser.enable_help(); auto err = parser.parse( argc, argv ); + const auto umtils = xtils::um_t::get_instance(); if ( err ) { @@ -40,128 +46,242 @@ int __cdecl main( int argc, const char *argv[] ) return 0; } - const auto module_base = reinterpret_cast< std::uintptr_t >( - LoadLibraryExA( parser.get< std::string >( "bin" ).c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES ) ); + if ( parser.exists( "bin" ) && parser.exists( "vmentry" ) ) + { + if ( !std::filesystem::exists( parser.get< std::string >( "bin" ) ) ) + { + std::printf( "> path to protected file is invalid... check your cli args...\n" ); + return -1; + } - const auto vm_entry_ptr = - module_base + std::strtoull( parser.get< std::string >( "vmentry" ).c_str(), nullptr, 16 ); + const auto module_base = reinterpret_cast< std::uintptr_t >( + LoadLibraryExA( parser.get< std::string >( "bin" ).c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES ) ); - const auto image_base = xtils::um_t::get_instance()->image_base( parser.get< std::string >( "bin" ).c_str() ); + const auto vm_entry_rva = std::strtoull( parser.get< std::string >( "vmentry" ).c_str(), nullptr, 16 ); + const auto image_base = umtils->image_base( parser.get< std::string >( "bin" ).c_str() ); + const auto image_size = NT_HEADER( module_base )->OptionalHeader.SizeOfImage; - zydis_routine_t vm_entry, calc_jmp; - std::printf( "> vm entry start = 0x%p\n", vm_entry_ptr ); + std::printf( "> module base = 0x%p, image base = 0x%p, image size = 0x%p\n", module_base, image_base, + image_size ); - if ( !vm::util::flatten( vm_entry, vm_entry_ptr ) ) - { - std::printf( "> failed to flatten vm entry...\n" ); - return -1; - } + vm::ctx_t vmctx( module_base, image_base, image_size, vm_entry_rva ); - 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 ); + if ( !vmctx.init() ) + { + std::printf( "[!] failed to init vm::ctx_t... make sure all cli arguments are correct!\n" ); + return -1; + } - if ( !vm::calc_jmp::get( vm_entry, calc_jmp ) ) - { - std::printf( "> failed to extract calc_jmp from vm_entry...\n" ); - return -1; - } + std::puts( "======================== [vm entry] ========================\n" ); + vm::util::print( vmctx.vm_entry ); + std::puts( "======================== [calc jmp] ========================\n" ); + vm::util::print( vmctx.calc_jmp ); + std::puts( "============================================================\n" ); + std::printf( "> vip advancement = %s\n\n", + vmctx.exec_type == vmp2::exec_type_t::forward ? "forward" : "backward" ); - vm::util::deobfuscate( calc_jmp ); - std::printf( "> calc_jmp extracted from vm_entry... calc_jmp:\n" ); - std::printf( "==================================================================================\n" ); - vm::util::print( calc_jmp ); - std::printf( "==================================================================================\n" ); + if ( parser.exists( "showhandlers" ) ) + { + for ( auto idx = 0u; idx < vmctx.vm_handlers.size(); ++idx ) + { + std::printf( "======================== [%s #%d] ========================\n", + vmctx.vm_handlers[ idx ].profile ? vmctx.vm_handlers[ idx ].profile->name : "UNK", idx ); - const auto vm_handler_table = vm::handler::table::get( vm_entry ); + vm::util::print( vmctx.vm_handlers[ idx ].instrs ); - if ( !vm_handler_table ) - { - std::printf( "> failed to locate vm handler table...\n" ); - return -1; - } + // if there is no imm then there are no transforms... + if ( !vmctx.vm_handlers[ idx ].imm_size ) + { + std::puts( "\n" ); + continue; + } - auto advancement = vm::calc_jmp::get_advancement( calc_jmp ); - if ( advancement.has_value() ) - std::printf( "> virtual instruction pointer advancement: %s\n", - advancement == vmp2::exec_type_t::forward ? "forward" : "backward" ); - else - std::printf( "> virtual instruction pointer advancement was unable to be parsed!\n" ); + std::puts( "======================== [transforms] ========================\n" ); + for ( auto &[ mnemonic, instr ] : vmctx.vm_handlers[ idx ].transforms ) + { + if ( instr.mnemonic == ZYDIS_MNEMONIC_INVALID ) + continue; - 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 ); + vm::util::print( instr ); + } + std::puts( "\n" ); + } + } + else if ( parser.exists( "showhandler" ) ) + { + const auto vm_handler_idx = std::strtoul( parser.get< std::string >( "showhandler" ).c_str(), nullptr, 10 ); - zydis_decoded_instr_t vm_handler_transform; - if ( !vm::handler::table::get_transform( vm_entry, &vm_handler_transform ) ) - { - std::printf( "[!] failed to locate vm handler table entry transformation...\n" ); - return -1; - } + if ( vm_handler_idx > 256 ) + { + std::printf( "> invalid vm handler index... too large...\n" ); + return -1; + } - std::printf( "> vm handler table entries decrypted with = " ); - vm::util::print( vm_handler_transform ); + std::printf( "======================== [%s #%d] ========================\n", + vmctx.vm_handlers[ vm_handler_idx ].profile ? vmctx.vm_handlers[ vm_handler_idx ].profile->name + : "UNK", + vm_handler_idx ); - 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 ); + vm::util::print( vmctx.vm_handlers[ vm_handler_idx ].instrs ); - 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( "[!] failed to get virtual instruction rva decrypt transformations...\n" ); - return -1; - } + // if there is no imm then there are no transforms... + if ( !vmctx.vm_handlers[ vm_handler_idx ].imm_size ) + { + std::puts( "\n" ); + return {}; + } - std::printf( "> virtual instruction rva decryption instructions:\n" ); - for ( auto &transform : vinstr_rva_decrypt_instrs ) - { - std::printf( "\t" ); - vm::util::print( transform ); + std::puts( "======================== [transforms] ========================\n" ); + for ( auto &[ mnemonic, instr ] : vmctx.vm_handlers[ vm_handler_idx ].transforms ) + { + if ( instr.mnemonic == ZYDIS_MNEMONIC_INVALID ) + continue; + + vm::util::print( instr ); + } + std::puts( "\n" ); + } } - std::printf( "> virtual instruction rva encryption instructions:\n" ); - if (!vm::transform::inverse_transforms(vinstr_rva_decrypt_instrs)) + + if ( !parser.exists( "vmp2file" ) ) + return {}; + + std::vector< std::uint8_t > vmp2file; + if ( !umtils->open_binary_file( parser.get< std::string >( "vmp2file" ), vmp2file ) ) { - std::printf( "> failed to inverse rva encryption instructions...\n" ); + std::printf( "[!] failed to open vmp2 file...\n" ); return -1; } - for ( auto &transform : vinstr_rva_decrypt_instrs ) + const auto file_header = reinterpret_cast< vmp2::v3::file_header * >( vmp2file.data() ); + + if ( file_header->version != vmp2::version_t::v3 ) { - std::printf( "\t" ); - vm::util::print( transform ); + std::printf( "[!] invalid vmp2 file version... this build uses v3...\n" ); + return -1; } - std::printf( "==================================================================================\n" ); - std::vector< vm::handler::handler_t > vm_handlers; - if ( !vm::handler::get_all( module_base, image_base, vm_entry, vm_handler_table, vm_handlers ) ) + auto first_block = reinterpret_cast< vmp2::v3::code_block_t * >( reinterpret_cast< std::uintptr_t >( file_header ) + + file_header->code_block_offset ); + + if ( parser.exists( "showallblocks" ) ) { - std::printf( "> failed to get all vm handler meta data...\n" ); - return -1; + for ( auto [ code_block, code_block_num ] = std::tuple{ first_block, 0u }; + code_block_num < file_header->code_block_count; + code_block = reinterpret_cast< vmp2::v3::code_block_t * >( + reinterpret_cast< std::uintptr_t >( code_block ) + code_block->next_block_offset ), + ++code_block_num ) + { + + std::printf( "[code block #%d] begin = 0x%p, virtual instruction count = %d\n", code_block_num, + ABS_TO_IMG( code_block->vip_begin, file_header->module_base, file_header->image_base ), + code_block->vinstr_count ); + + if ( code_block->jcc.has_jcc ) + std::printf( + "\tcode block branches to 0x%p and 0x%p\n", + ABS_TO_IMG( code_block->jcc.block_addr[ 0 ], file_header->module_base, file_header->image_base ), + ABS_TO_IMG( code_block->jcc.block_addr[ 1 ], file_header->module_base, file_header->image_base ) ); + } } - if ( parser.exists( "showhandlers" ) ) + if ( parser.exists( "devirt" ) ) { - for ( auto idx = 0u; idx < vm_handlers.size(); ++idx ) + vtil::basic_block *rtn = nullptr, *first = nullptr; + for ( auto [ code_block, code_block_num ] = std::tuple{ first_block, 0u }; + code_block_num < file_header->code_block_count; + code_block = reinterpret_cast< vmp2::v3::code_block_t * >( + reinterpret_cast< std::uintptr_t >( code_block ) + code_block->next_block_offset ), + ++code_block_num ) { - 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 ); + if ( !rtn ) + { + rtn = vtil::basic_block::begin( + ABS_TO_IMG( code_block->vip_begin, file_header->module_base, file_header->image_base ) ); + } + else + { + first = rtn; - std::printf( "================[vm handler instructions]==============\n" ); - vm::util::print( vm_handler.instrs ); + rtn = + rtn->fork( ABS_TO_IMG( code_block->vip_begin, file_header->module_base, file_header->image_base ) ); + } - if ( vm_handler.imm_size ) + for ( auto idx = 0u; idx < code_block->vinstr_count; ++idx ) { - std::printf( "=================[vm handler transforms]===============\n" ); - for ( const auto &[ transform_type, transform ] : vm_handler.transforms ) - vm::util::print( transform ); + auto vinstr = &code_block->vinstr[ idx ]; + if ( vinstr->mnemonic_t == vm::handler::INVALID ) + { + std::printf( "[WARNING] vm handler #%d is not implimented, the VTIL output may be incorrect!\n", + vinstr->opcode ); + rtn->nop(); + continue; + } + + const auto result = std::find_if( + vm::lifters::all.begin(), vm::lifters::all.end(), + [ & ]( vm::lifters::lifter_t *lifter ) -> bool { return lifter->first == vinstr->mnemonic_t; } ); + + if ( result == vm::lifters::all.end() ) + { + std::printf( + "[WARNING] vm handler #%d lifter is not implimented, the VTIL output may be incorrect!\n", + vinstr->opcode ); + + rtn->nop(); + continue; + } + + // lift the virtual instruction... + ( *result )->second( rtn, vinstr, code_block ); } + } - std::printf( "=======================================================\n\n" ); + vtil::optimizer::apply_all( first ); + vtil::debug::dump( first ); + return {}; + } + + if ( parser.exists( "showblockinstrs" ) ) + { + const auto block_img_addr = parser.get< std::string >( "showblockinstrs" ); + + for ( auto [ code_block, code_block_num ] = std::tuple{ first_block, 0u }; + code_block_num < file_header->code_block_count; + code_block = reinterpret_cast< vmp2::v3::code_block_t * >( + reinterpret_cast< std::uintptr_t >( code_block ) + code_block->next_block_offset ), + ++code_block_num ) + { + if ( ABS_TO_IMG( code_block->vip_begin, file_header->module_base, file_header->image_base ) == + std::strtoull( block_img_addr.c_str(), nullptr, 16 ) ) + { + std::printf( "[code block #%d] begin = 0x%p, virtual instruction count = %d\n", code_block_num, + ABS_TO_IMG( code_block->vip_begin, file_header->module_base, file_header->image_base ), + code_block->vinstr_count ); + + std::printf( "> -----------------------------------------------------------------------\n" ); + std::printf( "> opcode | virtual instructions | virtual instruction pointer\n" ); + std::printf( "> -----------------------------------------------------------------------\n" ); + for ( auto idx = 0u; idx < code_block->vinstr_count; ++idx ) + { + const auto vinstr = &code_block->vinstr[ idx ]; + const auto vm_profile = vm::handler::get_profile( vinstr->mnemonic_t ); + if ( vinstr->operand.has_imm ) + { + std::printf( + "> %-6x | %-15s %-15p | 0x%p\n", vinstr->opcode, vm_profile ? vm_profile->name : "UNK", + vinstr->operand.imm.u, + ABS_TO_IMG( vinstr->trace_data.vip, file_header->module_base, file_header->image_base ) ); + } + else + { + std::printf( + "> %-6x | %-32s | 0x%p\n", vinstr->opcode, vm_profile ? vm_profile->name : "UNK", + ABS_TO_IMG( vinstr->trace_data.vip, file_header->module_base, file_header->image_base ) ); + } + } + break; + } } } - std::printf( "> finished...\n" ); } \ No newline at end of file diff --git a/vmprofiler-cli.sln b/vmprofiler-cli.sln index 64cfa7b..72914c0 100644 --- a/vmprofiler-cli.sln +++ b/vmprofiler-cli.sln @@ -9,28 +9,118 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmprofiler-cli", "vmprofile EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmprofiler", "dependencies\vmprofiler\vmprofiler.vcxproj", "{D0B6092A-9944-4F24-9486-4B7DAE372619}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VTIL", "dependencies\vmprofiler\dependencies\vtil\VTIL\VTIL.vcxproj", "{8163E74C-DDE4-4507-BD3D-064CD95FF33B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VTIL-Architecture", "dependencies\vmprofiler\dependencies\vtil\VTIL-Architecture\VTIL-Architecture.vcxproj", "{A79E2869-7626-4801-B09D-5C12F5163BA3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VTIL-Common", "dependencies\vmprofiler\dependencies\vtil\VTIL-Common\VTIL-Common.vcxproj", "{EC6B8F7F-730C-4086-B143-4664CC16DF8F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VTIL-Compiler", "dependencies\vmprofiler\dependencies\vtil\VTIL-Compiler\VTIL-Compiler.vcxproj", "{F960486B-2DB4-44AF-91BB-0F19F228ABCF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VTIL-SymEx", "dependencies\vmprofiler\dependencies\vtil\VTIL-SymEx\VTIL-SymEx.vcxproj", "{FE3202CE-D05C-4E04-AE9B-D30305D8CE31}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{F34DD14D-D25C-488B-A89B-BBD0E5DBB4CF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VTIL", "VTIL", "{B5988828-3BE2-4AB4-B43B-AF061B2C1D17}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keystone", "dependencies\vmprofiler\dependencies\vtil\dependencies\keystone\msvc\llvm\keystone\keystone.vcxproj", "{E4754E3E-2503-307A-8076-8AC2AD8B75B2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone-static", "dependencies\vmprofiler\dependencies\vtil\dependencies\capstone\msvc\capstone-static.vcxproj", "{A0471FDD-F210-3D7E-B4EA-20543BC10911}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution DBG|x64 = DBG|x64 + DBG|x86 = DBG|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {88A23124-5640-35A0-B890-311D7A67A7D2}.DBG|x64.ActiveCfg = Debug MD|x64 {88A23124-5640-35A0-B890-311D7A67A7D2}.DBG|x64.Build.0 = Debug MD|x64 + {88A23124-5640-35A0-B890-311D7A67A7D2}.DBG|x86.ActiveCfg = Debug MD DLL|Win32 + {88A23124-5640-35A0-B890-311D7A67A7D2}.DBG|x86.Build.0 = Debug MD DLL|Win32 {88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x64.ActiveCfg = Release MT|x64 {88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x64.Build.0 = Release MT|x64 + {88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x86.ActiveCfg = Release MD DLL|Win32 + {88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x86.Build.0 = Release MD DLL|Win32 {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.DBG|x64.ActiveCfg = Release|x64 {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.DBG|x64.Build.0 = Release|x64 + {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.DBG|x86.ActiveCfg = Release|x64 + {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.DBG|x86.Build.0 = Release|x64 {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release|x64.ActiveCfg = Release|x64 {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release|x64.Build.0 = Release|x64 + {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release|x86.ActiveCfg = Release|x64 {D0B6092A-9944-4F24-9486-4B7DAE372619}.DBG|x64.ActiveCfg = DBG|x64 {D0B6092A-9944-4F24-9486-4B7DAE372619}.DBG|x64.Build.0 = DBG|x64 + {D0B6092A-9944-4F24-9486-4B7DAE372619}.DBG|x86.ActiveCfg = DBG|x64 {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x64.ActiveCfg = Release|x64 {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x64.Build.0 = Release|x64 + {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x86.ActiveCfg = Release|x64 + {8163E74C-DDE4-4507-BD3D-064CD95FF33B}.DBG|x64.ActiveCfg = Debug|x64 + {8163E74C-DDE4-4507-BD3D-064CD95FF33B}.DBG|x64.Build.0 = Debug|x64 + {8163E74C-DDE4-4507-BD3D-064CD95FF33B}.DBG|x86.ActiveCfg = Debug|x64 + {8163E74C-DDE4-4507-BD3D-064CD95FF33B}.DBG|x86.Build.0 = Debug|x64 + {8163E74C-DDE4-4507-BD3D-064CD95FF33B}.Release|x64.ActiveCfg = Release|x64 + {8163E74C-DDE4-4507-BD3D-064CD95FF33B}.Release|x64.Build.0 = Release|x64 + {8163E74C-DDE4-4507-BD3D-064CD95FF33B}.Release|x86.ActiveCfg = Release|x64 + {A79E2869-7626-4801-B09D-5C12F5163BA3}.DBG|x64.ActiveCfg = Debug|x64 + {A79E2869-7626-4801-B09D-5C12F5163BA3}.DBG|x64.Build.0 = Debug|x64 + {A79E2869-7626-4801-B09D-5C12F5163BA3}.DBG|x86.ActiveCfg = Debug|x64 + {A79E2869-7626-4801-B09D-5C12F5163BA3}.DBG|x86.Build.0 = Debug|x64 + {A79E2869-7626-4801-B09D-5C12F5163BA3}.Release|x64.ActiveCfg = Release|x64 + {A79E2869-7626-4801-B09D-5C12F5163BA3}.Release|x64.Build.0 = Release|x64 + {A79E2869-7626-4801-B09D-5C12F5163BA3}.Release|x86.ActiveCfg = Release|x64 + {EC6B8F7F-730C-4086-B143-4664CC16DF8F}.DBG|x64.ActiveCfg = Debug|x64 + {EC6B8F7F-730C-4086-B143-4664CC16DF8F}.DBG|x64.Build.0 = Debug|x64 + {EC6B8F7F-730C-4086-B143-4664CC16DF8F}.DBG|x86.ActiveCfg = Debug|x64 + {EC6B8F7F-730C-4086-B143-4664CC16DF8F}.DBG|x86.Build.0 = Debug|x64 + {EC6B8F7F-730C-4086-B143-4664CC16DF8F}.Release|x64.ActiveCfg = Release|x64 + {EC6B8F7F-730C-4086-B143-4664CC16DF8F}.Release|x64.Build.0 = Release|x64 + {EC6B8F7F-730C-4086-B143-4664CC16DF8F}.Release|x86.ActiveCfg = Release|x64 + {F960486B-2DB4-44AF-91BB-0F19F228ABCF}.DBG|x64.ActiveCfg = Debug|x64 + {F960486B-2DB4-44AF-91BB-0F19F228ABCF}.DBG|x64.Build.0 = Debug|x64 + {F960486B-2DB4-44AF-91BB-0F19F228ABCF}.DBG|x86.ActiveCfg = Debug|x64 + {F960486B-2DB4-44AF-91BB-0F19F228ABCF}.DBG|x86.Build.0 = Debug|x64 + {F960486B-2DB4-44AF-91BB-0F19F228ABCF}.Release|x64.ActiveCfg = Release|x64 + {F960486B-2DB4-44AF-91BB-0F19F228ABCF}.Release|x64.Build.0 = Release|x64 + {F960486B-2DB4-44AF-91BB-0F19F228ABCF}.Release|x86.ActiveCfg = Release|x64 + {FE3202CE-D05C-4E04-AE9B-D30305D8CE31}.DBG|x64.ActiveCfg = Debug|x64 + {FE3202CE-D05C-4E04-AE9B-D30305D8CE31}.DBG|x64.Build.0 = Debug|x64 + {FE3202CE-D05C-4E04-AE9B-D30305D8CE31}.DBG|x86.ActiveCfg = Debug|x64 + {FE3202CE-D05C-4E04-AE9B-D30305D8CE31}.DBG|x86.Build.0 = Debug|x64 + {FE3202CE-D05C-4E04-AE9B-D30305D8CE31}.Release|x64.ActiveCfg = Release|x64 + {FE3202CE-D05C-4E04-AE9B-D30305D8CE31}.Release|x64.Build.0 = Release|x64 + {FE3202CE-D05C-4E04-AE9B-D30305D8CE31}.Release|x86.ActiveCfg = Release|x64 + {E4754E3E-2503-307A-8076-8AC2AD8B75B2}.DBG|x64.ActiveCfg = Debug|x64 + {E4754E3E-2503-307A-8076-8AC2AD8B75B2}.DBG|x64.Build.0 = Debug|x64 + {E4754E3E-2503-307A-8076-8AC2AD8B75B2}.DBG|x86.ActiveCfg = RelWithDebInfo|x64 + {E4754E3E-2503-307A-8076-8AC2AD8B75B2}.DBG|x86.Build.0 = RelWithDebInfo|x64 + {E4754E3E-2503-307A-8076-8AC2AD8B75B2}.Release|x64.ActiveCfg = Release|x64 + {E4754E3E-2503-307A-8076-8AC2AD8B75B2}.Release|x64.Build.0 = Release|x64 + {E4754E3E-2503-307A-8076-8AC2AD8B75B2}.Release|x86.ActiveCfg = Release|x64 + {A0471FDD-F210-3D7E-B4EA-20543BC10911}.DBG|x64.ActiveCfg = Debug|x64 + {A0471FDD-F210-3D7E-B4EA-20543BC10911}.DBG|x64.Build.0 = Debug|x64 + {A0471FDD-F210-3D7E-B4EA-20543BC10911}.DBG|x86.ActiveCfg = RelWithDebInfo|x64 + {A0471FDD-F210-3D7E-B4EA-20543BC10911}.DBG|x86.Build.0 = RelWithDebInfo|x64 + {A0471FDD-F210-3D7E-B4EA-20543BC10911}.Release|x64.ActiveCfg = Release|x64 + {A0471FDD-F210-3D7E-B4EA-20543BC10911}.Release|x64.Build.0 = Release|x64 + {A0471FDD-F210-3D7E-B4EA-20543BC10911}.Release|x86.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {88A23124-5640-35A0-B890-311D7A67A7D2} = {F34DD14D-D25C-488B-A89B-BBD0E5DBB4CF} + {D0B6092A-9944-4F24-9486-4B7DAE372619} = {F34DD14D-D25C-488B-A89B-BBD0E5DBB4CF} + {8163E74C-DDE4-4507-BD3D-064CD95FF33B} = {B5988828-3BE2-4AB4-B43B-AF061B2C1D17} + {A79E2869-7626-4801-B09D-5C12F5163BA3} = {B5988828-3BE2-4AB4-B43B-AF061B2C1D17} + {EC6B8F7F-730C-4086-B143-4664CC16DF8F} = {B5988828-3BE2-4AB4-B43B-AF061B2C1D17} + {F960486B-2DB4-44AF-91BB-0F19F228ABCF} = {B5988828-3BE2-4AB4-B43B-AF061B2C1D17} + {FE3202CE-D05C-4E04-AE9B-D30305D8CE31} = {B5988828-3BE2-4AB4-B43B-AF061B2C1D17} + {B5988828-3BE2-4AB4-B43B-AF061B2C1D17} = {F34DD14D-D25C-488B-A89B-BBD0E5DBB4CF} + {E4754E3E-2503-307A-8076-8AC2AD8B75B2} = {F34DD14D-D25C-488B-A89B-BBD0E5DBB4CF} + {A0471FDD-F210-3D7E-B4EA-20543BC10911} = {F34DD14D-D25C-488B-A89B-BBD0E5DBB4CF} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B8861886-C9EA-4C44-878C-D7BC28AB3413} EndGlobalSection diff --git a/vmprofiler-cli.vcxproj b/vmprofiler-cli.vcxproj index a59b712..348fd74 100644 --- a/vmprofiler-cli.vcxproj +++ b/vmprofiler-cli.vcxproj @@ -33,7 +33,7 @@ false - $(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) + $(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\;$(ProjectDir)dependencies\vmprofiler\dependencies\vtil\VTIL\includes\;$(ProjectDir)dependencies\vmprofiler\dependencies\vtil\VTIL-Architecture\includes\;$(ProjectDir)dependencies\vmprofiler\dependencies\vtil\VTIL-Common\includes\;$(ProjectDir)dependencies\vmprofiler\dependencies\vtil\VTIL-Compiler\includes\;$(ProjectDir)dependencies\vmprofiler\dependencies\vtil\VTIL-SymEx\includes\;$(ProjectDir)dependencies\vmprofiler\dependencies\vtil\dependencies\capstone\include;$(ProjectDir)dependencies\vmprofiler\dependencies\vtil\dependencies\keystone\include;$(IncludePath) @@ -45,6 +45,7 @@ true stdcpplatest Disabled + MultiThreadedDLL Console @@ -52,9 +53,14 @@ true true $(ProjectDir)..\libs\*;%(AdditionalDependencies) + 4194304 + 4194304 + + {8163e74c-dde4-4507-bd3d-064cd95ff33b} + {88a23124-5640-35a0-b890-311d7a67a7d2} @@ -118,10 +124,15 @@ + + + + + - + diff --git a/vmprofiler-cli.vcxproj.filters b/vmprofiler-cli.vcxproj.filters index a7e7409..e69a945 100644 --- a/vmprofiler-cli.vcxproj.filters +++ b/vmprofiler-cli.vcxproj.filters @@ -27,6 +27,9 @@ {b21444ff-896e-4fad-931e-306b139b5b47} + + {c62d8614-612e-48d3-9fdc-873a0d338dfb} + @@ -172,23 +175,38 @@ Header Files\Zydis\Internal - + Header Files - + Header Files - - Header Files + + Header Files\vmprofiler - - Header Files + + Header Files\vmprofiler - - Header Files + + Header Files\vmprofiler - - Header Files + + Header Files\vmprofiler + + + Header Files\vmprofiler + + + Header Files\vmprofiler + + + Header Files\vmprofiler + + + Header Files\vmprofiler + + + Header Files\vmprofiler \ No newline at end of file