Resolved merge conflicts.

nektra · Nov 25, 2017 · 802333b · 802333b
2 parents 67eae51 + 2930394
commit 802333b
Show file tree

Hide file tree

Showing 28 changed files with 112 additions and 132 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,7 @@ Source/Engine/SpyMgr/Asm/Injector_x86.inl
 Source/lib/
 Source/MiscUtils/Certificate/nektra/
 Source/MiscUtils/File2Inc/bin/
+Source/.vs/
 Samples/CSharp/COMHookingBasis/obj/
 Samples/CSharp/Console/Aga.Controls/bin/
 Samples/CSharp/Console/Aga.Controls/obj/
@@ -41,4 +42,4 @@ DeviareCOM64_i.h
 DeviareCOM64_p.c
 DeviareCOM_i.c
 DeviareCOM_i.h
-DeviareCOM_p.c
+DeviareCOM_p.c
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,11 @@
 ============
 * C# plugins may not work if "RegisterClassA" or "RegisterClassW" Apis are hooked because CoInitialize(Ex) calls RegisterClass on STA and, at this point, COM initialization is not complete yet.
 
+Version 2.8.3
+=============
+-Fixed stack overflow on some API hooks and reenabling of hooks.
+-Fixed compatibility issue with Windows XP and Windows Vista.
+
 Version 2.8.2
 =============
 -Fixed compatibility issue with Windows 10 Anniversary Edition.

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ installed.
 
 To compile Deviare and/or build samples you need:
 
-- Visual Studio 2015 with Update 1 or later.
+- Visual Studio 2017.
 - .NET Framework 4.
 - Windows SDK 8 with all .NET Framework components installed.
 
@@ -45,7 +45,7 @@ To compile Deviare and/or build samples you need:
 generated when building Deviare. Deviare needs these files to work. If you
 create new databases, don't forget to move them to the *BIN* folder.
 To create them you must first build the corresponding tools that are
-included in the solution.
+included in the solution. Refer to [these instructions](Source/Database/Generator/README.txt) for further details.
 
 
 -------------
@@ -66,7 +66,7 @@ To do so, place the contents of Deviare-InProc inside `Externals/DeviareInProc`.
 -------------
 # BUILDING DEVIARE
 
-To build Deviare you can either execute the build script (build.bat) in a VS2015
+To build Deviare you can either execute the build script (build.bat) in a VS2017
  command prompt or open the solution and build it from within Visual Studio.
  When doing the latter, make sure to build for both x86 and x64 target platforms.
 

diff --git a/Samples/C/RegistryPlugin/RegistryPlugin.sln b/Samples/C/RegistryPlugin/RegistryPlugin.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RegistryPlugin", "RegistryPlugin.vcxproj", "{27E11B11-E6E9-4F89-BBE0-71AF8D14CC67}"
 EndProject

diff --git a/Samples/C/RegistryPlugin/RegistryPlugin.vcxproj b/Samples/C/RegistryPlugin/RegistryPlugin.vcxproj
@@ -26,25 +26,25 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/Samples/C/Test/CTest.sln b/Samples/C/Test/CTest.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CTest", "CTest.vcxproj", "{209BC46A-7722-4623-A55A-F5FD2A9F6663}"
 EndProject

diff --git a/Samples/C/Test/CTest.vcxproj b/Samples/C/Test/CTest.vcxproj
@@ -26,24 +26,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/Samples/CSharp/COMHookingBasis/COMHookingBasis.sln b/Samples/CSharp/COMHookingBasis/COMHookingBasis.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "COMHookingBasis", "COMHookingBasis.csproj", "{E3D247D4-71C9-427A-A4EC-1BD1A40F0FDD}"
 EndProject

diff --git a/Samples/CSharp/Console/CSharpConsole.sln b/Samples/CSharp/Console/CSharpConsole.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpConsole", "CSharpConsole.csproj", "{37480340-9647-428E-96E7-1368468EB72C}"
 	ProjectSection(ProjectDependencies) = postProject

diff --git a/Samples/CSharp/FilePlugin/FilePlugin.sln b/Samples/CSharp/FilePlugin/FilePlugin.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilePlugin", "FilePlugin.csproj", "{3D059C03-5739-4632-90B7-7CCD2BF6F39C}"
 EndProject

diff --git a/Samples/CSharp/PrintLogger/PrintLogger.sln b/Samples/CSharp/PrintLogger/PrintLogger.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrintLogger", "PrintLogger.csproj", "{48DF6E53-BDA8-4E18-BBCB-E69BF1D5863A}"
 EndProject

diff --git a/Samples/CSharp/RegistryPlugin/RegistryPlugin.sln b/Samples/CSharp/RegistryPlugin/RegistryPlugin.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPlugin", "RegistryPlugin.csproj", "{FE457EB7-EFFF-44B6-840C-CF7D7E142A88}"
 EndProject

diff --git a/Samples/build_samples.bat b/Samples/build_samples.bat
@@ -1,12 +1,11 @@
 @ECHO OFF
 SETLOCAL
