21 files changed, 29 insertions, 37 deletions
diff --git a/tap-win32/SOURCES.in b/tap-win32/SOURCES.in
index 58e4c59..b7f0e18 100755
--- a/tap-win32/SOURCES.in
+++ b/tap-win32/SOURCES.in
@@ -8,7 +8,7 @@ TARGETNAME=@@PRODUCT_TAP_ID@@
 TARGETTYPE=DRIVER
 TARGETPATH=.
 TARGETLIBS=$(DDK_LIB_PATH)\ndis.lib $(DDK_LIB_PATH)\ntstrsafe.lib
-INCLUDES=$(DDK_INCLUDE_PATH)
+INCLUDES=$(DDK_INCLUDE_PATH) ..
 
 # The TAP version numbers here must be >=
 # TAP_WIN32_MIN_x values defined in
@@ -53,7 +53,7 @@ MSC_OPTIMIZATION=/Od /Oi /Fc
 !ENDIF
 
 # Generate a linker map file just in case we need one for debugging
-LINKER_FLAGS=$(LINKER_FLAGS) /MAP /MAPINFO:EXPORTS /MAPINFO:LINES
+LINKER_FLAGS=$(LINKER_FLAGS) /INCREMENTAL:NO /MAP /MAPINFO:EXPORTS
 
 # Generate a browser information file for use in IDE development
 #BROWSER_INFO=1
diff --git a/tap-win32/common.h b/tap-win32/common.h
index c8dcd5d..6785a33 100755
--- a/tap-win32/common.h
+++ b/tap-win32/common.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28,15 +28,7 @@
 // common to both.
 //===============================================
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#else
-#if defined(_MSC_VER) && !defined(TAP_DRIVER_MAJOR_VERSION)
-#include "config-win32.h"
-#else
-#include "../config.h"
-#endif
-#endif
+#include "autodefs.h"
 
 //=============
 // TAP IOCTLs
diff --git a/tap-win32/constants.h b/tap-win32/constants.h
index 220d3d3..9bbd7ee 100755
--- a/tap-win32/constants.h
+++ b/tap-win32/constants.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/dhcp.c b/tap-win32/dhcp.c
index 8ef3917..3891d42 100755
--- a/tap-win32/dhcp.c
+++ b/tap-win32/dhcp.c
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/dhcp.h b/tap-win32/dhcp.h
index babe31e..4215f81 100755
--- a/tap-win32/dhcp.h
+++ b/tap-win32/dhcp.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/endian.h b/tap-win32/endian.h
index 7a298f4..128029a 100755
--- a/tap-win32/endian.h
+++ b/tap-win32/endian.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/error.c b/tap-win32/error.c
index 82757cc..5b25f48 100755
--- a/tap-win32/error.c
+++ b/tap-win32/error.c
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/error.h b/tap-win32/error.h
index d3deb28..d8436dc 100755
--- a/tap-win32/error.h
+++ b/tap-win32/error.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/hexdump.c b/tap-win32/hexdump.c
index b30a8e7..49bc38c 100755
--- a/tap-win32/hexdump.c
+++ b/tap-win32/hexdump.c
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/hexdump.h b/tap-win32/hexdump.h
index cfddcf1..c1af705 100755
--- a/tap-win32/hexdump.h
+++ b/tap-win32/hexdump.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/i386/OemWin2k.inf.in b/tap-win32/i386/OemWin2k.inf.in
index 830fc11..031b06c 100755
--- a/tap-win32/i386/OemWin2k.inf.in
+++ b/tap-win32/i386/OemWin2k.inf.in
@@ -1,5 +1,5 @@
 ; ****************************************************************************
-; * Copyright (C) 2002-2009 OpenVPN Technologies, Inc.                            *
+; * Copyright (C) 2002-2010 OpenVPN Technologies, Inc.                            *
 ; *  This program is free software; you can redistribute it and/or modify    *
 ; *  it under the terms of the GNU General Public License version 2          *
 ; *  as published by the Free Software Foundation.                           *
