升级到vs2019（https://blog.csdn.net/kinghzking/article/details/130771224）

197da32a · pc-ls · 7a3c7ba8 · 197da32a · 197da32a · 197da32a
29 changed file
--- a/course/WinDriver/tools/tools-MFC/tools-MFC.vcxproj
+++ b/course/WinDriver/tools/tools-MFC/tools-MFC.vcxproj
@@ -29,7 +29,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141_xp</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>Dynamic</UseOfMfc>
  </PropertyGroup>
@@ -94,7 +94,7 @@
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalOptions>/I"../../../../third/Blackbone/src" %(AdditionalOptions)</AdditionalOptions>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>

--- 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
 //////////////////////////////////////////////////////////////////////////


--- a/course/WinDriver/tools/tools/tools.vcxproj
+++ b/course/WinDriver/tools/tools/tools.vcxproj
@@ -29,7 +29,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

--- a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.dll
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.dll
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.exp
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.exp
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.lib
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngine.lib
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.dll
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.dll
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.exp
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.exp
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.lib
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Dll/BeaEngineCheetah.lib
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngine.lib
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngine.lib
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngineCheetah.lib
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win32/Lib/BeaEngineCheetah.lib
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.dll
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.dll
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.exp
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.exp
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.lib
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngine64.lib
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.dll
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.dll
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.exp
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.exp
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.lib
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Dll/BeaEngineCheetah64.lib
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngine64.lib
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngine64.lib
--- a/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngineCheetah64.lib
+++ b/third/Blackbone/src/3rd_party/BeaEngine/Win64/Lib/BeaEngineCheetah64.lib
--- a/third/Blackbone/src/3rd_party/DIA/Win32/msdia140.dll
+++ b/third/Blackbone/src/3rd_party/DIA/Win32/msdia140.dll
--- a/third/Blackbone/src/3rd_party/DIA/Win32/symsrv.dll
+++ b/third/Blackbone/src/3rd_party/DIA/Win32/symsrv.dll
--- a/third/Blackbone/src/3rd_party/DIA/lib/amd64/diaguids.lib
+++ b/third/Blackbone/src/3rd_party/DIA/lib/amd64/diaguids.lib
--- a/third/Blackbone/src/3rd_party/DIA/lib/diaguids.lib
+++ b/third/Blackbone/src/3rd_party/DIA/lib/diaguids.lib
--- a/third/Blackbone/src/3rd_party/DIA/x64/msdia140.dll
+++ b/third/Blackbone/src/3rd_party/DIA/x64/msdia140.dll
--- a/third/Blackbone/src/3rd_party/DIA/x64/symsrv.dll
+++ b/third/Blackbone/src/3rd_party/DIA/x64/symsrv.dll
--- a/third/Blackbone/src/BlackBone/BlackBone.vcxproj
+++ b/third/Blackbone/src/BlackBone/BlackBone.vcxproj
@@ -61,7 +61,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(XP)|Win32'" Label="Configuration">
@@ -73,13 +73,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(DLL)|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(XP)|x64'" Label="Configuration">
@@ -91,13 +91,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(DLL)|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -111,14 +111,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release(DLL)|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -132,7 +132,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release(DLL)|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -248,7 +248,7 @@
    <ClCompile>
      <PrecompiledHeader>
      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;CONSOLE_TRACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <SDLCheck>true</SDLCheck>
@@ -256,7 +256,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <DisableSpecificWarnings>4100</DisableSpecificWarnings>
      <EnablePREfast>false</EnablePREfast>
-      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <MinimalRebuild>false</MinimalRebuild>
      <AdditionalIncludeDirectories>$(ProjectDir)..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -273,8 +273,8 @@
      <AdditionalDependencies>diaguids.lib;Ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Lib>
    <PostBuildEvent>
-      <Command>xcopy "$(ProjectDir)..\..\DIA\$(Platform)\msdia140.dll" "$(TargetDir)" /Y
-xcopy "$(ProjectDir)..\..\DIA\$(Platform)\symsrv.dll" "$(TargetDir)" /Y</Command>
+      <Command>xcopy "$(ProjectDir)..\3rd_party\DIA\$(Platform)\msdia140.dll" "$(TargetDir)" /Y
+xcopy "$(ProjectDir)..\3rd_party\DIA\$(Platform)\symsrv.dll" "$(TargetDir)" /Y</Command>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug(XP)|Win32'">

--- a/third/Blackbone/src/BlackBone/Process/ProcessModules.cpp
+++ b/third/Blackbone/src/BlackBone/Process/ProcessModules.cpp
@@ -9,6 +9,7 @@

 #include <memory>
 #include <type_traits>
+#include <iterator>

 #ifdef COMPILER_MSVC
 #include <mscoree.h>

--- a/third/Blackbone/src/BlackBoneTest/BlackBoneTest.vcxproj
+++ b/third/Blackbone/src/BlackBoneTest/BlackBoneTest.vcxproj
@@ -47,21 +47,21 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(DLL)|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
@@ -69,7 +69,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release(DLL)|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
@@ -77,21 +77,21 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(DLL)|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
@@ -99,7 +99,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release(DLL)|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>

--- a/third/Blackbone/src/Samples/Samples.vcxproj
+++ b/third/Blackbone/src/Samples/Samples.vcxproj
@@ -61,7 +61,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(XP)|Win32'" Label="Configuration">
@@ -74,13 +74,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(DLL)|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(XP)|x64'" Label="Configuration">
@@ -93,13 +93,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(DLL)|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -114,14 +114,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release(DLL)|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -136,7 +136,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release(DLL)|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>