TAP driver fix for Vista x64 BSOD.

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

4 files changed, 21 insertions, 4 deletions

diff --git a/tap-win32/SOURCES b/tap-win32/SOURCES
index faddb0c..f3d9ce5 100755
--- a/tap-win32/SOURCES
+++ b/tap-win32/SOURCES
@@ -15,7 +15,7 @@ INCLUDES=$(DDK_INCLUDE_PATH)
 # config-win32.h
 C_DEFINES=
 C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MAJOR_VERSION=9
-C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=1
+C_DEFINES=$(C_DEFINES) -DTAP_DRIVER_MINOR_VERSION=2
 
 # 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 2315fee..69f95c8 100755
--- a/tap-win32/amd64/OemWin2k.inf
+++ b/tap-win32/amd64/OemWin2k.inf
@@ -51,7 +51,7 @@
 
 ; This version number should match the version
 ; number given in SOURCES.
-   DriverVer=02/27/2007,9.00.00.0001
+   DriverVer=03/05/2007,9.00.00.0002
 
 [Strings]
    DeviceDescription = "TAP-Win32 Adapter V9"
diff --git a/tap-win32/i386/OemWin2k.inf b/tap-win32/i386/OemWin2k.inf
index c8316af..792cbb8 100755
--- a/tap-win32/i386/OemWin2k.inf
+++ b/tap-win32/i386/OemWin2k.inf
@@ -51,7 +51,7 @@
 
 ; This version number should match the version
 ; number given in SOURCES.
-   DriverVer=02/27/2007,9.00.00.0001
+   DriverVer=03/05/2007,9.00.00.0002
 
 [Strings]
    DeviceDescription = "TAP-Win32 Adapter V9"
diff --git a/tap-win32/prototypes.h b/tap-win32/prototypes.h
index 2237ed0..55895c4 100755
--- a/tap-win32/prototypes.h
+++ b/tap-win32/prototypes.h
@@ -187,8 +187,25 @@ VOID HookDispatchFunctions();
 
 #if ENABLE_NONADMIN
 
+/*
+ * Better solution for use on Vista DDK, but possibly not compatible with
+ * earlier DDKs:
+ *
+ * Eliminate the definition of SECURITY_DESCRIPTOR (and even ZwSetSecurityObject),
+ * and at the top of tapdrv.c change:
+ *
+ * #include <ndis.h>
+ * #include <ntstrsafe.h>
+ * #include <ntddk.h>
+ *
+ * To
+ *
+ * #include <ntifs.h>
+ * #include <ndis.h>
+ * #include <ntstrsafe.h>
+ */
 typedef struct _SECURITY_DESCRIPTOR {
-  unsigned char opaque[20];
+  unsigned char opaque[64];
 } SECURITY_DESCRIPTOR;
 
 NTSYSAPI