Renamed TAP-Win32 driver from tap0801.sys to tap0901.sys

to reflect the fact that Vista has blacklisted the tap0801.sys
file name due to previous compatibility issues which have now
been resolved.  TAP-Win32 major/minor version number is now 9/1.

Windows installer will delete a previously installed
tap0801.sys TAP driver before installing tap0901.sys.

Added code to Windows installer to fail gracefully on 64 bit
installs until 64-bit TAP driver issues can be resolved.

Added code to Windows installer to fail gracefully on
versions of Windows which are not explicitly supported.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1746 e7ae566f-a301-0410-adde-c780ea21d3b5

5 files changed, 59 insertions, 59 deletions

diff --git a/tap-win32/SOURCES b/tap-win32/SOURCES
index 4d6cdee..faddb0c 100755
--- a/tap-win32/SOURCES
+++ b/tap-win32/SOURCES
@@ -4,7 +4,7 @@
 MAJORCOMP=ntos
 MINORCOMP=ndis
 
-TARGETNAME=tap0801
+TARGETNAME=tap0901
 TARGETTYPE=DRIVER
 TARGETPATH=.
 TARGETLIBS=$(DDK_LIB_PATH)\ndis.lib $(DDK_LIB_PATH)\ntstrsafe.lib
@@ -14,8 +14,8 @@ INCLUDES=$(DDK_INCLUDE_PATH)
 # TAP_WIN32_MIN_x values defined in
 # config-win32.h
 C_DEFINES=
-C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MAJOR_VERSION=8
-C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=4
+C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MAJOR_VERSION=9
+C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=1
 
 # Use 00:FF:XX:XX:XX:XX format MAC addresses where
 # the Xs are random (like Linux tap driver).
diff --git a/tap-win32/amd64/OemWin2k.inf b/tap-win32/amd64/OemWin2k.inf
index 68879bd..2315fee 100755
--- a/tap-win32/amd64/OemWin2k.inf
+++ b/tap-win32/amd64/OemWin2k.inf
@@ -11,9 +11,9 @@
 ; OUTPUT -> file:///c:/WINDDK/3790/tools/chkinf/htm/c%23+src+openvpn+tap-win32+i386+__OemWin2k.htm
 
 ; INSTALL/REMOVE DRIVER
-;   tapinstall install OemWin2k.inf TAP0801
-;   tapinstall update OemWin2k.inf TAP0801
-;   tapinstall remove TAP0801
+;   tapinstall install OemWin2k.inf TAP0901
+;   tapinstall update OemWin2k.inf TAP0901
+;   tapinstall remove TAP0901
 
 ;*********************************************************
 ; Note to Developers:
@@ -51,20 +51,20 @@
 
 ; This version number should match the version
 ; number given in SOURCES.
-   DriverVer=09/13/2006,8.00.00.0004
+   DriverVer=02/27/2007,9.00.00.0001
 
 [Strings]
-   DeviceDescription = "TAP-Win32 Adapter V8"
-   Provider = "TAP-Win32 Provider"
+   DeviceDescription = "TAP-Win32 Adapter V9"
+   Provider = "TAP-Win32 Provider V9"
 
 ;----------------------------------------------------------------
 ;                      Manufacturer + Product Section (Done)
 ;----------------------------------------------------------------
 [Manufacturer]
-   %Provider% = tap0801, NTamd64
+   %Provider% = tap0901, NTamd64
 
-[tap0801.NTamd64]
-   %DeviceDescription% = tap0801.ndi, tap0801
+[tap0901.NTamd64]
+   %DeviceDescription% = tap0901.ndi, tap0901
 
 ;---------------------------------------------------------------
 ;                             Driver Section (Done)
@@ -79,23 +79,23 @@
 ;    NCF_HAS_UI = 0x80
 ;----------------- Characteristics ------------
 
-[tap0801.ndi]
-   CopyFiles       = tap0801.driver, tap0801.files
-   AddReg          = tap0801.reg
-   AddReg          = tap0801.params.reg
+[tap0901.ndi]
+   CopyFiles       = tap0901.driver, tap0901.files
+   AddReg          = tap0901.reg
+   AddReg          = tap0901.params.reg
    Characteristics = 0x81
 
