diff --git a/course/WinDriver/tools/tools-MFC/tools-MFC.vcxproj b/course/WinDriver/tools/tools-MFC/tools-MFC.vcxproj index 63b1883acfb798e45b742bfcabc92e97d4ae40bc..26576cbc34fd0a905c3d1b29347adb6ad877ec61 100644 --- a/course/WinDriver/tools/tools-MFC/tools-MFC.vcxproj +++ b/course/WinDriver/tools/tools-MFC/tools-MFC.vcxproj @@ -1,220 +1,220 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {9619B046-5A11-47B5-9C2F-9437D6191CB9} - MFCProj - toolsMFC - 10.0.17763.0 - - - - Application - true - v141_xp - Unicode - Dynamic - - - Application - false - v141 - true - Unicode - Static - - - Application - true - v141 - Unicode - Dynamic - - - Application - false - v141 - true - Unicode - Dynamic - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Use - Level3 - Disabled - true - WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) - /I"../../../../third/Blackbone/src" %(AdditionalOptions) - stdcpplatest - - - Windows - - - false - true - _DEBUG;%(PreprocessorDefinitions) - - - 0x0804 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - Disabled - true - _WINDOWS;_DEBUG;%(PreprocessorDefinitions) - /I"../../../../third/Blackbone/src" %(AdditionalOptions) - - - Windows - - - false - true - _DEBUG;%(PreprocessorDefinitions) - - - 0x0804 - _DEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - MaxSpeed - true - true - true - WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) - /I"../../../../third/Blackbone/src" %(AdditionalOptions) - stdcpplatest - MultiThreaded - - - Windows - true - true - - - false - true - NDEBUG;%(PreprocessorDefinitions) - - - 0x0804 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - Use - Level3 - MaxSpeed - true - true - true - _WINDOWS;NDEBUG;%(PreprocessorDefinitions) - - - Windows - true - true - - - false - true - NDEBUG;%(PreprocessorDefinitions) - - - 0x0804 - NDEBUG;%(PreprocessorDefinitions) - $(IntDir);%(AdditionalIncludeDirectories) - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {9619B046-5A11-47B5-9C2F-9437D6191CB9} + MFCProj + toolsMFC + 10.0.17763.0 + + + + Application + true + v142 + Unicode + Dynamic + + + Application + false + v141 + true + Unicode + Static + + + Application + true + v141 + Unicode + Dynamic + + + Application + false + v141 + true + Unicode + Dynamic + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + true + WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) + /I"../../../../third/Blackbone/src" %(AdditionalOptions) + stdcpp17 + + + Windows + + + false + true + _DEBUG;%(PreprocessorDefinitions) + + + 0x0804 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + Disabled + true + _WINDOWS;_DEBUG;%(PreprocessorDefinitions) + /I"../../../../third/Blackbone/src" %(AdditionalOptions) + + + Windows + + + false + true + _DEBUG;%(PreprocessorDefinitions) + + + 0x0804 + _DEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + MaxSpeed + true + true + true + WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) + /I"../../../../third/Blackbone/src" %(AdditionalOptions) + stdcpplatest + MultiThreaded + + + Windows + true + true + + + false + true + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + Use + Level3 + MaxSpeed + true + true + true + _WINDOWS;NDEBUG;%(PreprocessorDefinitions) + + + Windows + true + true + + + false + true + NDEBUG;%(PreprocessorDefinitions) + + + 0x0804 + NDEBUG;%(PreprocessorDefinitions) + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/course/WinDriver/tools/tools-MFC/tools-MFCDlg.cpp b/course/WinDriver/tools/tools-MFC/tools-MFCDlg.cpp index b3b2376650cd8f55093d6d9619683953470c4bcb..1e380bbdad5e66687bbba056e1d50f30b90f6940 100644 --- a/course/WinDriver/tools/tools-MFC/tools-MFCDlg.cpp +++ b/course/WinDriver/tools/tools-MFC/tools-MFCDlg.cpp @@ -27,9 +27,9 @@ // /I"../../../../third/Blackbone/src" #ifdef _DEBUG -#pragma comment(lib, "../../../../third/Blackbone/build/Win32/Debug(XP)/BlackBone.lib") +#pragma comment(lib, "../../../../third/Blackbone/build/Win32/Debug/BlackBone.lib") #else -#pragma comment(lib, "../../../../third/Blackbone/build/Win32/Release(XP)/BlackBone.lib") +#pragma comment(lib, "../../../../third/Blackbone/build/Win32/Release/BlackBone.lib") #endif ////////////////////////////////////////////////////////////////////////// diff --git a/course/WinDriver/tools/tools/tools.vcxproj b/course/WinDriver/tools/tools/tools.vcxproj index f7e51eda1f032e703f8fdfdd959eff7174167ec4..3d6b0da13d05a8d5b19a4321c1fdbb50db62a414 100644 --- a/course/WinDriver/tools/tools/tools.vcxproj +++ b/course/WinDriver/tools/tools/tools.vcxproj @@ -1,170 +1,170 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {C91E38C9-5F8D-40DB-82BD-BF55DCD695C6} - Win32Proj - tools - 10.0.17763.0 - - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - DynamicLibrary - true - v141 - Unicode - - - DynamicLibrary - false - v141 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - Use - Level3 - Disabled - true - WIN32;_DEBUG;TOOLS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - /I"../../../../third/Blackbone/src" %(AdditionalOptions) - - - Windows - true - - - - - Use - Level3 - Disabled - true - _DEBUG;TOOLS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - - - Windows - true - - - - - Use - Level3 - MaxSpeed - true - true - true - WIN32;NDEBUG;TOOLS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - /I"../../../../third/Blackbone/src" %(AdditionalOptions) - stdcpplatest - MultiThreaded - - - Windows - true - true - true - - - - - Use - Level3 - MaxSpeed - true - true - true - NDEBUG;TOOLS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - - - - - - - - - - Create - Create - Create - Create - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {C91E38C9-5F8D-40DB-82BD-BF55DCD695C6} + Win32Proj + tools + 10.0.17763.0 + + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + true + WIN32;_DEBUG;TOOLS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + /I"../../../../third/Blackbone/src" %(AdditionalOptions) + + + Windows + true + + + + + Use + Level3 + Disabled + true + _DEBUG;TOOLS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;TOOLS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + /I"../../../../third/Blackbone/src" %(AdditionalOptions) + stdcpplatest + MultiThreaded + + + Windows + true + true + true + + + + + Use + Level3 + MaxSpeed + true + true + true + NDEBUG;TOOLS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.dll b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.dll new file mode 100644 index 0000000000000000000000000000000000000000..0a295d97f4e63191ff922c8bc81f7f18f43452bf Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.dll differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.exp b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.exp new file mode 100644 index 0000000000000000000000000000000000000000..5551b357f08b08319433306b3bbcc2059b0947cf Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.exp differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.lib b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.lib new file mode 100644 index 0000000000000000000000000000000000000000..41e873213228ddac3450b85de639539c962b8399 Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.lib differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.dll b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.dll new file mode 100644 index 0000000000000000000000000000000000000000..76a1c733d8e24c173a0fed08c2bf01afe740e38c Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.dll differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.exp b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.exp new file mode 100644 index 0000000000000000000000000000000000000000..40f652ed9a39a9d3033c8c715db9c494c3c2a806 Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.exp differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.lib b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.lib new file mode 100644 index 0000000000000000000000000000000000000000..75c223b5a9481b1bb93e8ab925fefd5ad8494dea Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.lib differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngine.lib b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngine.lib new file mode 100644 index 0000000000000000000000000000000000000000..1e22f481ac49ed0117ec88279f8d1eb6d861533b Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngine.lib differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngineCheetah.lib b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngineCheetah.lib new file mode 100644 index 0000000000000000000000000000000000000000..5892243ae96ad73d608c7763b2fa95553037f558 Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngineCheetah.lib differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.dll b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.dll new file mode 100644 index 0000000000000000000000000000000000000000..8d263f1de47d94050755969b60bb551f8166d7fa Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.dll differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.exp b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.exp new file mode 100644 index 0000000000000000000000000000000000000000..6ec2a6aa2c5111357cd83560bb841308ee69ce48 Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.exp differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.lib b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.lib new file mode 100644 index 0000000000000000000000000000000000000000..7f663a4f909445c13f930c7e7dee0fa12b2b7908 Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.lib differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.dll b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.dll new file mode 100644 index 0000000000000000000000000000000000000000..f3f31f35ce044731c6e02fffb5de70d652b2d219 Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.dll differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.exp b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.exp new file mode 100644 index 0000000000000000000000000000000000000000..287eb1ccefada4a6526cb4629795e48338231e1f Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.exp differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.lib b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.lib new file mode 100644 index 0000000000000000000000000000000000000000..5ebcfcdc614901d8267871ee026f63809e19322c Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.lib differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngine64.lib b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngine64.lib new file mode 100644 index 0000000000000000000000000000000000000000..3bd7898efb7ad32b0025ddd6a82f58d82444e448 Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngine64.lib differ diff --git a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngineCheetah64.lib b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngineCheetah64.lib new file mode 100644 index 0000000000000000000000000000000000000000..fc3d7a4725b0803c95ea9ae40b46efbc81bd1cd0 Binary files /dev/null and b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngineCheetah64.lib differ diff --git a/third/Blackbone/src/3rd_party/DIA/Win32/msdia140.dll b/third/Blackbone/src/3rd_party/DIA/Win32/msdia140.dll new file mode 100644 index 0000000000000000000000000000000000000000..d1cb4b8c3fa41a502633861f9f0d5d8013b1a951 Binary files /dev/null and b/third/Blackbone/src/3rd_party/DIA/Win32/msdia140.dll differ diff --git a/third/Blackbone/src/3rd_party/DIA/Win32/symsrv.dll b/third/Blackbone/src/3rd_party/DIA/Win32/symsrv.dll new file mode 100644 index 0000000000000000000000000000000000000000..ada9adef8324dd06b8a3efa097f63a4aafe885f8 Binary files /dev/null and b/third/Blackbone/src/3rd_party/DIA/Win32/symsrv.dll differ diff --git a/third/Blackbone/src/3rd_party/DIA/lib/amd64/diaguids.lib b/third/Blackbone/src/3rd_party/DIA/lib/amd64/diaguids.lib new file mode 100644 index 0000000000000000000000000000000000000000..15234229d95ff7767fd2b5bd720f503b436f0480 Binary files /dev/null and b/third/Blackbone/src/3rd_party/DIA/lib/amd64/diaguids.lib differ diff --git a/third/Blackbone/src/3rd_party/DIA/lib/diaguids.lib b/third/Blackbone/src/3rd_party/DIA/lib/diaguids.lib new file mode 100644 index 0000000000000000000000000000000000000000..d9b68b549e7149cb972815d8d660e74b8cdc838d Binary files /dev/null and b/third/Blackbone/src/3rd_party/DIA/lib/diaguids.lib differ diff --git a/third/Blackbone/src/3rd_party/DIA/x64/msdia140.dll b/third/Blackbone/src/3rd_party/DIA/x64/msdia140.dll new file mode 100644 index 0000000000000000000000000000000000000000..caef88343565ae85dc7153bc70690424dd494400 Binary files /dev/null and b/third/Blackbone/src/3rd_party/DIA/x64/msdia140.dll differ diff --git a/third/Blackbone/src/3rd_party/DIA/x64/symsrv.dll b/third/Blackbone/src/3rd_party/DIA/x64/symsrv.dll new file mode 100644 index 0000000000000000000000000000000000000000..c50b3cde125a9576d8122dc34f4a1a47d56ec99b Binary files /dev/null and b/third/Blackbone/src/3rd_party/DIA/x64/symsrv.dll differ diff --git a/third/Blackbone/src/BlackBone/BlackBone.vcxproj b/third/Blackbone/src/BlackBone/BlackBone.vcxproj index 40e23e907d94d570c8e07e51acc874e77c93ef52..a1f302e5cf271550a5974be06c698da414817fbe 100644 --- a/third/Blackbone/src/BlackBone/BlackBone.vcxproj +++ b/third/Blackbone/src/BlackBone/BlackBone.vcxproj @@ -61,7 +61,7 @@ StaticLibrary true - v141 + v142 Unicode @@ -73,13 +73,13 @@ DynamicLibrary true - v141 + v142 Unicode StaticLibrary true - v141 + v142 Unicode @@ -91,13 +91,13 @@ DynamicLibrary true - v141 + v142 Unicode StaticLibrary false - v141 + v142 true Unicode @@ -111,14 +111,14 @@ DynamicLibrary false - v141 + v142 true Unicode StaticLibrary false - v141 + v142 true Unicode @@ -132,7 +132,7 @@ DynamicLibrary false - v141 + v142 true Unicode @@ -248,7 +248,7 @@ - Level4 + Level3 Disabled WIN32;_DEBUG;CONSOLE_TRACE;%(PreprocessorDefinitions) true @@ -256,7 +256,7 @@ ProgramDatabase 4100 false - stdcpplatest + stdcpp17 true false $(ProjectDir)..;%(AdditionalIncludeDirectories) @@ -273,8 +273,8 @@ diaguids.lib;Ole32.lib;%(AdditionalDependencies) - xcopy "$(ProjectDir)..\..\DIA\$(Platform)\msdia140.dll" "$(TargetDir)" /Y -xcopy "$(ProjectDir)..\..\DIA\$(Platform)\symsrv.dll" "$(TargetDir)" /Y + xcopy "$(ProjectDir)..\3rd_party\DIA\$(Platform)\msdia140.dll" "$(TargetDir)" /Y +xcopy "$(ProjectDir)..\3rd_party\DIA\$(Platform)\symsrv.dll" "$(TargetDir)" /Y diff --git a/third/Blackbone/src/BlackBone/Process/ProcessModules.cpp b/third/Blackbone/src/BlackBone/Process/ProcessModules.cpp index a4af2cd35e47741f053666e840a3dd0e2404bb30..ccc7345777ae7b655a902121b930b09659c9a954 100644 --- a/third/Blackbone/src/BlackBone/Process/ProcessModules.cpp +++ b/third/Blackbone/src/BlackBone/Process/ProcessModules.cpp @@ -9,6 +9,7 @@ #include #include +#include #ifdef COMPILER_MSVC #include diff --git a/third/Blackbone/src/BlackBoneTest/BlackBoneTest.vcxproj b/third/Blackbone/src/BlackBoneTest/BlackBoneTest.vcxproj index 9018d19874a71e90310856c1a84c646e96fd7b0f..b15f0d9d8a08a68c14b660a06e06b3593d9e51dc 100644 --- a/third/Blackbone/src/BlackBoneTest/BlackBoneTest.vcxproj +++ b/third/Blackbone/src/BlackBoneTest/BlackBoneTest.vcxproj @@ -47,21 +47,21 @@ DynamicLibrary true - v141 + v142 Unicode false DynamicLibrary true - v141 + v142 Unicode false DynamicLibrary false - v141 + v142 true Unicode false @@ -69,7 +69,7 @@ DynamicLibrary false - v141 + v142 true Unicode false @@ -77,21 +77,21 @@ DynamicLibrary true - v141 + v142 Unicode false DynamicLibrary true - v141 + v142 Unicode false DynamicLibrary false - v141 + v142 true Unicode false @@ -99,7 +99,7 @@ DynamicLibrary false - v141 + v142 true Unicode false diff --git a/third/Blackbone/src/Samples/Samples.vcxproj b/third/Blackbone/src/Samples/Samples.vcxproj index 2c5288f4d67bd030a730cae135da448315b54f85..59efb02e7ed5bde4cfb029697c6a94bc642240ae 100644 --- a/third/Blackbone/src/Samples/Samples.vcxproj +++ b/third/Blackbone/src/Samples/Samples.vcxproj @@ -61,7 +61,7 @@ Application true - v141 + v142 Unicode @@ -74,13 +74,13 @@ Application true - v141 + v142 Unicode Application true - v141 + v142 Unicode @@ -93,13 +93,13 @@ Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode @@ -114,14 +114,14 @@ Application false - v141 + v142 true Unicode Application false - v141 + v142 true Unicode @@ -136,7 +136,7 @@ Application false - v141 + v142 true Unicode