mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 03:52:28 +02:00
Code

Upgraded TAP build scripts to use WDK 6001.17121

Browse Source 
(Windows 2008 Server pre-RTM).

Fixed typo of DESC_SecPKCS11DLLs in openvpn.nsi.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2651 e7ae566f-a301-0410-adde-c780ea21d3b5
This commit is contained in:
james 2008-01-22 23:52:08 +00:00
parent f02576fa8b
commit 44b3dcc892
8 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
domake-win
View File

@ -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)
#

2
install-win32/ddk-common Normal file
View File

@ -0,0 +1,2 @@
# DDKs <= 5600 use "AMD64", later use "x64"
x64_tag=x64

7
install-win32/maketap
View File

@ -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

5
install-win32/maketapinstall
View File

@ -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

2
install-win32/openvpn.nsi
View File

@ -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."

3
install-win32/settings.in
View File

@ -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.

2
tap-win32/prototypes.h
View File

@ -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:

8
tap-win32/tapdrvr.c
View File

@ -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);