-[tap0801.ndi.Services]
-   AddService = tap0801,        2, tap0801.service
+[tap0901.ndi.Services]
+   AddService = tap0901,        2, tap0901.service
 
-[tap0801.reg]
-   HKR, Ndi,            Service,      0, "tap0801"
+[tap0901.reg]
+   HKR, Ndi,            Service,      0, "tap0901"
    HKR, Ndi\Interfaces, UpperRange,   0, "ndis5"
    HKR, Ndi\Interfaces, LowerRange,   0, "ethernet"
    HKR, ,               Manufacturer, 0, "%Provider%"
    HKR, ,               ProductName,  0, "%DeviceDescription%"
 
-[tap0801.params.reg]
+[tap0901.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 +136,13 @@
 ;    SERVICE_DISABLED     = 0x4
 ;---------- Start Mode ---------------
 
-[tap0801.service]
+[tap0901.service]
    DisplayName = %DeviceDescription%
    ServiceType = 1
    StartType = 3
    ErrorControl = 1
    LoadOrderGroup = NDIS
-   ServiceBinary = %12%\tap0801.sys
+   ServiceBinary = %12%\tap0901.sys
 
 ;-----------------------------------------------------------------
 ;                                File Installation
@@ -158,25 +158,25 @@
 ; 1 = "Intel Driver Disk 1",e100bex.sys,,
 
 [SourceDisksNames]
-   1 = %DeviceDescription%, tap0801.sys
+   1 = %DeviceDescription%, tap0901.sys
 
 ; SourceDisksFiles
 ; filename_on_source = diskID[, [subdir][, size]]
 ; e100bex.sys = 1,, ; on distribution disk 1
 
 [SourceDisksFiles]
-tap0801.sys = 1
+tap0901.sys = 1
 
 [DestinationDirs]
-   tap0801.files  = 11
-   tap0801.driver = 12
+   tap0901.files  = 11
+   tap0901.driver = 12
 
-[tap0801.files]
+[tap0901.files]
 ;   TapPanel.cpl,,,6   ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
 ;   cipsrvr.exe,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
 
-[tap0801.driver]
-   tap0801.sys,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
+[tap0901.driver]
+   tap0901.sys,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
 
 ;---------------------------------------------------------------
 ;                                      End
diff --git a/tap-win32/common.h b/tap-win32/common.h
index 3c183c2..5aaab20 100755
--- a/tap-win32/common.h
+++ b/tap-win32/common.h
@@ -79,4 +79,4 @@
 // simultaneously.
 //=========================================================
 
-#define TAP_COMPONENT_ID "tap0801"
+#define TAP_COMPONENT_ID "tap0901"
diff --git a/tap-win32/constants.h b/tap-win32/constants.h
index 37c1335..6a5c760 100755
--- a/tap-win32/constants.h
+++ b/tap-win32/constants.h
@@ -30,7 +30,7 @@
 //                        Product and Version public settings
 //====================================================================
 
-#define PRODUCT_STRING "TAP-Win32 Adapter V8"
+#define PRODUCT_STRING "TAP-Win32 Adapter V9"
 
 #define TAP_NDIS_MAJOR_VERSION 5
 #define TAP_NDIS_MINOR_VERSION 0
diff --git a/tap-win32/i386/OemWin2k.inf b/tap-win32/i386/OemWin2k.inf
index 219b4ca..c8316af 100755
--- a/tap-win32/i386/OemWin2k.inf
+++ b/tap-win32/i386/OemWin2k.inf
@@ -11,9 +11,9 @@
 ; OUTPUT -> file:///c:/WINDDK/3790/tools/chkinf/htm/c%23+src+openvpn+tap-win32+i386+__OemWin2k.htm
 
 ; INSTALL/REMOVE DRIVER
-;   tapinstall install OemWin2k.inf TAP0801
-;   tapinstall update OemWin2k.inf TAP0801
-;   tapinstall remove TAP0801
+;   tapinstall install OemWin2k.inf TAP0901
+;   tapinstall update OemWin2k.inf TAP0901
+;   tapinstall remove TAP0901
 
 ;*********************************************************
 ; Note to Developers:
@@ -51,20 +51,20 @@
 
 ; This version number should match the version
 ; number given in SOURCES.
-   DriverVer=09/13/2006,8.00.00.0004
+   DriverVer=02/27/2007,9.00.00.0001
 
 [Strings]
-   DeviceDescription = "TAP-Win32 Adapter V8"
-   Provider = "TAP-Win32 Provider"
+   DeviceDescription = "TAP-Win32 Adapter V9"
+   Provider = "TAP-Win32 Provider V9"
 
 ;----------------------------------------------------------------
 ;                      Manufacturer + Product Section (Done)
 ;----------------------------------------------------------------
 [Manufacturer]
-   %Provider% = tap0801
+   %Provider% = tap0901
 
-[tap0801]
-   %DeviceDescription% = tap0801.ndi, tap0801
+[tap0901]
+   %DeviceDescription% = tap0901.ndi, tap0901
 
 ;---------------------------------------------------------------
 ;                             Driver Section (Done)
@@ -79,23 +79,23 @@
 ;    NCF_HAS_UI = 0x80
 ;----------------- Characteristics ------------
 
-[tap0801.ndi]
-   CopyFiles       = tap0801.driver, tap0801.files
-   AddReg          = tap0801.reg
-   AddReg          = tap0801.params.reg
+[tap0901.ndi]
+   CopyFiles       = tap0901.driver, tap0901.files
+   AddReg          = tap0901.reg
+   AddReg          = tap0901.params.reg
    Characteristics = 0x81
 
-[tap0801.ndi.Services]
-   AddService = tap0801,        2, tap0801.service
+[tap0901.ndi.Services]
+   AddService = tap0901,        2, tap0901.service
 
-[tap0801.reg]
-   HKR, Ndi,            Service,      0, "tap0801"
+[tap0901.reg]
+   HKR, Ndi,            Service,      0, "tap0901"
    HKR, Ndi\Interfaces, UpperRange,   0, "ndis5"
    HKR, Ndi\Interfaces, LowerRange,   0, "ethernet"
    HKR, ,               Manufacturer, 0, "%Provider%"
    HKR, ,               ProductName,  0, "%DeviceDescription%"
 
-[tap0801.params.reg]
+[tap0901.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 +136,13 @@
 ;    SERVICE_DISABLED     = 0x4
 ;---------- Start Mode ---------------
 
-[tap0801.service]
+[tap0901.service]
    DisplayName = %DeviceDescription%
    ServiceType = 1
    StartType = 3
    ErrorControl = 1
    LoadOrderGroup = NDIS
-   ServiceBinary = %12%\tap0801.sys
+   ServiceBinary = %12%\tap0901.sys
 
 ;-----------------------------------------------------------------
 ;                                File Installation
@@ -158,25 +158,25 @@
 ; 1 = "Intel Driver Disk 1",e100bex.sys,,
 
 [SourceDisksNames]
-   1 = %DeviceDescription%, tap0801.sys
+   1 = %DeviceDescription%, tap0901.sys
 
 ; SourceDisksFiles
 ; filename_on_source = diskID[, [subdir][, size]]
 ; e100bex.sys = 1,, ; on distribution disk 1
 
 [SourceDisksFiles]
-tap0801.sys = 1
+tap0901.sys = 1
 
 [DestinationDirs]
-   tap0801.files  = 11
-   tap0801.driver = 12
+   tap0901.files  = 11
+   tap0901.driver = 12
 
-[tap0801.files]
+[tap0901.files]
 ;   TapPanel.cpl,,,6   ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
 ;   cipsrvr.exe,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
 
-[tap0801.driver]
-   tap0801.sys,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
+[tap0901.driver]
+   tap0901.sys,,,6     ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
 
 ;---------------------------------------------------------------
 ;                                      End