Build: Migrate to VS 2015 and add Win10 configurations

This commit migrates from VS 2013 to VS 2015. Beside the auto conversion which was performed by VS this commit includes the following fixes which enabled the builld to work: Win (7, 8, 8.1, 10): * Set the KMDF Version Major to 1. * Set the KMDF Version Minor to 11. Win XP: * Add _When_ define. * Add empty implementation to guard functions which else would cause an unresolved symbols. * Add path to WinDDK's wdfinstaller.h in UsbDkHelper project. * Add "GetDriverProjectAttributes" and "GetPackageFiles" targets to UsbDkController, UsbDkHelper and UsbDkInstHelper project files. Signed-off-by: Sameeh Jubran <[email protected]> Signed-off-by: Dmitry Fleytman <[email protected]>
JusticePug · Apr 3, 2017 · 2cd4aa5 · 2cd4aa5
1 parent 2b41acd
commit 2cd4aa5
Show file tree

Hide file tree

Showing 13 changed files with 5,930 additions and 4,658 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@ Win*Debug
 Win*Release
 *.opensdf
 *.ipch
-*.vcxproj.user
 build*.log
 resource.h
 Resource.aps

diff --git a/Tools/vs_cmdline.vbs b/Tools/vs_cmdline.vbs
@@ -2,11 +2,11 @@ Dim strCmdLine, strTemp
 Set WshShell = Wscript.CreateObject("Wscript.Shell")
 
 On Error Resume Next
-strCmdLine = WshShell.RegRead("HKLM\SOFTWARE\Microsoft\VisualStudio\12.0\InstallDir")
+strCmdLine = WshShell.RegRead("HKLM\SOFTWARE\Microsoft\VisualStudio\14.0\InstallDir")
 ' In case of error assume WoW64 case
 If Err <> 0 Then
   On Error Goto 0
-  strCmdLine = WshShell.RegRead("HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\InstallDir")
+  strCmdLine = WshShell.RegRead("HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\InstallDir")
 End If
 
 On Error Goto 0

diff --git a/UsbDk Package/UsbDk Package.vcxproj b/UsbDk Package/UsbDk Package.vcxproj
diff --git a/UsbDk.sln b/UsbDk.sln
diff --git a/UsbDk/UsbDk.vcxproj b/UsbDk/UsbDk.vcxproj
diff --git a/UsbDk/UsbDk.vcxproj.user b/UsbDk/UsbDk.vcxproj.user
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP Release|x64'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP Release|Win32'">
+    <SignMode>Off</SignMode>
+  </PropertyGroup>
+</Project>
diff --git a/UsbDk/UsbDkCompat.cpp b/UsbDk/UsbDkCompat.cpp
@@ -38,4 +38,25 @@ NTSTATUS WdfUsbTargetDeviceCreateIsochUrb(WDFUSBDEVICE UsbDevice, PWDF_OBJECT_AT
 
     return status;
 }
+
+extern "C"
+{
+
+#ifdef _WIN64
+    NTSTATUS __guard_check_icall_fptr(...)
+    {
+        return STATUS_SUCCESS;
+    }
+
+    NTSTATUS __guard_dispatch_icall_fptr(...)
+    {
+        return STATUS_SUCCESS;
+    }
+#else
+    NTSTATUS _cdecl __guard_check_icall_fptr(...)
+    {
+        return STATUS_SUCCESS;
+    }
+#endif
+}
 #endif
diff --git a/UsbDk/UsbDkCompat.h b/UsbDk/UsbDkCompat.h
@@ -54,4 +54,6 @@ typedef struct _WDF_USB_DEVICE_CREATE_CONFIG
 NTSTATUS WdfUsbTargetDeviceCreateIsochUrb(WDFUSBDEVICE UsbDevice, PWDF_OBJECT_ATTRIBUTES Attributes, ULONG NumberOfIsochPackets,
                                           WDFMEMORY* UrbMemory, PURB *Urb);
 
+#define _When_(expr, annotes)    __allowed(on_parameter_or_return)
+
 #endif
diff --git a/UsbDkController/UsbDkController.vcxproj b/UsbDkController/UsbDkController.vcxproj
diff --git a/UsbDkHelper/Installer.cpp b/UsbDkHelper/Installer.cpp
@@ -25,6 +25,7 @@
 #include "Installer.h"
 #include "Public.h"
 #include "DeviceMgr.h"
+#include <iterator>
 
 
 #define SYSTEM32_DRIVERS    TEXT("\\System32\\Drivers\\")

diff --git a/UsbDkHelper/UsbDkHelper.vcxproj b/UsbDkHelper/UsbDkHelper.vcxproj
diff --git a/UsbDkInstHelper/UsbDkInstHelper.vcxproj b/UsbDkInstHelper/UsbDkInstHelper.vcxproj
diff --git a/buildAll.bat b/buildAll.bat
@@ -6,7 +6,7 @@ if [%1] EQU [MSIONLY] goto BUILD_MSI
 
 del *.log
 
-for %%x in (Win7, Win8, Win8.1, XP) do (
+for %%x in (Win7, Win8, Win8.1, Win10, XP) do (
   for %%y in (Debug, Release) do (
     for %%z in (win32, x64) do (
       call tools\vs_run.bat UsbDk.sln /Rebuild "%%x %%y|%%z" /Out build%%y_%%x_%%z.log