-IF NOT "%VCINSTALLDIR%" == "" GOTO do_process
-IF "%VS140COMNTOOLS%" == "" GOTO show_err
+IF NOT "%VS150COMNTOOLS%" == "" GOTO do_process
+IF NOT EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat" GOTO show_err
 
-:do_process
-CALL "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x86
-IF "%VS140COMNTOOLS%" == "" GOTO err_cantsetupvs_x86
+CALL "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
 
+:do_process
 DEVENV C\RegistryPlugin\RegistryPlugin.sln /rebuild "Release|Win32"
 IF NOT %ERRORLEVEL% == 0 goto bad_compile
 
@@ -28,12 +27,6 @@ IF NOT %ERRORLEVEL% == 0 goto bad_compile
 DEVENV CSharp\PrintLogger\PrintLogger.sln /rebuild "Release|x86"
 IF NOT %ERRORLEVEL% == 0 goto bad_compile
 
-ENDLOCAL
-
-SETLOCAL
-CALL "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
-IF "%VS140COMNTOOLS%" == "" GOTO err_cantsetupvs_x64
-
 DEVENV C\RegistryPlugin\RegistryPlugin.sln /rebuild "Release|x64"
 IF NOT %ERRORLEVEL% == 0 goto bad_compile
 
@@ -52,17 +45,7 @@ IF NOT %ERRORLEVEL% == 0 goto bad_compile
 GOTO end
 
 :show_err
-ECHO Please execute this batch file inside a Visual Studio Command Prompt
-PAUSE
-GOTO end
-
-:err_cantsetupvs_x86
-ECHO Cannot initialize Visual Studio x86 Command Prompt environment
-PAUSE
-GOTO end
-
-:err_cantsetupvs_x64
-ECHO Cannot initialize Visual Studio x64 Command Prompt environment
+ECHO Please execute this batch file inside a Visual Studio 2017 Command Prompt
 PAUSE
 GOTO end
 

diff --git a/Source/Database/DbMerge/DbMerge.vcxproj b/Source/Database/DbMerge/DbMerge.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,24 +26,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/Source/Database/Generator/DbGenerator.vcxproj b/Source/Database/Generator/DbGenerator.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,24 +26,24 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/Source/Database/HeaderFix/HeaderFix.vcxproj b/Source/Database/HeaderFix/HeaderFix.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -18,13 +18,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/Source/Database/Tlb2H/Tlb2H.vcxproj b/Source/Database/Tlb2H/Tlb2H.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -18,13 +18,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/Source/DvEngine.sln b/Source/DvEngine.sln
@@ -39,6 +39,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "File2Inc", "MiscUtils\File2Inc\File2Inc.vcxproj", "{B705E0BA-56FF-4BA7-847B-0FE0DA2DBA8E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tlb2H", "Database\Tlb2H\Tlb2H.vcxproj", "{E9957503-B1E0-4E1B-A027-6E304E644CF3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BF4BA8BE-12DC-4D9F-9939-1505A451E293} = {BF4BA8BE-12DC-4D9F-9939-1505A451E293}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DbMerge", "Database\DbMerge\DbMerge.vcxproj", "{64249CFD-06D5-4A5A-813F-0D467485838C}"
 EndProject

diff --git a/Source/Engine/Agent/Agent.cpp b/Source/Engine/Agent/Agent.cpp
@@ -45,18 +45,18 @@
 #if defined _M_IX86
   #ifdef _DEBUG
     #pragma comment(lib, "..\\..\\..\\Libs\\Lz4Lib_Debug.lib")
-    #pragma comment(lib, "..\\..\\..\\Externals\\DeviareInProc\\Libs\\2015\\NktHookLib_Debug.lib")
+    #pragma comment(lib, "..\\..\\..\\Externals\\DeviareInProc\\Libs\\2017\\NktHookLib_Debug.lib")
 #else //_DEBUG
     #pragma comment(lib, "..\\..\\..\\Libs\\Lz4Lib.lib")
-    #pragma comment(lib, "..\\..\\..\\Externals\\DeviareInProc\\Libs\\2015\\NktHookLib.lib")
+    #pragma comment(lib, "..\\..\\..\\Externals\\DeviareInProc\\Libs\\2017\\NktHookLib.lib")
   #endif //_DEBUG
 #elif defined _M_X64
   #ifdef _DEBUG
     #pragma comment(lib, "..\\..\\..\\Libs\\Lz4Lib64_Debug.lib")
-    #pragma comment(lib, "..\\..\\..\\Externals\\DeviareInProc\\Libs\\2015\\NktHookLib64_Debug.lib")
+    #pragma comment(lib, "..\\..\\..\\Externals\\DeviareInProc\\Libs\\2017\\NktHookLib64_Debug.lib")
   #else //_DEBUG
     #pragma comment(lib, "..\\..\\..\\Libs\\Lz4Lib64.lib")
-    #pragma comment(lib, "..\\..\\..\\Externals\\DeviareInProc\\Libs\\2015\\NktHookLib64.lib")
+    #pragma comment(lib, "..\\..\\..\\Externals\\DeviareInProc\\Libs\\2017\\NktHookLib64.lib")
   #endif //_DEBUG
 #else
   #error Unsupported platform