aboutsummaryrefslogtreecommitdiff
path: root/tap-win32/i386
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-04-25 21:37:49 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-04-25 21:37:49 +0000
commit657ecf14acc58a6d345341a5e36411bde5be9cd9 (patch)
tree4f5a53feb9c26991d822e2e606de511f57e32be6 /tap-win32/i386
parentForgot to add changelog item about OpenVPN GUI being (diff)
downloadopenvpn-657ecf14acc58a6d345341a5e36411bde5be9cd9.tar.xz
TAP driver now passes signing tests on Vista x64.
Added new settings to settings.in to better control build process. Removed some unneeded JYFIXMEs from source code. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1874 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to '')
-rwxr-xr-xtap-win32/i386/OemWin2k.inf.in66
1 files changed, 39 insertions, 27 deletions
diff --git a/tap-win32/i386/OemWin2k.inf.in b/tap-win32/i386/OemWin2k.inf.in
index a5450ad..2e3fcda 100755
--- a/tap-win32/i386/OemWin2k.inf.in
+++ b/tap-win32/i386/OemWin2k.inf.in
@@ -23,7 +23,11 @@
; not collide with other instances of TAP-Win32 defined
; by other apps. Multiple versions of the TAP-Win32
; driver, each installed by different apps, can coexist
-; on the same machine if you follow these guidelines:
+; on the same machine if you follow these guidelines.
+; NOTE: these instructions assume you are editing the
+; generated OemWin2k.inf file, not the source
+; OemWin2k.inf.in file which is preprocessed by winconfig
+; and uses macro definitions from settings.in.
;
; (1) Rename all tapXXXX instances in this file to
; something different (use at least 5 characters
@@ -44,7 +48,7 @@
[Version]
Signature = "$Windows NT$"
- CatalogFile = tap.cat
+ CatalogFile = @@PRODUCT_TAP_ID@@.cat
ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318}
Provider = %Provider%
Class = Net
@@ -54,17 +58,25 @@
DriverVer=@@PRODUCT_TAP_RELDATE@@,@@PRODUCT_TAP_MAJOR_VER@@.00.00.@@PRODUCT_TAP_MINOR_VER@@
[Strings]
- DeviceDescription = "TAP-Win32 Adapter V9"
- Provider = "TAP-Win32 Provider V9"
+ DeviceDescription = "@@PRODUCT_TAP_DEVICE_DESCRIPTION@@"
+ Provider = "@@PRODUCT_TAP_PROVIDER@@"
;----------------------------------------------------------------
; Manufacturer + Product Section (Done)
;----------------------------------------------------------------
[Manufacturer]
- %Provider% = tap0901
-
-[tap0901]
- %DeviceDescription% = tap0901.ndi, tap0901
+!ifdef AMD64
+ %Provider% = @@PRODUCT_TAP_ID@@, NTamd64
+!else
+ %Provider% = @@PRODUCT_TAP_ID@@
+!endif
+
+!ifdef AMD64
+[@@PRODUCT_TAP_ID@@.NTamd64]
+!else
+[@@PRODUCT_TAP_ID@@]
+!endif
+ %DeviceDescription% = @@PRODUCT_TAP_ID@@.ndi, @@PRODUCT_TAP_ID@@
;---------------------------------------------------------------
; Driver Section (Done)
@@ -79,23 +91,23 @@
; NCF_HAS_UI = 0x80
;----------------- Characteristics ------------
-[tap0901.ndi]
- CopyFiles = tap0901.driver, tap0901.files
- AddReg = tap0901.reg
- AddReg = tap0901.params.reg
- Characteristics = 0x81
+[@@PRODUCT_TAP_ID@@.ndi]
+ CopyFiles = @@PRODUCT_TAP_ID@@.driver, @@PRODUCT_TAP_ID@@.files
+ AddReg = @@PRODUCT_TAP_ID@@.reg
+ AddReg = @@PRODUCT_TAP_ID@@.params.reg
+ Characteristics = @@PRODUCT_TAP_CHARACTERISTICS@@
-[tap0901.ndi.Services]
- AddService = tap0901, 2, tap0901.service
+[@@PRODUCT_TAP_ID@@.ndi.Services]
+ AddService = @@PRODUCT_TAP_ID@@, 2, @@PRODUCT_TAP_ID@@.service
-[tap0901.reg]
- HKR, Ndi, Service, 0, "tap0901"
+[@@PRODUCT_TAP_ID@@.reg]
+ HKR, Ndi, Service, 0, "@@PRODUCT_TAP_ID@@"
HKR, Ndi\Interfaces, UpperRange, 0, "ndis5"
HKR, Ndi\Interfaces, LowerRange, 0, "ethernet"
HKR, , Manufacturer, 0, "%Provider%"
HKR, , ProductName, 0, "%DeviceDescription%"
-[tap0901.params.reg]
+[@@PRODUCT_TAP_ID@@.params.reg]
HKR, Ndi\params\MTU, ParamDesc, 0, "MTU"
HKR, Ndi\params\MTU, Type, 0, "int"
HKR, Ndi\params\MTU, Default, 0, "1500"
@@ -136,13 +148,13 @@
; SERVICE_DISABLED = 0x4
;---------- Start Mode ---------------
-[tap0901.service]
+[@@PRODUCT_TAP_ID@@.service]
DisplayName = %DeviceDescription%
ServiceType = 1
StartType = 3
ErrorControl = 1
LoadOrderGroup = NDIS
- ServiceBinary = %12%\tap0901.sys
+ ServiceBinary = %12%\@@PRODUCT_TAP_ID@@.sys
;-----------------------------------------------------------------
; File Installation
@@ -158,25 +170,25 @@
; 1 = "Intel Driver Disk 1",e100bex.sys,,
[SourceDisksNames]
- 1 = %DeviceDescription%, tap0901.sys
+ 1 = %DeviceDescription%, @@PRODUCT_TAP_ID@@.sys
; SourceDisksFiles
; filename_on_source = diskID[, [subdir][, size]]
; e100bex.sys = 1,, ; on distribution disk 1
[SourceDisksFiles]
-tap0901.sys = 1
+@@PRODUCT_TAP_ID@@.sys = 1
[DestinationDirs]
- tap0901.files = 11
- tap0901.driver = 12
+ @@PRODUCT_TAP_ID@@.files = 11
+ @@PRODUCT_TAP_ID@@.driver = 12
-[tap0901.files]
+[@@PRODUCT_TAP_ID@@.files]
; TapPanel.cpl,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
; cipsrvr.exe,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
-[tap0901.driver]
- tap0901.sys,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
+[@@PRODUCT_TAP_ID@@.driver]
+ @@PRODUCT_TAP_ID@@.sys,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
;---------------------------------------------------------------
; End