From 059739e9341781d9019e07fc5119367c1630b012 Mon Sep 17 00:00:00 2001 From: James Yonan Date: Thu, 22 Apr 2010 12:53:31 +0000 Subject: Added Python-based build system for Windows in win directory. Fixed minor issue in TAP driver DEBUG builds where non-null-terminated unicode strings were being printed incorrectly. Version 2.1.1g git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5577 e7ae566f-a301-0410-adde-c780ea21d3b5 --- tap-win32/tapdrvr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tap-win32/tapdrvr.c') 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, -- cgit v1.2.3