From 3032536163dc941cb016b4cbd6f6eecec87ad8ad Mon Sep 17 00:00:00 2001 From: _xeroxz Date: Sun, 6 Jun 2021 13:26:34 -0700 Subject: [PATCH] updated vmprofiler to newest, also moved vcxproj files out of src... --- dependencies/vmprofiler | 2 +- src/vmprofiler-cli.vcxproj | 130 ------------------- src/vmprofiler-cli.vcxproj.filters | 197 ----------------------------- vmprofiler-cli.sln | 89 ++----------- vmprofiler-cli.vcxproj | 129 +++++++++++++++++++ vmprofiler-cli.vcxproj.filters | 194 ++++++++++++++++++++++++++++ 6 files changed, 336 insertions(+), 405 deletions(-) delete mode 100644 src/vmprofiler-cli.vcxproj delete mode 100644 src/vmprofiler-cli.vcxproj.filters create mode 100644 vmprofiler-cli.vcxproj create mode 100644 vmprofiler-cli.vcxproj.filters diff --git a/dependencies/vmprofiler b/dependencies/vmprofiler index 5129d39..a419fa4 160000 --- a/dependencies/vmprofiler +++ b/dependencies/vmprofiler @@ -1 +1 @@ -Subproject commit 5129d39eb726e32a80417165ec37b597357664d4 +Subproject commit a419fa4633f98e2f819b1119dc0884154e207482 diff --git a/src/vmprofiler-cli.vcxproj b/src/vmprofiler-cli.vcxproj deleted file mode 100644 index 7a9e323..0000000 --- a/src/vmprofiler-cli.vcxproj +++ /dev/null @@ -1,130 +0,0 @@ - - - - - Release - x64 - - - - 16.0 - Win32Proj - {92e23fae-8aba-48e7-8771-9fd837ab8db7} - vmprofiler - 10.0 - vmprofiler-cli - - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - 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) - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ZYDIS_STATIC_DEFINE;%(PreprocessorDefinitions) - true - stdcpplatest - Disabled - - - Console - true - true - true - $(ProjectDir)..\libs\*;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {88a23124-5640-35a0-b890-311d7a67a7d2} - - - {d0b6092a-9944-4f24-9486-4b7dae372619} - - - - - - - - - \ No newline at end of file diff --git a/src/vmprofiler-cli.vcxproj.filters b/src/vmprofiler-cli.vcxproj.filters deleted file mode 100644 index a866b8a..0000000 --- a/src/vmprofiler-cli.vcxproj.filters +++ /dev/null @@ -1,197 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {faf4cf50-0bc3-4674-80ff-fec015d82127} - - - {ab5cf1fc-f056-4d4c-b00f-d111109aa610} - - - {9bd82e24-4e3f-4444-b5df-98d02537beea} - - - {a9886b41-1872-4765-ad66-e61c999d61fc} - - - {ef756627-8757-4365-9367-e9f880b6af45} - - - {b21444ff-896e-4fad-931e-306b139b5b47} - - - - - Source Files - - - - - Resource Files - - - - - Resource Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Zydis\Internal - - - Header Files\Zydis\Internal - - - Header Files\Zydis\Internal - - - Header Files\Zydis\Internal - - - Header Files\Zydis\Internal - - - Header Files\Zydis\Internal - - - Header Files\Zydis\Generated - - - Header Files\Zydis\Generated - - - Header Files\Zydis\Generated - - - Header Files\Zydis\Generated - - - Header Files\Zydis\Generated - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files\Zydis - - - Header Files - - - Header Files - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore - - - Header Files\Zycore\API - - - Header Files\Zycore\API - - - Header Files\Zycore\API - - - Header Files\Zycore\API - - - - - Resource Files - - - \ No newline at end of file diff --git a/vmprofiler-cli.sln b/vmprofiler-cli.sln index 5355017..64cfa7b 100644 --- a/vmprofiler-cli.sln +++ b/vmprofiler-cli.sln @@ -3,95 +3,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30907.101 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmprofiler-cli", "src\vmprofiler-cli.vcxproj", "{92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zydis", "dependencies\vmprofiler\dependencies\zydis\msvc\zydis\Zydis.vcxproj", "{88A23124-5640-35A0-B890-311D7A67A7D2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmprofiler", "dependencies\vmprofiler\src\vmprofiler.vcxproj", "{D0B6092A-9944-4F24-9486-4B7DAE372619}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmprofiler-cli", "vmprofiler-cli.vcxproj", "{92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zydis", "dependencies\vmprofiler\dependencies\zydis\msvc\zydis\Zydis.vcxproj", "{88A23124-5640-35A0-B890-311D7A67A7D2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmprofiler", "dependencies\vmprofiler\vmprofiler.vcxproj", "{D0B6092A-9944-4F24-9486-4B7DAE372619}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug Kernel|x64 = Debug Kernel|x64 - Debug MD DLL|x64 = Debug MD DLL|x64 - Debug MD|x64 = Debug MD|x64 - Debug MT DLL|x64 = Debug MT DLL|x64 - Debug MT|x64 = Debug MT|x64 - Release Kernel|x64 = Release Kernel|x64 - Release MD DLL|x64 = Release MD DLL|x64 - Release MD|x64 = Release MD|x64 - Release MT DLL|x64 = Release MT DLL|x64 - Release MT|x64 = Release MT|x64 + DBG|x64 = DBG|x64 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug Kernel|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug Kernel|x64.Build.0 = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug MD DLL|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug MD DLL|x64.Build.0 = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug MD|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug MD|x64.Build.0 = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug MT DLL|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug MT DLL|x64.Build.0 = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug MT|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Debug MT|x64.Build.0 = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release Kernel|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release Kernel|x64.Build.0 = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release MD DLL|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release MD DLL|x64.Build.0 = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release MD|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release MD|x64.Build.0 = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release MT DLL|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release MT DLL|x64.Build.0 = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release MT|x64.ActiveCfg = Release|x64 - {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release MT|x64.Build.0 = Release|x64 + {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}.Release|x64.ActiveCfg = Release MT|x64 + {88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x64.Build.0 = Release MT|x64 + {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}.Release|x64.ActiveCfg = Release|x64 {92E23FAE-8ABA-48E7-8771-9FD837AB8DB7}.Release|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug Kernel|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD DLL|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MD|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT DLL|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Debug MT|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release Kernel|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD DLL|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MD|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT DLL|x64.Build.0 = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x64.ActiveCfg = Release|x64 - {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release MT|x64.Build.0 = 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}.Release|x64.ActiveCfg = Release|x64 {D0B6092A-9944-4F24-9486-4B7DAE372619}.Release|x64.Build.0 = Release|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug Kernel|x64.ActiveCfg = Debug Kernel|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug Kernel|x64.Build.0 = Debug Kernel|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug Kernel|x64.Deploy.0 = Debug Kernel|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug MD DLL|x64.ActiveCfg = Debug MD DLL|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug MD DLL|x64.Build.0 = Debug MD DLL|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug MD|x64.ActiveCfg = Debug MD|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug MD|x64.Build.0 = Debug MD|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug MT DLL|x64.ActiveCfg = Debug MT DLL|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug MT DLL|x64.Build.0 = Debug MT DLL|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug MT|x64.ActiveCfg = Debug MT|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Debug MT|x64.Build.0 = Debug MT|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release Kernel|x64.ActiveCfg = Release Kernel|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release Kernel|x64.Build.0 = Release Kernel|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release Kernel|x64.Deploy.0 = Release Kernel|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release MD DLL|x64.ActiveCfg = Release MD DLL|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release MD DLL|x64.Build.0 = Release MD DLL|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release MD|x64.ActiveCfg = Release MD|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release MD|x64.Build.0 = Release MD|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release MT DLL|x64.ActiveCfg = Release MT DLL|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release MT DLL|x64.Build.0 = Release MT DLL|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release MT|x64.ActiveCfg = Release MT|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release MT|x64.Build.0 = Release MT|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x64.ActiveCfg = Release MT|x64 - {88A23124-5640-35A0-B890-311D7A67A7D2}.Release|x64.Build.0 = Release MT|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vmprofiler-cli.vcxproj b/vmprofiler-cli.vcxproj new file mode 100644 index 0000000..a59b712 --- /dev/null +++ b/vmprofiler-cli.vcxproj @@ -0,0 +1,129 @@ + + + + + Release + x64 + + + + 16.0 + Win32Proj + {92e23fae-8aba-48e7-8771-9fd837ab8db7} + vmprofiler + 10.0 + vmprofiler-cli + + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + 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) + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ZYDIS_STATIC_DEFINE;%(PreprocessorDefinitions) + true + stdcpplatest + Disabled + + + Console + true + true + true + $(ProjectDir)..\libs\*;%(AdditionalDependencies) + + + + + {88a23124-5640-35a0-b890-311d7a67a7d2} + + + {d0b6092a-9944-4f24-9486-4b7dae372619} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vmprofiler-cli.vcxproj.filters b/vmprofiler-cli.vcxproj.filters new file mode 100644 index 0000000..a7e7409 --- /dev/null +++ b/vmprofiler-cli.vcxproj.filters @@ -0,0 +1,194 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {faf4cf50-0bc3-4674-80ff-fec015d82127} + + + {ab5cf1fc-f056-4d4c-b00f-d111109aa610} + + + {9bd82e24-4e3f-4444-b5df-98d02537beea} + + + {a9886b41-1872-4765-ad66-e61c999d61fc} + + + {ef756627-8757-4365-9367-e9f880b6af45} + + + {b21444ff-896e-4fad-931e-306b139b5b47} + + + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + + + Source Files + + + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore + + + Header Files\Zycore\API + + + Header Files\Zycore\API + + + Header Files\Zycore\API + + + Header Files\Zycore\API + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis + + + Header Files\Zydis\Generated + + + Header Files\Zydis\Generated + + + Header Files\Zydis\Generated + + + Header Files\Zydis\Generated + + + Header Files\Zydis\Generated + + + Header Files\Zydis\Internal + + + Header Files\Zydis\Internal + + + Header Files\Zydis\Internal + + + Header Files\Zydis\Internal + + + Header Files\Zydis\Internal + + + Header Files\Zydis\Internal + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file