From 35a3c167a12dfacc434a197497627114a904dae1 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Thu, 19 Apr 2007 10:20:57 +0000
Subject: Updated build system and tap driver to work with version 5600 of the
 Windows DDK.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1851 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 tap-win32/tapdrvr.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'tap-win32/tapdrvr.c')

diff --git a/tap-win32/tapdrvr.c b/tap-win32/tapdrvr.c
index 3d3c224..7e8d2d6 100755
--- a/tap-win32/tapdrvr.c
+++ b/tap-win32/tapdrvr.c
@@ -39,6 +39,11 @@
 // TAP_IOCTL_CONFIG_TUN ioctl.
 //======================================================
 
+#include "../../autodefs/nsidefs.h"
+#ifndef DDKVER
+#error DDKVER must be defined to the DDK Version as in c:\WinDDK\[DDKVER]\...
+#endif
+
 #define NDIS_MINIPORT_DRIVER
 #define BINARY_COMPATIBLE 0
 #define NDIS50_MINIPORT 1
@@ -65,9 +70,15 @@
 //========================================================
 #define ENABLE_NONADMIN 1         // JYFIXME
 
+#if DDKVER < 5600
 #include <ndis.h>
 #include <ntstrsafe.h>
 #include <ntddk.h>
+#else
+#include <ntifs.h>
+#include <ndis.h>
+#include <ntstrsafe.h>
+#endif
 
 #include "lock.h"
 #include "constants.h"
@@ -408,6 +419,7 @@ NDIS_STATUS AdapterCreate
 		}
 	    }
 	} else {
+#if DDKVER < 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);
@@ -428,7 +440,8 @@ NDIS_STATUS AdapterCreate
 		    }
 		}
 	    }
-	}
+#endif
+      }
     }
 
     /* Can't continue without name (see macro 'NAME') */
-- 
cgit v1.2.3