diff options
Diffstat (limited to 'tap-win32')
| -rwxr-xr-x | tap-win32/SOURCES.in | 4 | ||||
| -rwxr-xr-x | tap-win32/common.h | 10 | ||||
| -rwxr-xr-x | tap-win32/resource.rc | 5 | ||||
| -rwxr-xr-x | tap-win32/tapdrvr.c | 9 |
4 files changed, 10 insertions, 18 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..7ec3440 100755 --- a/tap-win32/common.h +++ b/tap-win32/common.h @@ -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/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..49fc3b2 100755 --- a/tap-win32/tapdrvr.c +++ b/tap-win32/tapdrvr.c @@ -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, |