repository: C:/dev/kvm-guest-drivers-windows
branch: master
commit 4ab13fe7d8375604846bbc8a01f3a4ea44fafee2
Author: Yan Vugenfirer <[email protected]>
Date: Sun Oct 25 17:08:24 2009 +0200
[WIN-GUEST_DRIVERS] User Windows 7 DDK (build 7600.16385.0) as a default
build environment.
Signed-off-by: Yan Vugenfirer <[email protected]>
diff --git a/NetKVM/buildAll.bat b/NetKVM/buildAll.bat
index 47f6165..c4bb148 100644
--- a/NetKVM/buildAll.bat
+++ b/NetKVM/buildAll.bat
@@ -12,7 +12,7 @@
: to sign the drivers with your certificate. Change tools\makeinstall.bat if
needed
:
:
-if "%DDKVER%"=="" set DDKVER=6001.18001
+if "%DDKVER%"=="" set DDKVER=7600.16385.0
set BUILDROOT=C:\WINDDK\%DDKVER%
set X64ENV=x64
if "%DDKVER%"=="6000" set X64ENV=amd64
@@ -111,17 +111,18 @@ if not exist wxp\objfre_wnet_amd64\amd64\netkvm.sys goto
:eof
goto continue
+:Win2K compilation is no longer supported by Windows 7 DDK
:Win2K
-set DDKBUILDENV=
-pushd %BUILDROOT%
-call %BUILDROOT%\bin\setenv.bat %BUILDROOT% fre W2K
-popd
-call :preparebuild Common wxp VirtIO
-build -cZg
-
-if exist wxp\objfre_w2k_x86\i386\netkvm.sys call tools\makeinstall x86
wxp\objfre_w2k_x86\i386\netkvm.sys wxp\netkvm2k.inf %_VERSION_% 2K
-if not exist wxp\objfre_w2k_x86\i386\netkvm.sys goto :eof
-goto continue
+:set DDKBUILDENV=
+:pushd %BUILDROOT%
+:call %BUILDROOT%\bin\setenv.bat %BUILDROOT% fre W2K
+:popd
+:call :preparebuild Common wxp VirtIO
+:build -cZg
+
+:if exist wxp\objfre_w2k_x86\i386\netkvm.sys call tools\makeinstall x86
wxp\objfre_w2k_x86\i386\netkvm.sys wxp\netkvm2k.inf %_VERSION_% 2K
+:if not exist wxp\objfre_w2k_x86\i386\netkvm.sys goto :eof
+:goto continue
:installer
diff --git a/NetKVM/wlh/ParaNdis6-Driver.c b/NetKVM/wlh/ParaNdis6-Driver.c
index e7cf3ec..30357a2 100644
--- a/NetKVM/wlh/ParaNdis6-Driver.c
+++ b/NetKVM/wlh/ParaNdis6-Driver.c
@@ -982,8 +982,8 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT pDriverObject,
PUNICODE_STRING pRegistryPath
chars.MajorNdisVersion = NDIS_MINIPORT_MAJOR_VERSION;
chars.MinorNdisVersion = NDIS_MINIPORT_MINOR_VERSION;
/* stupid thing, they are at least short */
- chars.MajorDriverVersion = PARANDIS_MAJOR_DRIVER_VERSION;
- chars.MinorDriverVersion = PARANDIS_MINOR_DRIVER_VERSION;
+ chars.MajorDriverVersion = (UCHAR)PARANDIS_MAJOR_DRIVER_VERSION;
+ chars.MinorDriverVersion = (UCHAR)PARANDIS_MINOR_DRIVER_VERSION;
// possible value for regular miniport NDIS_WDM_DRIVER - for USB or 1394
// chars.Flags = 0;
diff --git a/viostor/buildAll.bat b/viostor/buildAll.bat
index e1fd35d..8d05802 100644
--- a/viostor/buildAll.bat
+++ b/viostor/buildAll.bat
@@ -1,7 +1,7 @@
:
: Set global parameters:
:
-if "%DDKVER%"=="" set DDKVER=6001.18001
+if "%DDKVER%"=="" set DDKVER=7600.16385.0
set BUILDROOT=C:\WINDDK\%DDKVER%
set X64ENV=x64
if "%DDKVER%"=="6000" set X64ENV=amd64
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
