]> xenbits.xensource.com Git - pvdrivers/win/xennet.git/commitdiff
projects / pvdrivers / win / xennet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 03c6694)
Resync with internal repository
authorBen Chalmers <Ben.Chalmers@citrix.com>
Fri, 21 Jun 2013 14:32:08 +0000 (15:32 +0100)
committerBen Chalmers <Ben.Chalmers@citrix.com>
Fri, 21 Jun 2013 14:32:08 +0000 (15:32 +0100)
changeset:   100:f205cb88430a
tag:         tip
user:        Ben Chalmers <ben.chalmers@citrix.com>
date:        Wed Jun 19 11:57:41 2013 +0100
summary:     [CP-4195] Add README.md and associated files to xennet

changeset:   99:a99774724570
user:        Owen Smith <owen.smith@citrix.com>
date:        Wed Jun 12 16:25:16 2013 +0100
summary:     update vcxproj files to correctly build when targetting Vista

changeset:   98:b037ead6effc
user:        Owen Smith <owen.smith@citrix.com>
date:        Tue Jun 11 15:02:23 2013 +0100
summary:     [CA-86240] Add sdv.py and supporting vcxproj changes

changeset:   97:142f3075f24f
user:        Paul Durrant <paul.durrant@citrix.com>
date:        Thu Jun 06 12:56:28 2013 +0100
summary:     Fix line endings

changeset:   96:7c1e5962d8d5
parent:      95:34f993bf0d23
parent:      94:567bcf20ab51
user:        Paul Durrant <paul.durrant@citrix.com>
date:        Thu Jun 06 12:55:47 2013 +0100
summary:     Merge

changeset:   95:34f993bf0d23
parent:      88:b28ade43dab8
user:        Paul Durrant <paul.durrant@citrix.com>
date:        Thu Jun 06 12:54:55 2013 +0100
summary:     Fix up some names to be clearer

changeset:   94:567bcf20ab51
user:        Ben Chalmers <ben.chalmers@citrix.com>
date:        Wed May 29 16:19:28 2013 +0100
summary:     [CP-4688] Add BSD licence header to inf file

15 files changed:
CHANGELOG [new file with mode: 0644] patch | blob
INSTALL.md [new file with mode: 0644] patch | blob
MAINTAINERS [new file with mode: 0644] patch | blob
README.md [new file with mode: 0644] patch | blob
build.py patch | blob | blame | history
proj/configs.props [new file with mode: 0644] patch | blob
proj/msbuild.bat patch | blob | blame | history
proj/package/package.vcxproj patch | blob | blame | history
proj/targets.props [new file with mode: 0644] patch | blob
proj/xennet.sln patch | blob | blame | history
proj/xennet/xennet.vcxproj patch | blob | blame | history
proj/xennet_coinst/xennet_coinst.vcxproj patch | blob | blame | history
sdv.py [new file with mode: 0644] patch | blob
src/xennet.inf patch | blob | blame | history
src/xennet/adapter.c patch | blob | blame | history

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644 (file)
index 0000000..00bf1f8
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+7.0.0 (2013-06-19):
+* Initial public release
diff --git a/INSTALL.md b/INSTALL.md
new file mode 100644 (file)
index 0000000..0c46f46
--- /dev/null
+++ b/INSTALL.md
@@ -0,0 +1,14 @@
+To install the XenServer Virtual Block Device Driver onto a XenServer Windows 
+guest VM:
+
+*    Copy xennet.sys, xennet_coinst.dll and xennet.inf onto the 
+     guest VM 
+*    Install xenbus.sys on the guest VM
+*    Install xenvif.sys on the guest VM 
+*    Copy dpinst.exe from the Windows driver kit into the same folder as
+     xennet.sys, xennet_coinst.dll and xennet.inf on the guest vm, ensuring 
+     the version of dpinst.exe matches the architecture of the version 
+     of Windows installed on your VM
+*    As administrator, run dpinst.exe on the guest vm
+*    If any warnings arise about unknown certificates, accept them
+
diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644 (file)
index 0000000..29c3dfd
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,41 @@
+List of maintainers and how to submit changes
+=============================================
+
+This is an early public release of the XenServer XenNet drivers.
+
+At the moment we are working hard on improving this early release, to make
+it easier to build and install and test on your own systems.  As such things 
+are in a state of flux, and we may well find it difficult to take submissions.
+
+We hope things will have improved by January 2014
+
+If you do wish to submit code, we recommend reaching out to the maintainers
+first, who will attempt to steer you in the right direction.
+
+We also request you follow these guidelines:
+
+1.  All submissions must be made under the terms of the "Developer's Certificate
+    of Origin" (DC) and should include a Signed-off-by: line.
+
+2.  All Submissions should use Unix line endings for consitency with the rest of
+    the XenServer project
+
+3.  Each patch should include a descriptive commit comment that helps understand
+    why the patch is necessary and why it works. This will be used both for
+    initial review and for new people to understand how the code works later
+
+4.  Make sure you have the right to submit any changes you make. If you do 
+    changes at work you may find your employer owns the patches instead of 
+    you.
+
+
+Maintainers List
+----------------
+
+* Paul Durrant <paul.durrant@citrix.com>
+
+* Owen Smith <owen.smith@citrix.com>
+
+* Ben Chalmers <ben.chalmers@citrix.com>
+
+
diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..50f9211
--- /dev/null
+++ b/README.md
@@ -0,0 +1,56 @@
+XenNet - The XenServer Windows Network Device Driver
+==========================================
+
+XenNet.sys is an NIDS 6 network device driver.  It replaces the emulated
+network device on a guest VM with a paravirtual network device which is
+able to offer faster, lower latency networking on a guest VM.
+
+There is an instance of the xennet device for each PV network device 
+that has been made available to the guest VM
+
+Quick Start
+===========
+
+Prerequisites to build
+----------------------
+
+*   Visual Studio 2012 or later 
+*   Windows Driver Kit 8 or later
+*   Python 3 or later 
+
+Environment variables used in building driver
+-----------------------------
+
+MAJOR\_VERSION Major version number
+
+MINOR\_VERSION Minor version number
+
+MICRO\_VERSION Micro version number
+
+BUILD\_NUMBER Build number
+
+SYMBOL\_SERVER location of a writable symbol server directory
+
+KIT location of the Windows driver kit
+
+PROCESSOR\_ARCHITECTURE x86 or x64
+
+VS location of visual studio
+
+Commands to build
+-----------------
+
+    git clone http://github.com/xenserver/win-xennet
+    cd win-xennet
+    .\build.py [checked | free]
+
+Device tree diagram
+-------------------
+
+    XenNet XenNet
+        |    | 
+        XenVif
+           |
+        XenBus
+           |
+        PCI Bus      
diff --git a/build.py b/build.py
index 9778c4176cfc99b702ebce0a1e639ae977470877..bee6ce7f70a96efac14e0c3c0895679641383feb 100644 (file)
--- a/build.py
+++ b/build.py
@@ -134,8 +134,8 @@ def get_configuration_name(debug):
 def get_target_path(arch, debug):
     configuration = get_configuration_name(debug)
 
-    target = { 'x86': 'proj', 'x64': os.sep.join(['proj', 'x64']) }
-    target_path = os.sep.join([target[arch], configuration])
+    target = { 'x86': os.sep.join([configuration, 'Win32']), 'x64': os.sep.join([configuration, 'x64']) }
+    target_path = os.sep.join(['proj', target[arch]])
 
     return target_path
 
@@ -162,8 +162,6 @@ def msbuild(name, arch, debug):
     cwd = os.getcwd()
     configuration = get_configuration(debug)
 
-    os.environ['SOLUTION'] = name
-
     if arch == 'x86':
         os.environ['PLATFORM'] = 'Win32'
     elif arch == 'x64':
@@ -171,6 +169,8 @@ def msbuild(name, arch, debug):
 
     os.environ['CONFIGURATION'] = configuration
     os.environ['TARGET'] = 'Build'
+    os.environ['BUILD_ARGS'] = '/p:SignMode="ProductionSign"'
+    os.environ['BUILD_FILE'] = name + '.sln'
 
     os.chdir('proj')
     status = shell('msbuild.bat')
@@ -298,4 +298,3 @@ if __name__ == '__main__':
     archive(driver + '\\source.tgz', listfile.splitlines(), tgz=True)
     archive(driver + '.tar', [driver,'revision'])
 
-
diff --git a/proj/configs.props b/proj/configs.props
new file mode 100644 (file)
index 0000000..2567bcf
--- /dev/null
+++ b/proj/configs.props
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
+       <ItemGroup Label="ProjectConfigurations"> 
+               <ProjectConfiguration Include="Windows 8 Debug|Win32"> 
+                       <Configuration>Windows 8 Debug</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 7 Debug|Win32"> 
+                       <Configuration>Windows 7 Debug</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows Vista Debug|Win32"> 
+                       <Configuration>Windows Vista Debug</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 8 Release|Win32"> 
+                       <Configuration>Windows 8 Release</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 7 Release|Win32"> 
+                       <Configuration>Windows 7 Release</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows Vista Release|Win32"> 
+                       <Configuration>Windows Vista Release</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 8 Debug|x64"> 
+                       <Configuration>Windows8 Debug</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 7 Debug|x64"> 
+                       <Configuration>Windows 7 Debug</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows Vista Debug|x64"> 
+                       <Configuration>Windows Vista Debug</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 8 Release|x64"> 
+                       <Configuration>Windows 8 Release</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 7 Release|x64"> 
+                       <Configuration>Windows 7 Release</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows Vista Release|x64"> 
+                       <Configuration>Windows Vista Release</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+       </ItemGroup> 
+</Project>
\ No newline at end of file
diff --git a/proj/msbuild.bat b/proj/msbuild.bat
index 0d3f6cb81eb18ca6feae714f23493931daf1e0d4..143feb1151db44fa7dd636c7fde79da425301173 100644 (file)
--- a/proj/msbuild.bat
+++ b/proj/msbuild.bat
@@ -1,5 +1,5 @@
 call "%VS%\VC\vcvarsall.bat" x86
-msbuild.exe /m:4 /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" /t:"%TARGET%" /p:SignMode="ProductionSign" %SOLUTION%.sln
+msbuild.exe /m:4 /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" /t:"%TARGET%" %BUILD_ARGS% %BUILD_FILE%
 if errorlevel 1 goto error
 exit 0
 
diff --git a/proj/package/package.vcxproj b/proj/package/package.vcxproj
index faddfee409fa2850a3af7ff685f1fbaf3ba410dd..433d4074a1b261647a0f13b18dfa71f4865c9da9 100644 (file)
--- a/proj/package/package.vcxproj
+++ b/proj/package/package.vcxproj
@@ -1,161 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Windows Developer Preview Debug|Win32">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|Win32">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|Win32">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|Win32">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|Win32">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|Win32">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Debug|x64">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|x64">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|x64">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|x64">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|x64">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|x64">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{445FD18F-97E3-4E5D-825F-151026242C05}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets">
-    <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset>
-    <ConfigurationType>Utility</ConfigurationType>
-    <DriverType>Package</DriverType>
-    <Configuration>Windows Developer Preview Debug</Configuration>
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <EnableInf2cat>true</EnableInf2cat>
-    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='x64'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform);Server2008R2_$(DDKPlatform)</Inf2CatWindowsVersionList>
-    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='Win32'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform)</Inf2CatWindowsVersionList>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-    <EnableDeployment>False</EnableDeployment>
-    <ImportToStore>False</ImportToStore>
-    <InstallMode>None</InstallMode>
-    <HardwareIdString />
-    <CommandLine />
-    <ScriptPath />
-    <DeployFiles />
-    <ScriptName />
-    <ScriptDeviceQuery>%PathToInf%</ScriptDeviceQuery>
-    <EnableVerifier>False</EnableVerifier>
-    <AllDrivers>False</AllDrivers>
-    <VerifyProjectOutput>True</VerifyProjectOutput>
-    <VerifyDrivers />
-    <VerifyFlags>133563</VerifyFlags>
-    <PackageDir>..\..\xennet\$(DDKPlatform)</PackageDir>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\xennet\xennet.vcxproj">
-      <Project>{97D9942B-5EA3-488C-B512-C96E5D077F8E}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\xennet_coinst\xennet_coinst.vcxproj">
-      <Project>{3EDD837A-C1BE-47D4-9603-16B61353670B}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
-    <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+       <Import Project="..\configs.props" />
+
+       <PropertyGroup Label="PropertySheets">
+               <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset>
+               <ConfigurationType>Utility</ConfigurationType>
+               <DriverType>Package</DriverType>
+               <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+       </PropertyGroup>
+       <PropertyGroup Label="Globals">
+               <Configuration>Windows Vista Debug</Configuration>
+               <Platform Condition="'$(Platform)' == ''">Win32</Platform> 
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> 
+       </PropertyGroup>
+       
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+       
+       <PropertyGroup Label="Globals">
+               <ProjectGuid>{445FD18F-97E3-4E5D-825F-151026242C05}</ProjectGuid>
+       </PropertyGroup>
+       
+       <Import Project="..\targets.props" />
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
+
+       <PropertyGroup>
+               <EnableInf2cat>true</EnableInf2cat>
+               <Inf2CatWindowsVersionList Condition="'$(Platform)'=='x64'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform);Server2008R2_$(DDKPlatform)</Inf2CatWindowsVersionList>
+               <Inf2CatWindowsVersionList Condition="'$(Platform)'=='Win32'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform)</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>
+               <PackageDir>..\..\xennet\$(DDKPlatform)</PackageDir>
+       </PropertyGroup>
+
+       <ItemGroup>
+               <ProjectReference Include="..\xennet\xennet.vcxproj">
+                       <Project>{97D9942B-5EA3-488C-B512-C96E5D077F8E}</Project>
+               </ProjectReference>
+               <ProjectReference Include="..\xennet_coinst\xennet_coinst.vcxproj">
+                       <Project>{3EDD837A-C1BE-47D4-9603-16B61353670B}</Project>
+               </ProjectReference>
+       </ItemGroup>
+       <ItemGroup>
+               <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
+               <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
+       </ItemGroup>
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+       <ImportGroup Label="ExtensionTargets">
+       </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/proj/targets.props b/proj/targets.props
new file mode 100644 (file)
index 0000000..c8aba92
--- /dev/null
+++ b/proj/targets.props
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+       <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>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'"> 
+               <TargetVersion>Vista</TargetVersion> 
+               <UseDebugLibraries>true</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'"> 
+               <TargetVersion>Vista</TargetVersion> 
+               <UseDebugLibraries>false</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'"> 
+               <TargetVersion>Vista</TargetVersion> 
+               <UseDebugLibraries>true</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'"> 
+               <TargetVersion>Vista</TargetVersion> 
+               <UseDebugLibraries>false</UseDebugLibraries> 
+       </PropertyGroup>
+</Project>
diff --git a/proj/xennet.sln b/proj/xennet.sln
index 93bb6df943ce6aafbdccab84e085cde9914d72ee..b3da7b9230b8207e77bf5caa2f47c904888f6a47 100644 (file)
--- a/proj/xennet.sln
+++ b/proj/xennet.sln
@@ -15,10 +15,10 @@ Global
                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 Developer Preview Debug|Win32 = Windows Developer Preview Debug|Win32
-               Windows Developer Preview Debug|x64 = Windows Developer Preview Debug|x64
-               Windows Developer Preview Release|Win32 = Windows Developer Preview Release|Win32
-               Windows Developer Preview Release|x64 = Windows Developer Preview 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 Vista Debug|Win32 = Windows Vista Debug|Win32
                Windows Vista Debug|x64 = Windows Vista Debug|x64
                Windows Vista Release|Win32 = Windows Vista Release|Win32
@@ -37,18 +37,18 @@ Global
                {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
                {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
                {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 7 Release|x64.Deploy.0 = Windows 7 Release|x64
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Debug|Win32.ActiveCfg = Windows Developer Preview Debug|Win32
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Debug|Win32.Build.0 = Windows Developer Preview Debug|Win32
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Debug|Win32.Deploy.0 = Windows Developer Preview Debug|Win32
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Debug|x64.ActiveCfg = Windows Developer Preview Debug|x64
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Debug|x64.Build.0 = Windows Developer Preview Debug|x64
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Debug|x64.Deploy.0 = Windows Developer Preview Debug|x64
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Release|Win32.ActiveCfg = Windows Developer Preview Release|Win32
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Release|Win32.Build.0 = Windows Developer Preview Release|Win32
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Release|Win32.Deploy.0 = Windows Developer Preview Release|Win32
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Release|x64.ActiveCfg = Windows Developer Preview Release|x64
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Release|x64.Build.0 = Windows Developer Preview Release|x64
-               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Developer Preview Release|x64.Deploy.0 = Windows Developer Preview Release|x64
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Debug|Win32.Deploy.0 = Windows 8 Debug|Win32
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Debug|x64.Deploy.0 = Windows 8 Debug|x64
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Release|Win32.Deploy.0 = Windows 8 Release|Win32
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
+               {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows 8 Release|x64.Deploy.0 = Windows 8 Release|x64
                {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Vista Debug|Win32.ActiveCfg = Windows Vista Debug|Win32
                {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Vista Debug|Win32.Build.0 = Windows Vista Debug|Win32
                {3EDD837A-C1BE-47D4-9603-16B61353670B}.Windows Vista Debug|Win32.Deploy.0 = Windows Vista Debug|Win32
@@ -73,18 +73,18 @@ Global
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 7 Release|x64.Deploy.0 = Windows 7 Release|x64
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Debug|Win32.ActiveCfg = Windows Developer Preview Debug|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Debug|Win32.Build.0 = Windows Developer Preview Debug|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Debug|Win32.Deploy.0 = Windows Developer Preview Debug|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Debug|x64.ActiveCfg = Windows Developer Preview Debug|x64
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Debug|x64.Build.0 = Windows Developer Preview Debug|x64
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Debug|x64.Deploy.0 = Windows Developer Preview Debug|x64
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Release|Win32.ActiveCfg = Windows Developer Preview Release|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Release|Win32.Build.0 = Windows Developer Preview Release|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Release|Win32.Deploy.0 = Windows Developer Preview Release|Win32
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Release|x64.ActiveCfg = Windows Developer Preview Release|x64
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Release|x64.Build.0 = Windows Developer Preview Release|x64
-               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Developer Preview Release|x64.Deploy.0 = Windows Developer Preview Release|x64
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Debug|Win32.Deploy.0 = Windows 8 Debug|Win32
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Debug|x64.Deploy.0 = Windows 8 Debug|x64
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Release|Win32.Deploy.0 = Windows 8 Release|Win32
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
+               {445FD18F-97E3-4E5D-825F-151026242C05}.Windows 8 Release|x64.Deploy.0 = Windows 8 Release|x64
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Vista Debug|Win32.ActiveCfg = Windows Vista Debug|Win32
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Vista Debug|Win32.Build.0 = Windows Vista Debug|Win32
                {445FD18F-97E3-4E5D-825F-151026242C05}.Windows Vista Debug|Win32.Deploy.0 = Windows Vista Debug|Win32
@@ -109,18 +109,18 @@ Global
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 7 Release|x64.Deploy.0 = Windows 7 Release|x64
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Debug|Win32.ActiveCfg = Windows Developer Preview Debug|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Debug|Win32.Build.0 = Windows Developer Preview Debug|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Debug|Win32.Deploy.0 = Windows Developer Preview Debug|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Debug|x64.ActiveCfg = Windows Developer Preview Debug|x64
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Debug|x64.Build.0 = Windows Developer Preview Debug|x64
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Debug|x64.Deploy.0 = Windows Developer Preview Debug|x64
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Release|Win32.ActiveCfg = Windows Developer Preview Release|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Release|Win32.Build.0 = Windows Developer Preview Release|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Release|Win32.Deploy.0 = Windows Developer Preview Release|Win32
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Release|x64.ActiveCfg = Windows Developer Preview Release|x64
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Release|x64.Build.0 = Windows Developer Preview Release|x64
-               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Developer Preview Release|x64.Deploy.0 = Windows Developer Preview Release|x64
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Debug|Win32.Deploy.0 = Windows 8 Debug|Win32
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Debug|x64.Deploy.0 = Windows 8 Debug|x64
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Release|Win32.Deploy.0 = Windows 8 Release|Win32
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
+               {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows 8 Release|x64.Deploy.0 = Windows 8 Release|x64
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Vista Debug|Win32.ActiveCfg = Windows Vista Debug|Win32
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Vista Debug|Win32.Build.0 = Windows Vista Debug|Win32
                {97D9942B-5EA3-488C-B512-C96E5D077F8E}.Windows Vista Debug|Win32.Deploy.0 = Windows Vista Debug|Win32
diff --git a/proj/xennet/xennet.vcxproj b/proj/xennet/xennet.vcxproj
index 925df099ed0f75431d29dd126d624a69ff2cc17a..dff77925511548a5f7e01f966eedb69ee67a0640 100644 (file)
--- a/proj/xennet/xennet.vcxproj
+++ b/proj/xennet/xennet.vcxproj
@@ -1,190 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Windows Developer Preview Debug|Win32">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|Win32">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|Win32">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|Win32">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|Win32">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|Win32">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Debug|x64">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|x64">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|x64">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|x64">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|x64">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|x64">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{97D9942B-5EA3-488C-B512-C96E5D077F8E}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <ProjectName>xennet</ProjectName>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets">
-    <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>WDM</DriverType>
-    <Configuration>Windows Developer Preview Debug</Configuration>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <EnableInf2cat>false</EnableInf2cat>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__i386__;__MODULE__="XENNET";NDIS_MINIPORT_DRIVER;NDIS60_MINIPORT=1;POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalDependencies>$(DDK_LIB_PATH)\ndis.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Inf>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <Architecture>x86</Architecture>
-      <SpecifyDriverVerDirectiveVersion>true</SpecifyDriverVerDirectiveVersion>
-      <TimeStamp>$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_NUMBER)</TimeStamp>
-      <EnableVerbose>true</EnableVerbose>
-    </Inf>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__x86_64__;__MODULE__="XENNET";NDIS_MINIPORT_DRIVER;NDIS60_MINIPORT=1;POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>$(DDK_LIB_PATH)\ndis.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Inf>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <Architecture>amd64</Architecture>
-      <SpecifyDriverVerDirectiveVersion>true</SpecifyDriverVerDirectiveVersion>
-      <TimeStamp>$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_NUMBER)</TimeStamp>
-      <EnableVerbose>true</EnableVerbose>
-    </Inf>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <FilesToPackage Include="$(TargetPath)" />
-    <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="../../src/xennet/adapter.c" />
-    <ClCompile Include="../../src/xennet/main.c" />
-    <ClCompile Include="../../src/xennet/miniport.c" />
-    <ClCompile Include="../../src/xennet/receiver.c" />
-    <ClCompile Include="../../src/xennet/transmitter.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\xennet\xennet.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Inf Include="..\xennet.inf" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+       <Import Project="..\configs.props" />
+
+       <PropertyGroup Label="PropertySheets">
+               <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset> 
+               <ConfigurationType>Driver</ConfigurationType>
+               <DriverType>WDM</DriverType>
+       </PropertyGroup>
+       <PropertyGroup Label="Globals">
+               <Configuration>Windows Vista Debug</Configuration>
+               <Platform Condition="'$(Platform)' == ''">Win32</Platform> 
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> 
+       </PropertyGroup>
+       
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+       
+       <PropertyGroup Label="Globals">
+               <ProjectGuid>{97D9942B-5EA3-488C-B512-C96E5D077F8E}</ProjectGuid>
+       </PropertyGroup>
+       
+       <Import Project="..\targets.props" />
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
+
+       <PropertyGroup>
+               <IncludePath>..\..\include;$(IncludePath)</IncludePath>
+               <RunCodeAnalysis>true</RunCodeAnalysis>
+               <EnableInf2cat>false</EnableInf2cat>
+               <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)</IntDir>
+               <OutDir>..\$(ConfigurationName)\$(Platform)</OutDir>
+       </PropertyGroup>
+       
+       <ItemDefinitionGroup>
+               <ClCompile>
+                       <PreprocessorDefinitions>__MODULE__="XENNET";NDIS_MINIPORT_DRIVER;NDIS60_MINIPORT=1;POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+                       <WarningLevel>EnableAllWarnings</WarningLevel>
+                       <DisableSpecificWarnings>4711;4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+                       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+                       <EnablePREfast>true</EnablePREfast>
+               </ClCompile>
+               <Link>
+                       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+                       <AdditionalDependencies>$(DDK_LIB_PATH)\ndis.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/xennet/adapter.c" />
+               <ClCompile Include="../../src/xennet/main.c" />
+               <ClCompile Include="../../src/xennet/miniport.c" />
+               <ClCompile Include="../../src/xennet/receiver.c" />
+               <ClCompile Include="../../src/xennet/transmitter.c" />
+       </ItemGroup>
+       <ItemGroup>
+               <ResourceCompile Include="..\..\src\xennet\xennet.rc" />
+       </ItemGroup>
+       <ItemGroup>
+               <Inf Include="..\xennet.inf" />
+       </ItemGroup>
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
diff --git a/proj/xennet_coinst/xennet_coinst.vcxproj b/proj/xennet_coinst/xennet_coinst.vcxproj
index a98e7078a5102a01ca3065ef74b4ca352f80c19d..ddede46684fbdc3ed9bfbab63feb5672e7ce4dbc 100644 (file)
--- a/proj/xennet_coinst/xennet_coinst.vcxproj
+++ b/proj/xennet_coinst/xennet_coinst.vcxproj
@@ -1,177 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Windows Developer Preview Debug|Win32">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|Win32">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|Win32">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|Win32">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|Win32">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|Win32">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Debug|x64">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|x64">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|x64">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|x64">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|x64">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|x64">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3EDD837A-C1BE-47D4-9603-16B61353670B}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <ProjectName>xennet_coinst</ProjectName>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets">
-    <PlatformToolset>WindowsApplicationForDrivers8.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <DriverType>WDM</DriverType>
-    <Configuration>Windows Developer Preview Debug</Configuration>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <EnableInf2cat>false</EnableInf2cat>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__i386__;__MODULE__="XENNET_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;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/xennet_coinst.def</ModuleDefinitionFile>
-      <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__x86_64__;__MODULE__="XENNET_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;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/xennet_coinst.def</ModuleDefinitionFile>
-      <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </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\xennet_coinst.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+       <Import Project="..\configs.props" />
+
+       <PropertyGroup Label="PropertySheets">
+               <PlatformToolset>WindowsApplicationForDrivers8.0</PlatformToolset>
+               <ConfigurationType>DynamicLibrary</ConfigurationType>
+               <DriverType>WDM</DriverType>
+       </PropertyGroup>
+       <PropertyGroup Label="Globals">
+               <Configuration>Windows Vista Debug</Configuration>
+               <Platform Condition="'$(Platform)' == ''">Win32</Platform> 
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> 
+       </PropertyGroup>
+       
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+       
+       <PropertyGroup Label="Globals">
+               <ProjectGuid>{3EDD837A-C1BE-47D4-9603-16B61353670B}</ProjectGuid>
+       </PropertyGroup>
+       
+       <Import Project="..\targets.props" />
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
+
+       <PropertyGroup>
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+               <IncludePath>..\..\include;$(IncludePath)</IncludePath>
+               <RunCodeAnalysis>true</RunCodeAnalysis>
+               <EnableInf2cat>false</EnableInf2cat>
+               <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
+               <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
+       </PropertyGroup>
+       
+       <ItemDefinitionGroup>
+               <ClCompile>
+                       <PreprocessorDefinitions>__MODULE__="XENNET_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+                       <WarningLevel>EnableAllWarnings</WarningLevel>
+                       <DisableSpecificWarnings>4548;4820;4668;4255;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/xennet_coinst.def</ModuleDefinitionFile>
+                       <AdditionalDependencies>setupapi.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\coinst\coinst.c" />
+       </ItemGroup>
+       <ItemGroup>
+               <None Include="..\..\src\coinst\xennet_coinst.def" />
+       </ItemGroup>
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file
diff --git a/sdv.py b/sdv.py
new file mode 100644 (file)
index 0000000..069b126
--- /dev/null
+++ b/sdv.py
@@ -0,0 +1,60 @@
+#!python -u
+
+import os, sys
+import datetime
+import re
+import glob
+import tarfile
+import subprocess
+
+def shell(command):
+    print(command)
+    sys.stdout.flush()
+
+    pipe = os.popen(command, 'r', 1)
+
+    for line in pipe:
+        print(line.rstrip())
+
+    return pipe.close()
+
+class msbuild_failure(Exception):
+    def __init__(self, value):
+        self.value = value
+    def __str__(self):
+        return repr(self.value)
+
+def msbuild(name, target, sdv_arg):
+    cwd = os.getcwd()
+
+    os.environ['CONFIGURATION'] = 'Windows 8 Release'
+    os.environ['PLATFORM'] = 'x64'
+    os.environ['TARGET'] = target
+    os.environ['BUILD_FILE'] = name + '.vcxproj'
+    os.environ['BUILD_ARGS'] = sdv_arg
+
+    os.chdir('proj')
+    os.chdir(name)
+    status = shell('..\\msbuild.bat')
+    os.chdir(cwd)
+
+#    if (status != None):
+#        raise msbuild_failure(sdv_arg)
+
+def archive(filename, files, tgz=False):
+    access='w'
+    if tgz:
+        access='w:gz'
+    tar = tarfile.open(filename, access)
+    for name in files :
+        try:
+            print('adding '+name)
+            tar.add(name)
+        except:
+            pass
+    tar.close()
+
+if __name__ == '__main__':
+    msbuild('xennet', 'sdv', '/p:Inputs="/clean"')
+    msbuild('xennet', 'sdv', '/p:Inputs="/check:default.sdv"')
+    msbuild('xennet', 'dvl', '')
diff --git a/src/xennet.inf b/src/xennet.inf
index 51abf8a71b46b2dc9e5781ac8aec387160ab4bb2..40778265ab9d0e807d1d913731cfa2a1d78fb16a 100644 (file)
--- a/src/xennet.inf
+++ b/src/xennet.inf
@@ -1,6 +1,32 @@
-; Copyright 2011 Citrix Systems Inc. All rights reserved.
-; Use is subject to license terms.
-; 
+; Copyright (c) Citrix Systems Inc.
+; All rights reserved.
+;
+; Redistribution and use in source and binary forms, 
+; with or without modification, are permitted provided 
+; that the following conditions are met:
+;
+; *   Redistributions of source code must retain the above 
+;     copyright notice, this list of conditions and the 
+;     following disclaimer.
+; *   Redistributions in binary form must reproduce the above 
+;     copyright notice, this list of conditions and the 
+;     following disclaimer in the documentation and/or other 
+;     materials provided with the distribution.
+;
+; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+; CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+; INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+; MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
+; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+; BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+; SUCH DAMAGE
  
 [Version] 
 Signature="$Windows NT$" 
diff --git a/src/xennet/adapter.c b/src/xennet/adapter.c
index 496853a9ee815f71ea0cb4d0ca0732fa88217039..2b8b1638d10649eb46d879966b6c4996afc71cd5 100644 (file)
--- a/src/xennet/adapter.c
+++ b/src/xennet/adapter.c
@@ -934,7 +934,7 @@ AdapterQueryInformation (
                 Adapter->VifInterface,
                 (PETHERNET_ADDRESS)&infoData);
             info = &infoData;
-            bytesAvailable = ETH_LENGTH_OF_ADDRESS;
+            bytesAvailable = sizeof (ETHERNET_ADDRESS);
             break;
 
         case OID_802_3_CURRENT_ADDRESS:
@@ -942,21 +942,25 @@ AdapterQueryInformation (
                 Adapter->VifInterface,
                 (PETHERNET_ADDRESS)&infoData);
             info = &infoData;
-            bytesAvailable = ETH_LENGTH_OF_ADDRESS;
+            bytesAvailable = sizeof (ETHERNET_ADDRESS);
             break;
 
         case OID_GEN_MAXIMUM_FRAME_SIZE:
-            infoData = Adapter->MaximumFrameSize - sizeof (ETHERNET_HEADER);
+            infoData = Adapter->MaximumFrameSize -
+                       sizeof (ETHERNET_TAGGED_HEADER);
             info = &infoData;
             bytesAvailable = sizeof(ULONG);
             break;
-        case OID_GEN_MAXIMUM_TOTAL_SIZE: {
-            infoData = Adapter->MaximumFrameSize - 4;
+
+        case OID_GEN_MAXIMUM_TOTAL_SIZE:
+            infoData = Adapter->MaximumFrameSize -
+                       sizeof (ETHERNET_TAGGED_HEADER) +
+                       sizeof (ETHERNET_UNTAGGED_HEADER);
 
             info = &infoData;
             bytesAvailable = sizeof(ULONG);
             break;
-        }
+
         case OID_GEN_CURRENT_LOOKAHEAD:
             infoData = Adapter->CurrentLookahead;
             info = &infoData;
@@ -1425,7 +1429,7 @@ AdapterSetGeneralAttributes (
         Adapter->VifInterface,
         (PULONG)&Adapter->MaximumFrameSize);
 
-    generalAttributes.MtuSize = Adapter->MaximumFrameSize - sizeof (ETHERNET_HEADER);
+    generalAttributes.MtuSize = Adapter->MaximumFrameSize - sizeof (ETHERNET_TAGGED_HEADER);
     generalAttributes.MaxXmitLinkSpeed = XENNET_MEDIA_MAX_SPEED;
     generalAttributes.MaxRcvLinkSpeed = XENNET_MEDIA_MAX_SPEED;
     generalAttributes.XmitLinkSpeed = XENNET_MEDIA_MAX_SPEED;
Windows PV Network Device Driver