Commit 2cd4aa52 authored by Sameeh Jubran's avatar Sameeh Jubran Committed by Dmitry Fleytman
Browse files

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: default avatarSameeh Jubran <sameeh@daynix.com>
Signed-off-by: default avatarDmitry Fleytman <dfleytma@redhat.com>
parent 2b41acd2
......@@ -4,7 +4,6 @@ Win*Debug
Win*Release
*.opensdf
*.ipch
*.vcxproj.user
build*.log
resource.h
Resource.aps
......
......@@ -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
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<?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>
\ No newline at end of file
......@@ -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
......@@ -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
This diff is collapsed.
......@@ -25,6 +25,7 @@
#include "Installer.h"
#include "Public.h"
#include "DeviceMgr.h"
#include <iterator>
#define SYSTEM32_DRIVERS TEXT("\\System32\\Drivers\\")
......
This diff is collapsed.
This diff is collapsed.
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment