Add support for building with Visual Studio 2017

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/build.py b/build.py
index b07d1f7559097e3876cc2cc0e240eb4daf4f390f..4f7e2cec304cdc21f73fd6e79b8e80147d202965 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -172,18 +172,28 @@ def shell(command, dir):
     return sub.returncode
 
 
+def find(name, path):
+    for root, dirs, files in os.walk(path):
+        if name in files:
+            return os.path.join(root, name)
+
+
 class msbuild_failure(Exception):
     def __init__(self, value):
         self.value = value
     def __str__(self):
         return repr(self.value)
 
+
 def msbuild(platform, configuration, target, file, args, dir):
-    os.environ['PLATFORM'] = platform
-    os.environ['CONFIGURATION'] = configuration
-    os.environ['TARGET'] = target
-    os.environ['FILE'] = file
-    os.environ['EXTRA'] = args
+    vcvarsall = find('vcvarsall.bat', os.environ['VS'])
+
+    os.environ['MSBUILD_PLATFORM'] = platform
+    os.environ['MSBUILD_CONFIGURATION'] = configuration
+    os.environ['MSBUILD_TARGET'] = target
+    os.environ['MSBUILD_FILE'] = file
+    os.environ['MSBUILD_EXTRA'] = args
+    os.environ['MSBUILD_VCVARSALL'] = vcvarsall
 
     bin = os.path.join(os.getcwd(), 'msbuild.bat')
 
@@ -201,10 +211,30 @@ def build_sln(name, release, arch, debug, vs):
     elif arch == 'x64':
         platform = 'x64'
 
-    cwd = os.getcwd()
-
     msbuild(platform, configuration, 'Build', name + '.sln', '', vs)
 
+def copy_package(name, release, arch, debug, vs):
+    configuration = get_configuration(release, debug)
+
+    if arch == 'x86':
+        platform = 'Win32'
+    elif arch == 'x64':
+        platform = 'x64'
+
+    pattern = '/'.join([vs, ''.join(configuration.split(' ')), platform, 'package', '*'])
+    print('Copying package from %s' % pattern)
+
+    files = glob.glob(pattern)
+
+    dst = os.path.join(name, arch)
+
+    os.makedirs(dst, exist_ok=True)
+
+    for file in files:
+        new = shutil.copy(file, dst)
+        print(new)
+
+    print('')
 
 def remove_timestamps(path):
     try:
@@ -224,61 +254,19 @@ def remove_timestamps(path):
     dst.close()
     src.close()
 
-def sdv_clean(name, vs):
-    path = [vs, name, 'sdv']
-    print(path)
-
-    shutil.rmtree(os.path.join(*path), True)
-
-    path = [vs, name, 'sdv.temp']
-    print(path)
-
-    shutil.rmtree(os.path.join(*path), True)
-
-    path = [vs, name, 'staticdv.job']
-    print(path)
-
-    try:
-        os.unlink(os.path.join(*path))
-    except OSError:
-        pass
-
-    path = [vs, name, 'refine.sdv']
-    print(path)
-
-    try:
-        os.unlink(os.path.join(*path))
-    except OSError:
-        pass
-
-    path = [vs, name, 'sdv-map.h']
-    print(path)
-
-    try:
-        os.unlink(os.path.join(*path))
-    except OSError:
-        pass
-
-
 def run_sdv(name, dir, vs):
-    configuration = get_configuration('Windows 8', False)
+    release = { 'vs2012':'Windows 8',
+                'vs2013':'Windows 8',
+                'vs2017':'Windows 10' }
+
+    configuration = get_configuration(release[vs], False)
     platform = 'x64'
 
     msbuild(platform, configuration, 'Build', name + '.vcxproj',
             '', os.path.join(vs , name))
 
-    sdv_clean(name, vs)
-
     msbuild(platform, configuration, 'sdv', name + '.vcxproj',
-            '/p:Inputs="/scan"', os.path.join(vs , name))
-
-    path = [vs, name, 'sdv-map.h']
-    file = open(os.path.join(*path), 'r')
-
-    for line in file:
-        print(line)
-
-    file.close()
+            '/p:Inputs="/clean"', os.path.join(vs , name))
 
     msbuild(platform, configuration, 'sdv', name + '.vcxproj',
             '/p:Inputs="/check:default.sdv"', os.path.join(vs, name))
@@ -376,24 +364,27 @@ def archive(filename, files, tgz=False):
             pass
     tar.close()
 
+
 def getVsVersion():
-    vsenv ={} 
-    vars = subprocess.check_output([os.environ['VS']+'\\VC\\vcvarsall.bat', 
-                                        '&&', 'set'], 
-                                    shell=True)
+    vsenv = {}
+    vcvarsall= find('vcvarsall.bat', os.environ['VS'])
+
+    vars = subprocess.check_output([vcvarsall, 'x86_amd64', '&&', 'set'], shell=True)
+
     for var in vars.splitlines():
         k, _, v = map(str.strip, var.strip().decode('utf-8').partition('='))
         if k.startswith('?'):
             continue
         vsenv[k] = v
 
-    if vsenv['VisualStudioVersion'] == '11.0' :
-        return 'vs2012'
-    elif vsenv['VisualStudioVersion'] == '12.0' :
-        return 'vs2013'
+    mapping = { '11.0':'vs2012',
+                '12.0':'vs2013',
+                '15.0':'vs2017'}
 
+    return mapping[vsenv['VisualStudioVersion']]
 
-if __name__ == '__main__':
+
+def main():
     debug = { 'checked': True, 'free': False }
     sdv = { 'nosdv': False, None: True }
     driver = 'xenvbd'
@@ -438,16 +429,20 @@ if __name__ == '__main__':
 
     symstore_del(driver, 30)
 
-    if vs=='vs2012':
-        release = 'Windows Vista'
-    else:
-        release = 'Windows 7'
+    release = { 'vs2012':'Windows Vista',
+                'vs2013':'Windows 7',
+                'vs2017':'Windows 7' }
 
-    build_sln(driver, release, 'x86', debug[sys.argv[1]], vs)
-    build_sln(driver, release, 'x64', debug[sys.argv[1]], vs)
+    shutil.rmtree(driver, ignore_errors=True)
 
-    symstore_add(driver, release, 'x86', debug[sys.argv[1]], vs)
-    symstore_add(driver, release, 'x64', debug[sys.argv[1]], vs)
+    build_sln(driver, release[vs], 'x86', debug[sys.argv[1]], vs)
+    copy_package(driver, release[vs], 'x86', debug[sys.argv[1]], vs)
+
+    build_sln(driver, release[vs], 'x64', debug[sys.argv[1]], vs)
+    copy_package(driver, release[vs], 'x64', debug[sys.argv[1]], vs)
+
+    symstore_add(driver, release[vs], 'x86', debug[sys.argv[1]], vs)
+    symstore_add(driver, release[vs], 'x64', debug[sys.argv[1]], vs)
 
     if len(sys.argv) <= 2 or sdv[sys.argv[2]]:
         run_sdv('xencrsh', driver, vs)
@@ -457,3 +452,5 @@ if __name__ == '__main__':
     archive(driver + '\\source.tgz', manifest().splitlines(), tgz=True)
     archive(driver + '.tar', [driver,'revision'])
 
+if __name__ == '__main__':
+    main()

diff --git a/msbuild.bat b/msbuild.bat
index 1b1fbc8fe8dc67fc0c0cebbb4e7afa40b7c42eea..a28f93919d8c044e66229886f0bde56dfc06d57d 100755 (executable)
--- a/msbuild.bat
+++ b/msbuild.bat
@@ -1,6 +1,8 @@
-call "%VS%\VC\vcvarsall.bat" x86
+set MSBUILD_ROOT=%cd%
+call "%MSBUILD_VCVARSALL%" x86_amd64
 @echo on
-msbuild.exe /m:1 /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" /t:"%TARGET%" %EXTRA% %FILE%
+cd "%MSBUILD_ROOT%"
+msbuild.exe /m:1 /p:Configuration="%MSBUILD_CONFIGURATION%" /p:Platform="%MSBUILD_PLATFORM%" /t:"%MSBUILD_TARGET%" %MSBUILD_EXTRA% %MSBUILD_FILE%
 if errorlevel 1 goto error
 exit 0
 

diff --git a/vs2017/configs.props b/vs2017/configs.props
new file mode 100644 (file)
index 0000000..2f46699
--- /dev/null
+++ b/vs2017/configs.props
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+       <ItemGroup Label="ProjectConfigurations">
+               <ProjectConfiguration Include="Windows 10 Debug|Win32">
+                       <Configuration>Windows 10 Debug</Configuration>
+                       <Platform>Win32</Platform>
+                       <WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 10 Release|Win32">
+                       <Configuration>Windows 10 Release</Configuration>
+                       <Platform>Win32</Platform>
+                       <WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 10 Debug|x64">
+                       <Configuration>Windows 10 Debug</Configuration>
+                       <Platform>x64</Platform>
+                       <WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 10 Release|x64">
+                       <Configuration>Windows 10 Release</Configuration>
+                       <Platform>x64</Platform>
+                       <WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 8 Debug|Win32">
+                       <Configuration>Windows 8 Debug</Configuration>
+                       <Platform>Win32</Platform>
+                       <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 8 Release|Win32">
+                       <Configuration>Windows 8 Release</Configuration>
+                       <Platform>Win32</Platform>
+                       <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 8 Debug|x64">
+                       <Configuration>Windows 8 Debug</Configuration>
+                       <Platform>x64</Platform>
+                       <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 8 Release|x64">
+                       <Configuration>Windows 8 Release</Configuration>
+                       <Platform>x64</Platform>
+                       <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 7 Debug|Win32">
+                       <Configuration>Windows 7 Debug</Configuration>
+                       <Platform>Win32</Platform>
+                       <WindowsTargetPlatformVersion>7</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 7 Release|Win32">
+                       <Configuration>Windows 7 Release</Configuration>
+                       <Platform>Win32</Platform>
+                       <WindowsTargetPlatformVersion>7</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 7 Debug|x64">
+                       <Configuration>Windows 7 Debug</Configuration>
+                       <Platform>x64</Platform>
+                       <WindowsTargetPlatformVersion>7</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+               <ProjectConfiguration Include="Windows 7 Release|x64">
+                       <Configuration>Windows 7 Release</Configuration>
+                       <Platform>x64</Platform>
+                       <WindowsTargetPlatformVersion>7</WindowsTargetPlatformVersion>
+               </ProjectConfiguration>
+       </ItemGroup>
+</Project>

diff --git a/vs2017/package/package.vcxproj b/vs2017/package/package.vcxproj
new file mode 100644 (file)
index 0000000..6b5930e
--- /dev/null
+++ b/vs2017/package/package.vcxproj
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\configs.props" />
+  <PropertyGroup Label="PropertySheets">
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Utility</ConfigurationType>
+    <DriverType>Package</DriverType>
+    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+    <SupportsPackaging>true</SupportsPackaging>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{AB8DAED3-9D70-4907-99A3-C643F1FC1972}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="..\targets.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <EnableInf2cat>true</EnableInf2cat>
+    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='x64'">8_x64;Server8_x64;10_x64;Server10_x64</Inf2CatWindowsVersionList>
+    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='Win32'">8_x86;10_x86</Inf2CatWindowsVersionList>
+    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+    <EnableDeployment>False</EnableDeployment>
+    <ImportToStore>False</ImportToStore>
+    <InstallMode>None</InstallMode>
+    <ScriptDeviceQuery>%PathToInf%</ScriptDeviceQuery>
+    <EnableVerifier>False</EnableVerifier>
+    <AllDrivers>False</AllDrivers>
+    <VerifyProjectOutput>True</VerifyProjectOutput>
+    <VerifyFlags>133563</VerifyFlags>
+    <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
+    <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\xenvbd_coinst\xenvbd_coinst.vcxproj">
+      <Project>{50c08437-c1f3-4349-bf6a-7b55a06bf999}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\xencrsh\xencrsh.vcxproj">
+      <Project>{58f5bc43-b92e-4a2b-975d-0066eab29092}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\xenvbd\xenvbd.vcxproj">
+      <Project>{ef236371-3145-41b1-99c9-82b33e353f17}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\xendisk\xendisk.vcxproj">
+      <Project>{d7411b2c-2c43-434d-9f56-e10a3d2f5bad}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <FilesToPackage Include="$(DPINST_REDIST)\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
+    <FilesToPackage Include="$(DPINST_REDIST)\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

