aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--domake-win2
-rw-r--r--install-win32/ddk-common2
-rw-r--r--install-win32/maketap7
-rw-r--r--install-win32/maketapinstall5
-rwxr-xr-xinstall-win32/openvpn.nsi2
-rw-r--r--install-win32/settings.in3
-rwxr-xr-xtap-win32/prototypes.h2
-rwxr-xr-xtap-win32/tapdrvr.c8
8 files changed, 20 insertions, 11 deletions
diff --git a/domake-win b/domake-win
index 7991bea..48eba55 100644
--- a/domake-win
+++ b/domake-win
@@ -14,7 +14,7 @@
# msysDTK -- for perl
# NSIS -- for building installer
# svn -- for checking out source code (or TortoiseSVN)
-# Windows Driver Kit, Vista RC1 (5600) -- for building TAP driver + tapinstall
+# Windows Driver Kit (6001_17121_HyperV_WDK.iso) -- for building TAP driver + tapinstall
#
# Required libraries (must be prebuilt)
#
diff --git a/install-win32/ddk-common b/install-win32/ddk-common
new file mode 100644
index 0000000..b45c9e5
--- /dev/null
+++ b/install-win32/ddk-common
@@ -0,0 +1,2 @@
+# DDKs <= 5600 use "AMD64", later use "x64"
+x64_tag=x64
diff --git a/install-win32/maketap b/install-win32/maketap
index 3082db7..7fe643c 100644
--- a/install-win32/maketap
+++ b/install-win32/maketap
@@ -6,12 +6,15 @@
# get version.nsi definitions
. autodefs/defs.sh
+# common declarations for all DDK build targets
+. install-win32/ddk-common
+
if [ -n "$PRODUCT_TAP_DEBUG" ] ; then
w2ktarget="w2k c"
- amdtarget="chk AMD64 WNET"
+ amdtarget="chk $x64_tag WNET"
else
w2ktarget="w2k f"
- amdtarget="fre AMD64 WNET"
+ amdtarget="fre $x64_tag WNET"
fi
if [ -z "$DRVBINSRC" ] ; then
diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
index 781380e..8b06a99 100644
--- a/install-win32/maketapinstall
+++ b/install-win32/maketapinstall
@@ -13,9 +13,12 @@ if ! [ -d "$TISRC" ] ; then
exit 1
fi
+# common declarations for all DDK build targets
+. install-win32/ddk-common
+
amdtarget=""
if [ -z "$TI_BIN_AMD64" ]; then
- amdtarget="fre AMD64 WNET"
+ amdtarget="fre $x64_tag WNET"
fi
if [ -z "$DRVBINSRC" ] ; then
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index 64d6f3a..1c0e00e 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -110,7 +110,7 @@
LangString DESC_SecOpenSSLDLLs ${LANG_ENGLISH} "Install OpenSSL DLLs locally (may be omitted if DLLs are already installed globally)."
- LangString DESC_SecPKCS11LDLLs ${LANG_ENGLISH} "Install PKCS#11 helper DLLs locally (may be omitted if DLLs are already installed globally)."
+ LangString DESC_SecPKCS11DLLs ${LANG_ENGLISH} "Install PKCS#11 helper DLLs locally (may be omitted if DLLs are already installed globally)."
LangString DESC_SecTAP ${LANG_ENGLISH} "Install/Upgrade the TAP-Win32 virtual device driver. Will not interfere with CIPE."
diff --git a/install-win32/settings.in b/install-win32/settings.in
index b233686..517236a 100644
--- a/install-win32/settings.in
+++ b/install-win32/settings.in
@@ -60,7 +60,8 @@
# DDK Version.
# DDK distribution is assumed to be in C:\WINDDK\${DDKVER}
-!define DDKVER 5600
+!define DDKVER 6001.17121
+!define DDKVER_MAJOR 6001
# Code Signing.
# If undefined, don't sign any files.
diff --git a/tap-win32/prototypes.h b/tap-win32/prototypes.h
index 788670c..f7d09f6 100755
--- a/tap-win32/prototypes.h
+++ b/tap-win32/prototypes.h
@@ -187,7 +187,7 @@ VOID HookDispatchFunctions();
#if ENABLE_NONADMIN
-#if DDKVER < 5600
+#if DDKVER_MAJOR < 5600
/*
* Better solution for use on Vista DDK, but possibly not compatible with
* earlier DDKs:
diff --git a/tap-win32/tapdrvr.c b/tap-win32/tapdrvr.c
index 989b44c..ca02d13 100755
--- a/tap-win32/tapdrvr.c
+++ b/tap-win32/tapdrvr.c
@@ -40,8 +40,8 @@
//======================================================
#include "../../autodefs/defs.h"
-#ifndef DDKVER
-#error DDKVER must be defined to the DDK Version as in c:\WinDDK\[DDKVER]\...
+#ifndef DDKVER_MAJOR
+#error DDKVER_MAJOR must be defined as the major number of the DDK Version
#endif
#define NDIS_MINIPORT_DRIVER
@@ -70,7 +70,7 @@
//========================================================
#define ENABLE_NONADMIN 1
-#if DDKVER < 5600
+#if DDKVER_MAJOR < 5600
#include <ndis.h>
#include <ntstrsafe.h>
#include <ntddk.h>
@@ -419,7 +419,7 @@ NDIS_STATUS AdapterCreate
}
}
} else {
-#if DDKVER < 5600
+#if DDKVER_MAJOR < 5600
/* "MiniportName" is available only XP and above. Not on Windows 2000. */
NDIS_STRING key = NDIS_STRING_CONST("NdisVersion");
NdisReadConfiguration (&status, &parm, configHandle, &key, NdisParameterInteger);