diff --git a/tap-win32/instance.c b/tap-win32/instance.c
index ef994ee..182cee8 100755
--- a/tap-win32/instance.c
+++ b/tap-win32/instance.c
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/lock.h b/tap-win32/lock.h
index 7c3a1a9..ea75414 100755
--- a/tap-win32/lock.h
+++ b/tap-win32/lock.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/macinfo.c b/tap-win32/macinfo.c
index c03a8c5..8d512ec 100755
--- a/tap-win32/macinfo.c
+++ b/tap-win32/macinfo.c
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/macinfo.h b/tap-win32/macinfo.h
index 774e5d6..51e930d 100755
--- a/tap-win32/macinfo.h
+++ b/tap-win32/macinfo.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/mem.c b/tap-win32/mem.c
index 3f8d949..6fbbed5 100755
--- a/tap-win32/mem.c
+++ b/tap-win32/mem.c
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/proto.h b/tap-win32/proto.h
index e059772..0390b08 100755
--- a/tap-win32/proto.h
+++ b/tap-win32/proto.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/prototypes.h b/tap-win32/prototypes.h
index ff7733a..55454d5 100755
--- a/tap-win32/prototypes.h
+++ b/tap-win32/prototypes.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/tap-win32/resource.rc b/tap-win32/resource.rc
index d7f25a8..84884cf 100755
--- a/tap-win32/resource.rc
+++ b/tap-win32/resource.rc
@@ -2,7 +2,6 @@
 #include <ntverp.h>
 
 /* get VERSION */
-#include "../config-win32.h"
 #include "common.h"
 
 /* VER_FILETYPE, VER_FILESUBTYPE, VER_FILEDESCRIPTION_STR
@@ -36,7 +35,7 @@
 #define VER_COMPANYNAME_STR         "The OpenVPN Project"
 #define VER_FILEDESCRIPTION_STR     "TAP-Win32 Virtual Network Driver"
 #define VER_ORIGINALFILENAME_STR    TAP_COMPONENT_ID ".sys"
-#define VER_LEGALCOPYRIGHT_YEARS    "2003-2009"
+#define VER_LEGALCOPYRIGHT_YEARS    "2003-2010"
 #define VER_LEGALCOPYRIGHT_STR      "OpenVPN Technologies, Inc."
 
 
@@ -46,7 +45,7 @@
 #define XSTR(s) STR(s)
 #define STR(s) #s
 
-#define VSTRING VERSION " " XSTR(TAP_DRIVER_MAJOR_VERSION) "/" XSTR(TAP_DRIVER_MINOR_VERSION)
+#define VSTRING PACKAGE_VERSION " " XSTR(TAP_DRIVER_MAJOR_VERSION) "/" XSTR(TAP_DRIVER_MINOR_VERSION)
 
 #ifdef DBG
 #define VER_PRODUCTVERSION_STR      VSTRING " (DEBUG)"
diff --git a/tap-win32/tapdrvr.c b/tap-win32/tapdrvr.c
index 2c6af48..506f1f6 100755
--- a/tap-win32/tapdrvr.c
+++ b/tap-win32/tapdrvr.c
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 // TAP_IOCTL_CONFIG_TUN ioctl.
 //======================================================
 
-#include "../../autodefs/defs.h"
+#include "common.h"
 #ifndef DDKVER_MAJOR
 #error DDKVER_MAJOR must be defined as the major number of the DDK Version
 #endif
@@ -78,7 +78,6 @@
 
 #include "lock.h"
 #include "constants.h"
-#include "common.h"
 #include "proto.h"
 #include "error.h"
 #include "endian.h"
@@ -209,7 +208,7 @@ DriverEntry (IN PDRIVER_OBJECT p_DriverObject,
 		 TAP_DRIVER_MINOR_VERSION,
 		 __DATE__,
 		 __TIME__));
-	DEBUGP (("Registry Path: '%S'\n", p_RegistryPath->Buffer));
+	DEBUGP (("Registry Path: '%.*S'\n", p_RegistryPath->Length/2, p_RegistryPath->Buffer));
 	break;
       }
 
@@ -414,7 +413,9 @@ NDIS_STATUS AdapterCreate
 	{
 	  if (parm->ParameterType == NdisParameterString)
 	    {
-	      DEBUGP (("[TAP] NdisReadConfiguration (MiniportName=%S)\n", parm->ParameterData.StringData.Buffer));
+	      DEBUGP (("[TAP] NdisReadConfiguration (MiniportName=%.*S)\n",
+		       parm->ParameterData.StringData.Length/2,
+		       parm->ParameterData.StringData.Buffer));
 
 	      if (RtlUnicodeStringToAnsiString (
 						&l_Adapter->m_NameAnsi,
diff --git a/tap-win32/types.h b/tap-win32/types.h
index 48bdff7..9406252 100755
--- a/tap-win32/types.h
+++ b/tap-win32/types.h
@@ -4,7 +4,7 @@
  *
  *  This code was inspired by the CIPE-Win32 driver by Damion K. Wilson.
  *
- *  This source code is Copyright (C) 2002-2009 OpenVPN Technologies, Inc.,
+ *  This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc.,
  *  and is released under the GPL version 2 (see below).
  *
  *  This program is free software; you can redistribute it and/or modify