diff --git a/vs2017/package/package.vcxproj.user b/vs2017/package/package.vcxproj.user
new file mode 100644 (file)
index 0000000..b017ec2
--- /dev/null
+++ b/vs2017/package/package.vcxproj.user
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+       <PropertyGroup>
+               <SignMode>TestSign</SignMode>
+               <TestCertificate>..\..\src\xenvbd.pfx</TestCertificate>
+               <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
+       </PropertyGroup>
+</Project>

diff --git a/vs2017/targets.props b/vs2017/targets.props
new file mode 100644 (file)
index 0000000..6475d51
--- /dev/null
+++ b/vs2017/targets.props
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Debug|Win32'">
+               <TargetVersion>Windows10</TargetVersion>
+               <UseDebugLibraries>true</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Release|Win32'">
+               <TargetVersion>Windows10</TargetVersion>
+               <UseDebugLibraries>false</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Debug|x64'">
+               <TargetVersion>Windows10</TargetVersion>
+               <UseDebugLibraries>true</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 10 Release|x64'">
+               <TargetVersion>Windows10</TargetVersion>
+               <UseDebugLibraries>false</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 8 Debug|Win32'">
+               <TargetVersion>Windows8</TargetVersion>
+               <UseDebugLibraries>true</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 8 Release|Win32'">
+               <TargetVersion>Windows8</TargetVersion>
+               <UseDebugLibraries>false</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 8 Debug|x64'">
+               <TargetVersion>Windows8</TargetVersion>
+               <UseDebugLibraries>true</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 8 Release|x64'">
+               <TargetVersion>Windows8</TargetVersion>
+               <UseDebugLibraries>false</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'">
+               <TargetVersion>Windows7</TargetVersion>
+               <UseDebugLibraries>true</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'">
+               <TargetVersion>Windows7</TargetVersion>
+               <UseDebugLibraries>false</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'">
+               <TargetVersion>Windows7</TargetVersion>
+               <UseDebugLibraries>true</UseDebugLibraries>
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'">
+               <TargetVersion>Windows7</TargetVersion>
+               <UseDebugLibraries>false</UseDebugLibraries>
+       </PropertyGroup>
+</Project>

diff --git a/vs2017/xencrsh/xencrsh.vcxproj b/vs2017/xencrsh/xencrsh.vcxproj
new file mode 100644 (file)
index 0000000..7449a68
--- /dev/null
+++ b/vs2017/xencrsh/xencrsh.vcxproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\configs.props" />
+  <PropertyGroup Label="PropertySheets">
+    <DriverType>WDM</DriverType>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{58F5BC43-B92E-4A2B-975D-0066EAB29092}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="..\targets.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <EnableInf2cat>false</EnableInf2cat>
+    <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
+    <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__MODULE__="XENCRSH";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>EnableAllWarnings</WarningLevel>
+      <DisableSpecificWarnings>4464;4548;4711;4820;4668;4255;5045;6001;6054;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnablePREfast>true</EnablePREfast>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <ModuleDefinitionFile>../../src/xencrsh/xencrsh.def</ModuleDefinitionFile>
+      <AdditionalDependencies>$(DDK_LIB_PATH)/storport.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <FilesToPackage Include="$(TargetPath)" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\xencrsh\austere.c" />
+    <ClCompile Include="..\..\src\xencrsh\buffer.c" />
+    <ClCompile Include="..\..\src\xencrsh\driver.c" />
+    <ClCompile Include="..\..\src\xencrsh\evtchn.c" />
+    <ClCompile Include="..\..\src\xencrsh\fdo.c" />
+    <ClCompile Include="..\..\src\xencrsh\frontend.c" />
+    <ClCompile Include="..\..\src\xencrsh\gnttab.c" />
+    <ClCompile Include="..\..\src\xencrsh\hvm.c" />
+    <ClCompile Include="..\..\src\xencrsh\hypercall_stub.c" />
+    <ClCompile Include="..\..\src\xencrsh\log.c" />
+    <ClCompile Include="..\..\src\xencrsh\pdo.c" />
+    <ClCompile Include="..\..\src\xencrsh\pdoinquiry.c" />
+    <ClCompile Include="..\..\src\xencrsh\queue.c" />
+    <ClCompile Include="..\..\src\xencrsh\store.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\..\src\xencrsh\amd64\hypercall.asm">
+      <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
+    </MASM>
+    <MASM Include="..\..\src\xencrsh\i386\hypercall.asm">
+      <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
+    </MASM>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\src\xencrsh\xencrsh.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\xencrsh\xencrsh.def" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

diff --git a/vs2017/xencrsh/xencrsh.vcxproj.user b/vs2017/xencrsh/xencrsh.vcxproj.user
new file mode 100644 (file)
index 0000000..b017ec2
--- /dev/null
+++ b/vs2017/xencrsh/xencrsh.vcxproj.user
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+       <PropertyGroup>
+               <SignMode>TestSign</SignMode>
+               <TestCertificate>..\..\src\xenvbd.pfx</TestCertificate>
+               <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
+       </PropertyGroup>
+</Project>

diff --git a/vs2017/xendisk/xendisk.vcxproj b/vs2017/xendisk/xendisk.vcxproj
new file mode 100644 (file)
index 0000000..e311c1a
--- /dev/null
+++ b/vs2017/xendisk/xendisk.vcxproj
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\configs.props" />
+  <PropertyGroup Label="PropertySheets">
+    <DriverType>WDM</DriverType>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="..\targets.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <EnableInf2cat>false</EnableInf2cat>
+    <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
+    <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PreprocessorDefinitions>__MODULE__="XENDISK";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>EnableAllWarnings</WarningLevel>
+      <DisableSpecificWarnings>4464;4548;4711;4820;4668;4255;5045;6001;6054;28123;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnablePREfast>true</EnablePREfast>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <AdditionalDependencies>$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <FilesToPackage Include="$(TargetPath)" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="../../src/xendisk/driver.c" />
+    <ClCompile Include="../../src/xendisk/fdo.c" />
+    <ClCompile Include="../../src/xendisk/pdo.c" />
+    <ClCompile Include="../../src/xendisk/registry.c" />
+    <ClCompile Include="../../src/xendisk/thread.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\src\xendisk\xendisk.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

diff --git a/vs2017/xendisk/xendisk.vcxproj.user b/vs2017/xendisk/xendisk.vcxproj.user
new file mode 100644 (file)
index 0000000..e1315db
--- /dev/null
+++ b/vs2017/xendisk/xendisk.vcxproj.user
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SignMode>TestSign</SignMode>
+    <TestCertificate>..\..\src\xenvbd.pfx</TestCertificate>
+    <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
+  </PropertyGroup>
+</Project>

diff --git a/vs2017/xenvbd.sln b/vs2017/xenvbd.sln
new file mode 100644 (file)
index 0000000..215506f
--- /dev/null
+++ b/vs2017/xenvbd.sln
@@ -0,0 +1,173 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xenvbd", "xenvbd\xenvbd.vcxproj", "{EF236371-3145-41B1-99C9-82B33E353F17}"
+       ProjectSection(ProjectDependencies) = postProject
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092} = {58F5BC43-B92E-4A2B-975D-0066EAB29092}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xencrsh", "xencrsh\xencrsh.vcxproj", "{58F5BC43-B92E-4A2B-975D-0066EAB29092}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xendisk", "xendisk\xendisk.vcxproj", "{D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xenvbd_coinst", "xenvbd_coinst\xenvbd_coinst.vcxproj", "{50C08437-C1F3-4349-BF6A-7B55A06BF999}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "package\package.vcxproj", "{AB8DAED3-9D70-4907-99A3-C643F1FC1972}"
+    ProjectSection(ProjectDependencies) = postProject
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999} = {50C08437-C1F3-4349-BF6A-7B55A06BF999}
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092} = {58F5BC43-B92E-4A2B-975D-0066EAB29092}
+               {EF236371-3145-41B1-99C9-82B33E353F17} = {EF236371-3145-41B1-99C9-82B33E353F17}
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD} = {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}
+       EndProjectSection
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Windows 7 Debug|Win32 = Windows 7 Debug|Win32
+               Windows 7 Debug|x64 = Windows 7 Debug|x64
+               Windows 7 Release|Win32 = Windows 7 Release|Win32
+               Windows 7 Release|x64 = Windows 7 Release|x64
+               Windows 8 Debug|Win32 = Windows 8 Debug|Win32
+               Windows 8 Debug|x64 = Windows 8 Debug|x64
+               Windows 8 Release|Win32 = Windows 8 Release|Win32
+               Windows 8 Release|x64 = Windows 8 Release|x64
+               Windows 10 Debug|Win32 = Windows 10 Debug|Win32
+               Windows 10 Debug|x64 = Windows 10 Debug|x64
+               Windows 10 Release|Win32 = Windows 10 Release|Win32
+               Windows 10 Release|x64 = Windows 10 Release|x64
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Debug|Win32.ActiveCfg = Windows 7 Debug|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Debug|Win32.Build.0 = Windows 7 Debug|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Debug|x64.ActiveCfg = Windows 7 Debug|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Debug|x64.Build.0 = Windows 7 Debug|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Release|Win32.ActiveCfg = Windows 7 Release|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Release|Win32.Build.0 = Windows 7 Release|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 7 Debug|Win32.ActiveCfg = Windows 7 Debug|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 7 Debug|Win32.Build.0 = Windows 7 Debug|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 7 Debug|x64.ActiveCfg = Windows 7 Debug|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 7 Debug|x64.Build.0 = Windows 7 Debug|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 7 Release|Win32.ActiveCfg = Windows 7 Release|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 7 Release|Win32.Build.0 = Windows 7 Release|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
+               {EF236371-3145-41B1-99C9-82B33E353F17}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 7 Debug|Win32.ActiveCfg = Windows 7 Debug|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 7 Debug|Win32.Build.0 = Windows 7 Debug|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 7 Debug|x64.ActiveCfg = Windows 7 Debug|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 7 Debug|x64.Build.0 = Windows 7 Debug|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 7 Release|Win32.ActiveCfg = Windows 7 Release|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 7 Release|Win32.Build.0 = Windows 7 Release|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
+               {50C08437-C1F3-4349-BF6A-7B55A06BF999}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Debug|Win32.ActiveCfg = Windows 7 Debug|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Debug|Win32.Build.0 = Windows 7 Debug|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Debug|Win32.Deploy.0 = Windows 7 Debug|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Debug|x64.ActiveCfg = Windows 7 Debug|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Debug|x64.Build.0 = Windows 7 Debug|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Debug|x64.Deploy.0 = Windows 7 Debug|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Release|Win32.ActiveCfg = Windows 7 Release|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Release|Win32.Build.0 = Windows 7 Release|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Release|Win32.Deploy.0 = Windows 7 Release|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 7 Release|x64.Deploy.0 = Windows 7 Release|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Debug|Win32.Deploy.0 = Windows 8 Debug|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Debug|x64.Deploy.0 = Windows 8 Debug|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Release|Win32.Deploy.0 = Windows 8 Release|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 8 Release|x64.Deploy.0 = Windows 8 Release|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|Win32.Deploy.0 = Windows 10 Debug|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Debug|x64.Deploy.0 = Windows 10 Debug|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|Win32.Deploy.0 = Windows 10 Release|Win32
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
+               {AB8DAED3-9D70-4907-99A3-C643F1FC1972}.Windows 10 Release|x64.Deploy.0 = Windows 10 Release|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 7 Debug|Win32.ActiveCfg = Windows 7 Debug|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 7 Debug|Win32.Build.0 = Windows 7 Debug|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 7 Debug|x64.ActiveCfg = Windows 7 Debug|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 7 Debug|x64.Build.0 = Windows 7 Debug|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 7 Release|Win32.ActiveCfg = Windows 7 Release|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 7 Release|Win32.Build.0 = Windows 7 Release|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Debug|Win32.ActiveCfg = Windows 10 Debug|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Debug|Win32.Build.0 = Windows 10 Debug|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Debug|x64.ActiveCfg = Windows 10 Debug|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Debug|x64.Build.0 = Windows 10 Debug|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Release|Win32.ActiveCfg = Windows 10 Release|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Release|Win32.Build.0 = Windows 10 Release|Win32
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Release|x64.ActiveCfg = Windows 10 Release|x64
+               {58F5BC43-B92E-4A2B-975D-0066EAB29092}.Windows 10 Release|x64.Build.0 = Windows 10 Release|x64
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+EndGlobal

diff --git a/vs2017/xenvbd/xenvbd.vcxproj b/vs2017/xenvbd/xenvbd.vcxproj
new file mode 100644 (file)
index 0000000..8519625
--- /dev/null
+++ b/vs2017/xenvbd/xenvbd.vcxproj
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\configs.props" />
+  <PropertyGroup Label="PropertySheets">
+    <DriverType>WDM</DriverType>
+    <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+    <ConfigurationType>Driver</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EF236371-3145-41B1-99C9-82B33E353F17}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="..\targets.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <EnableInf2cat>false</EnableInf2cat>
+    <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
+    <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(WindowsSdkDir)\include\km;..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__MODULE__="XENVBD";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>EnableAllWarnings</WarningLevel>
+      <DisableSpecificWarnings>4464;4548;4711;4820;4668;4255;5045;6001;6054;28121;28123;28160;28196;30030;30029;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnablePREfast>true</EnablePREfast>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <AdditionalDependencies>$(ProjectDir)..\$(ConfigurationName)\$(Platform)\xencrsh.lib;$(DDK_LIB_PATH)/storport.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+    </Link>
+    <Inf>
+      <SpecifyArchitecture>true</SpecifyArchitecture>
+      <SpecifyDriverVerDirectiveVersion>true</SpecifyDriverVerDirectiveVersion>
+      <TimeStamp>$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_NUMBER)</TimeStamp>
+      <EnableVerbose>true</EnableVerbose>
+    </Inf>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Inf>
+      <Architecture>x86</Architecture>
+    </Inf>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Inf>
+      <Architecture>amd64</Architecture>
+    </Inf>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <FilesToPackage Include="$(TargetPath)" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="../../src/xenvbd/buffer.c" />
+    <ClCompile Include="../../src/xenvbd/driver.c" />
+    <ClCompile Include="../../src/xenvbd/registry.c" />
+    <ClCompile Include="../../src/xenvbd/fdo.c" />
+    <ClCompile Include="../../src/xenvbd/frontend.c" />
+    <ClCompile Include="../../src/xenvbd/pdo.c" />
+    <ClCompile Include="../../src/xenvbd/pdoinquiry.c" />
+    <ClCompile Include="../../src/xenvbd/queue.c" />
+    <ClCompile Include="../../src/xenvbd/thread.c" />
+    <ClCompile Include="../../src/xenvbd/notifier.c" />
+    <ClCompile Include="../../src/xenvbd/blockring.c" />
+    <ClCompile Include="../../src/xenvbd/granter.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\src\xenvbd\xenvbd.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Inf Include="..\xenvbd.inf" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

diff --git a/vs2017/xenvbd/xenvbd.vcxproj.user b/vs2017/xenvbd/xenvbd.vcxproj.user
new file mode 100644 (file)
index 0000000..e1315db
--- /dev/null
+++ b/vs2017/xenvbd/xenvbd.vcxproj.user
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SignMode>TestSign</SignMode>
+    <TestCertificate>..\..\src\xenvbd.pfx</TestCertificate>
+    <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
+  </PropertyGroup>
+</Project>

diff --git a/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj b/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj
new file mode 100644 (file)
index 0000000..3b56283
--- /dev/null
+++ b/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\configs.props" />
+  <PropertyGroup Label="PropertySheets">
+    <DriverType>WDM</DriverType>
+    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{50C08437-C1F3-4349-BF6A-7B55A06BF999}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="..\targets.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <EnableInf2cat>false</EnableInf2cat>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>__MODULE__="XENVBD_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>EnableAllWarnings</WarningLevel>
+      <DisableSpecificWarnings>4127;4548;4711;4820;4668;4255;5045;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <EnablePREfast>true</EnablePREfast>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='false'">MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>../../src/coinst/xenvbd_coinst.def</ModuleDefinitionFile>
+      <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <FilesToPackage Include="$(TargetPath)" />
+    <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\coinst\coinst.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\coinst\xenvbd_coinst.def" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>

diff --git a/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj.user b/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj.user
new file mode 100644 (file)
index 0000000..b017ec2
--- /dev/null
+++ b/vs2017/xenvbd_coinst/xenvbd_coinst.vcxproj.user
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+       <PropertyGroup>
+               <SignMode>TestSign</SignMode>
+               <TestCertificate>..\..\src\xenvbd.pfx</TestCertificate>
+               <TimeStampServer>http://timestamp.verisign.com/scripts/timstamp.dll</TimeStampServer>
+       </PropertyGroup>
+</Project>