LPDWORD lpBufferSize,
BOOL bDriveSubstOk);
+static DWORD APIENTRY
+NPGetConnection3Common( LPCWSTR lpLocalName,
+ DWORD dwLevel,
+ LPVOID lpBuffer,
+ LPDWORD lpBufferSize,
+ BOOL bDriveSubstOk);
+
+static DWORD APIENTRY
+NPGetUniversalNameCommon( LPCWSTR lpLocalPath,
+ DWORD dwInfoLevel,
+ LPVOID lpBuffer,
+ LPDWORD lpBufferSize,
+ BOOL bDriveSubstOk);
+
+static BOOL
+DriveSubstitution( LPCWSTR drivestr,
+ LPWSTR subststr,
+ size_t substlen,
+ DWORD * pStatus);
+
#define WNNC_DRIVER( major, minor ) ( major * 0x00010000 + minor )
#define OPENAFS_PROVIDER_NAME L"OpenAFS Network"
// dos drive letter to which the source is mapped.
//
static BOOL
-DriveSubstitution(LPCWSTR drivestr, LPWSTR subststr, size_t substlen)
+DriveSubstitution(LPCWSTR drivestr, LPWSTR subststr, size_t substlen, DWORD * pStatus)
{
WCHAR drive[3];
- WCHAR device[MAX_PATH + 1];
+ WCHAR device[MAX_PATH + 26];
HRESULT hr = S_OK;
+ *pStatus = WN_SUCCESS;
+
memset( subststr, 0, substlen);
drive[0] = drivestr[0];
drive[1] = drivestr[1];
drive[2] = 0;
- if ( QueryDosDevice(drive, device, MAX_PATH) )
+ if ( substlen < 3 * sizeof( WCHAR))
+ {
+ //
+ // Cannot represent "D:"
+ //
+ return FALSE;
+ }
+
+ if ( QueryDosDevice(drive, device, MAX_PATH + 26) )
{
#ifdef AFS_DEBUG_TRACE
AFSDbgPrint( L"DriveSubstitution QueryDosDevice %s [%s -> %s]\n",
drive[1] = L':';
drive[2] = L'\0';
- if ( !DriveSubstitution(drive, subststr, substlen) )
+ if ( !DriveSubstitution(drive, subststr, substlen, pStatus) )
{
subststr[0] = drive[0];
subststr[1] = L':';
subststr[2] = L'\0';
-
}
hr = S_OK;
if ( device[6] )
{
- hr = StringCchCat( subststr, substlen, &device[6]);
+ hr = StringCbCat( subststr, substlen, &device[6]);
}
if ( SUCCEEDED(hr) && drivestr[2] )
{
- hr = StringCchCat( subststr, substlen, &drivestr[2]);
+ hr = StringCbCat( subststr, substlen, &drivestr[2]);
}
if ( SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER)
{
+ if ( hr == STRSAFE_E_INSUFFICIENT_BUFFER )
+ *pStatus = WN_MORE_DATA;
+
#ifdef AFS_DEBUG_TRACE
- AFSDbgPrint( L"DriveSubstitution %s -> %s\n",
+ AFSDbgPrint( L"DriveSubstitution (hr = %X) %s -> %s\n",
+ hr,
drivestr,
subststr);
#endif
subststr[0] = L'\\';
- hr = StringCbCopyN(&subststr[1], substlen - sizeof(WCHAR), &device[7], MAX_PATH);
+ hr = StringCbCopyN(&subststr[1], substlen - sizeof(WCHAR), &device[7], sizeof(device) - 7 * sizeof(WCHAR));
+
+ if ( SUCCEEDED(hr) && drivestr[2] )
+ {
+ hr = StringCbCat( subststr, substlen, &drivestr[2]);
+ }
if ( SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER)
{
- if ( drivestr[2] )
- {
- hr = StringCchCat( subststr, substlen, &drivestr[2]);
- }
- else
- {
- hr = S_OK;
- }
- if ( SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER)
- {
+ if ( hr == STRSAFE_E_INSUFFICIENT_BUFFER )
+ *pStatus = WN_MORE_DATA;
#ifdef AFS_DEBUG_TRACE
- AFSDbgPrint( L"DriveSubstitution %s -> %s\n",
+ AFSDbgPrint( L"DriveSubstitution (hr = %X) %s -> %s\n",
+ hr,
drivestr,
subststr);
#endif
- return TRUE;
- }
+ return TRUE;
}
#ifdef AFS_DEBUG_TRACE
// \Device\AFSRedirector\;X:\\afs\cellname
//
- hr = StringCbCopyN( subststr, substlen,
- &device[3 + sizeof( AFS_RDR_DEVICE_NAME) / sizeof( WCHAR)],
- MAX_PATH * sizeof( WCHAR));
+ hr = StringCbCopy( subststr, substlen,
+ &device[3 + sizeof( AFS_RDR_DEVICE_NAME) / sizeof( WCHAR)]);
+
+ if ( SUCCEEDED(hr) && drivestr[2] )
+ {
+ hr = StringCbCat( subststr, substlen, &drivestr[2]);
+ }
if ( SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER)
{
- if ( drivestr[2] )
- {
- hr = StringCchCat( subststr, substlen, &drivestr[2]);
- }
- else
- {
- hr = S_OK;
- }
-
- if ( SUCCEEDED(hr) || hr == STRSAFE_E_INSUFFICIENT_BUFFER)
- {
+ if ( hr == STRSAFE_E_INSUFFICIENT_BUFFER )
+ *pStatus = WN_MORE_DATA;
#ifdef AFS_DEBUG_TRACE
- AFSDbgPrint( L"DriveSubstitution %s -> %s\n",
- drivestr,
- subststr);
+ AFSDbgPrint( L"DriveSubstitution (hr = %X) %s -> %s\n",
+ hr,
+ drivestr,
+ subststr);
#endif
- return TRUE;
- }
+ return TRUE;
}
#ifdef AFS_DEBUG_TRACE
#endif
}
-
-
return FALSE;
}
//
// No support for:
- // WNNC_CON_GETPERFORMANCE
// WNNC_CON_DEFER
//
rc = WNNC_CON_GETCONNECTIONS |
WNNC_CON_CANCELCONNECTION |
WNNC_CON_ADDCONNECTION |
- WNNC_CON_ADDCONNECTION3;
+ WNNC_CON_ADDCONNECTION3 |
+ WNNC_CON_GETPERFORMANCE;
break;
}
HANDLE hControlDevice = NULL;
HANDLE hToken = NULL;
LARGE_INTEGER liAuthId = {0,0};
+ HRESULT hr;
__Enter
{
wchLocalName[2] = L'\0';
}
- StringCchCopy(wchRemoteName, MAX_PATH+1, lpNetResource->lpRemoteName);
- wchRemoteName[MAX_PATH] = L'\0';
+ hr = StringCbCopy(wchRemoteName, sizeof( wchRemoteName), lpNetResource->lpRemoteName);
+ if ( FAILED(hr))
+ {
+
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPAddConnection3 lpRemoteName longer than MAX_PATH, returning WN_BAD_NETNAME\n");
+#endif
+ return WN_BAD_NETNAME;
+ }
//
// Allocate our buffer to pass to the redirector filter
lpNetResource->lpLocalName != NULL)
{
- WCHAR TempBuf[MAX_PATH+1];
+ WCHAR TempBuf[MAX_PATH+26];
if( !QueryDosDeviceW( wchLocalName,
TempBuf,
- MAX_PATH+1))
+ MAX_PATH+26))
{
if( GetLastError() != ERROR_FILE_NOT_FOUND)
{
UNICODE_STRING uniConnectionName;
- UNICODE_STRING uniDeviceName;
-
- uniDeviceName.Length = (wcslen( AFS_RDR_DEVICE_NAME) * sizeof( WCHAR));
- uniDeviceName.MaximumLength = uniDeviceName.Length;
- uniDeviceName.Buffer = AFS_RDR_DEVICE_NAME;
//
// Create a symbolic link object to the device we are redirecting
//
- uniConnectionName.MaximumLength = (USHORT)( uniDeviceName.Length +
+ uniConnectionName.MaximumLength = (USHORT)( wcslen( AFS_RDR_DEVICE_NAME) * sizeof( WCHAR) +
pConnectCB->RemoteNameLength +
8 + // Local name and \;
sizeof(WCHAR)); // Space for NULL-termination.
try_return( dwStatus = GetLastError());
}
- CopyMemory( uniConnectionName.Buffer,
- uniDeviceName.Buffer,
- uniDeviceName.Length);
+ hr = StringCbCopyW( uniConnectionName.Buffer,
+ uniConnectionName.MaximumLength,
+ AFS_RDR_DEVICE_NAME);
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPAddConnection3 uniConnectionBuffer too small\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
- StringCchCatW( uniConnectionName.Buffer,
- uniConnectionName.MaximumLength,
- L"\\;" );
+ hr = StringCbCatW( uniConnectionName.Buffer,
+ uniConnectionName.MaximumLength,
+ L"\\;" );
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPAddConnection3 uniConnectionBuffer too small\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
- StringCchCatW( uniConnectionName.Buffer,
- uniConnectionName.MaximumLength,
- wchLocalName);
+ hr = StringCbCatW( uniConnectionName.Buffer,
+ uniConnectionName.MaximumLength,
+ wchLocalName);
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPAddConnection3 uniConnectionBuffer too small\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
- StringCchCatW( uniConnectionName.Buffer,
- uniConnectionName.MaximumLength,
- wchRemoteName);
+ hr = StringCbCatW( uniConnectionName.Buffer,
+ uniConnectionName.MaximumLength,
+ wchRemoteName);
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPAddConnection3 uniConnectionBuffer too small\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
#ifdef AFS_DEBUG_TRACE
AFSDbgPrint( L"NPAddConnection3 DefineDosDevice Local %s connection name %s\n",
HANDLE hControlDevice = NULL;
WCHAR wchLocalName[ 3];
WCHAR *pwchLocalName = NULL;
+ HRESULT hr;
__Enter
{
wchLocalName[0] = L'\0';
- StringCchCopyW( wchRemoteName, MAX_PATH+1, lpName);
+ hr = StringCbCopyW( wchRemoteName, sizeof( wchRemoteName), lpName);
+
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPCancelConnection lpName longer than MAX_PATH\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
dwRemoteNameLength = (wcslen( wchRemoteName) * sizeof( WCHAR));
}
pConnectCB->RemoteNameLength = (USHORT)dwRemoteNameLength;
- StringCchCopyW( pConnectCB->RemoteName,
- MAX_PATH+1,
- wchRemoteName);
+ StringCbCopyW( pConnectCB->RemoteName,
+ dwRemoteNameLength + sizeof( WCHAR),
+ wchRemoteName);
pConnectCB->Version = AFS_NETWORKPROVIDER_INTERFACE_VERSION_1;
{
UNICODE_STRING uniConnectionName;
- UNICODE_STRING uniDeviceName;
-
- uniDeviceName.Length = (wcslen( AFS_RDR_DEVICE_NAME) * sizeof( WCHAR));
- uniDeviceName.MaximumLength = uniDeviceName.Length;
- uniDeviceName.Buffer = AFS_RDR_DEVICE_NAME;
//
// Create a symbolic link object to the device we are redirecting
//
- uniConnectionName.MaximumLength = (USHORT)( uniDeviceName.Length +
+ uniConnectionName.MaximumLength = (USHORT)( wcslen( AFS_RDR_DEVICE_NAME) * sizeof( WCHAR) +
dwRemoteNameLength +
8 + // Local name and \;
sizeof(WCHAR)); // Space for NULL-termination.
try_return( dwStatus = GetLastError());
}
- CopyMemory( uniConnectionName.Buffer,
- uniDeviceName.Buffer,
- uniDeviceName.Length);
+ hr = StringCbCopyW( uniConnectionName.Buffer,
+ uniConnectionName.MaximumLength,
+ AFS_RDR_DEVICE_NAME);
- StringCchCatW( uniConnectionName.Buffer,
- uniConnectionName.MaximumLength,
- L"\\;" );
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPCancelConnection uniConnectionName buffer too small (1)\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
+
+ hr = StringCbCatW( uniConnectionName.Buffer,
+ uniConnectionName.MaximumLength,
+ L"\\;" );
+
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPCancelConnection uniConnectionName buffer too small (2)\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
if( !bLocalName)
{
wchLocalName[ 2] = L'\0';
- StringCchCatW( uniConnectionName.Buffer,
- uniConnectionName.MaximumLength,
- wchLocalName);
+ hr = StringCbCatW( uniConnectionName.Buffer,
+ uniConnectionName.MaximumLength,
+ wchLocalName);
+
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPCancelConnection uniConnectionName buffer too small (3)\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
pwchLocalName = wchLocalName;
}
else
{
- StringCchCatW( uniConnectionName.Buffer,
- uniConnectionName.MaximumLength,
- lpName);
+ hr = StringCbCatW( uniConnectionName.Buffer,
+ uniConnectionName.MaximumLength,
+ lpName);
+
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPCancelConnection uniConnectionName buffer too small (4)\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
pwchLocalName = lpName;
}
- StringCchCatW( uniConnectionName.Buffer,
- uniConnectionName.MaximumLength,
- wchRemoteName);
+ hr = StringCbCatW( uniConnectionName.Buffer,
+ uniConnectionName.MaximumLength,
+ wchRemoteName);
+
+ if ( FAILED(hr))
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPCancelConnection uniConnectionName buffer too small (5)\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
if( !DefineDosDevice( DDD_REMOVE_DEFINITION | DDD_RAW_TARGET_PATH | DDD_EXACT_MATCH_ON_REMOVE,
pwchLocalName,
LPDWORD lpBufferSize)
{
- return NPGetConnectionCommon( lpLocalName,
- lpRemoteName,
- lpBufferSize,
- TRUE);
+ DWORD dwBufferSize = *lpBufferSize;
+ DWORD dwStatus;
+
+ dwStatus = NPGetConnectionCommon( lpLocalName,
+ lpRemoteName,
+ &dwBufferSize,
+ FALSE);
+
+ if ( dwStatus == WN_NOT_CONNECTED)
+ {
+
+ dwStatus = NPGetConnectionCommon( lpLocalName,
+ lpRemoteName,
+ lpBufferSize,
+ TRUE);
+ }
+ else
+ {
+
+ *lpBufferSize = dwBufferSize;
+ }
+
+ return dwStatus;
}
DWORD
DWORD dwStatus = WN_NOT_CONNECTED;
WCHAR wchLocalName[3];
- WCHAR wchSubstName[MAX_PATH + 1];
+ WCHAR wchSubstName[1024 + 26];
AFSNetworkProviderConnectionCB *pConnectCB = NULL;
DWORD dwError = 0;
DWORD dwBufferSize = 0;
dwPassedSize = *lpBufferSize;
if ( !bDriveSubstOk ||
- !DriveSubstitution( lpLocalName, wchSubstName, sizeof( wchSubstName)))
+ !DriveSubstitution( lpLocalName, wchSubstName, sizeof( wchSubstName), &dwStatus))
{
wchLocalName[0] = towupper(lpLocalName[0]);
wchLocalName[1] = L':';
return dwStatus;
}
-DWORD
-APIENTRY
+DWORD APIENTRY
NPGetConnection3( IN LPCWSTR lpLocalName,
IN DWORD dwLevel,
OUT LPVOID lpBuffer,
IN OUT LPDWORD lpBufferSize)
{
+ DWORD dwBufferSize = *lpBufferSize;
+ DWORD dwStatus;
+
+ dwStatus = NPGetConnection3Common( lpLocalName,
+ dwLevel,
+ lpBuffer,
+ &dwBufferSize,
+ FALSE);
+
+ if ( dwStatus == WN_NOT_CONNECTED)
+ {
+
+ dwStatus = NPGetConnection3Common( lpLocalName,
+ dwLevel,
+ lpBuffer,
+ lpBufferSize,
+ TRUE);
+ }
+ else
+ {
+
+ *lpBufferSize = dwBufferSize;
+ }
+
+ return dwStatus;
+}
+
+
+static DWORD APIENTRY
+NPGetConnection3Common( IN LPCWSTR lpLocalName,
+ IN DWORD dwLevel,
+ OUT LPVOID lpBuffer,
+ IN OUT LPDWORD lpBufferSize,
+ IN BOOL bDriveSubstOk)
+{
+
DWORD dwStatus = WN_NOT_CONNECTED;
WCHAR wchLocalName[3];
- WCHAR wchSubstName[MAX_PATH + 1];
+ WCHAR wchSubstName[1024 + 26];
AFSNetworkProviderConnectionCB *pConnectCB = NULL;
DWORD dwError = 0;
DWORD dwBufferSize = 0;
try_return( dwStatus = WN_MORE_DATA);
}
- if ( !DriveSubstitution( lpLocalName, wchSubstName, sizeof( wchSubstName)))
+ if ( !bDriveSubstOk ||
+ !DriveSubstitution( lpLocalName, wchSubstName, sizeof( wchSubstName), &dwStatus))
{
wchLocalName[0] = towupper(lpLocalName[0]);
wchLocalName[1] = L':';
{
#ifdef AFS_DEBUG_TRACE
- AFSDbgPrint( L"NPGetConnectionPerformance AFSRDFS is disabled, returning WN_BAD_NETNAME\n");
+ AFSDbgPrint( L"NPGetConnectionPerformance AFSRDFS is disabled, returning WN_NET_ERROR\n");
#endif
- return WN_NO_NETWORK;
+ return WN_NET_ERROR;
}
AFSDbgPrint( L"NPGetConnectionPerformance Entry for remote connection %S\n",
try_return( dwReturn = WN_NOT_CONNECTED);
}
- lpNetConnectInfo->dwFlags = WNCON_DYNAMIC;
+ lpNetConnectInfo->dwFlags = 0;
- lpNetConnectInfo->dwSpeed = 500;
+ lpNetConnectInfo->dwSpeed = 0;
lpNetConnectInfo->dwDelay = 0;
- lpNetConnectInfo->dwOptDataSize = 0x1000;
+ lpNetConnectInfo->dwOptDataSize = 0x10000;
AFSDbgPrint( L"NPGetConnectionPerformance Successfully returned information for remote connection %S\n",
lpRemoteName);
pNetResource->dwType = RESOURCETYPE_DISK;
}
- pNetResource->dwUsage = pConnectionCB->Usage;
+
+ if ( pEnumCB->Scope == RESOURCE_CONNECTED)
+ {
+
+ pNetResource->dwUsage = 0;
+ }
+ else
+ {
+
+ pNetResource->dwUsage = pConnectionCB->Usage;
+ }
// setup string area at opposite end of buffer
StringZone = (PWCHAR)( (PBYTE) StringZone - SpaceNeeded);
NPGetUniversalName( LPCWSTR lpLocalPath,
DWORD dwInfoLevel,
LPVOID lpBuffer,
- LPDWORD lpBufferSize )
+ LPDWORD lpBufferSize)
+{
+
+ DWORD dwBufferSize = *lpBufferSize;
+ DWORD dwStatus;
+
+ dwStatus = NPGetUniversalNameCommon( lpLocalPath,
+ dwInfoLevel,
+ lpBuffer,
+ &dwBufferSize,
+ FALSE);
+
+ if ( dwStatus == WN_NOT_CONNECTED)
+ {
+
+ dwStatus = NPGetUniversalNameCommon( lpLocalPath,
+ dwInfoLevel,
+ lpBuffer,
+ lpBufferSize,
+ TRUE);
+ }
+ else
+ {
+
+ *lpBufferSize = dwBufferSize;
+ }
+
+ return dwStatus;
+}
+
+static DWORD APIENTRY
+NPGetUniversalNameCommon( LPCWSTR lpLocalPath,
+ DWORD dwInfoLevel,
+ LPVOID lpBuffer,
+ LPDWORD lpBufferSize,
+ BOOL bDriveSubstOk)
{
DWORD dwStatus = WN_NOT_CONNECTED;
WCHAR wchLocalName[3];
- WCHAR wchSubstName[MAX_PATH + 1];
+ WCHAR *pwchSubstName = NULL;
+ DWORD dwSubstNameLength = 0;
AFSNetworkProviderConnectionCB *pConnectCB = NULL;
DWORD dwError = 0;
DWORD dwBufferSize = 0;
try_return( dwStatus = WN_BAD_VALUE);
}
+ dwSubstNameLength = 4096;
+
+ pwchSubstName = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, dwSubstNameLength);
+
+ if ( pwchSubstName == NULL)
+ {
+#ifdef AFS_DEBUG_TRACE
+ AFSDbgPrint( L"NPGetUniversalName unable to allocate substitution name buffer.\n");
+#endif
+ try_return( dwStatus = WN_OUT_OF_MEMORY);
+ }
+
memset(lpBuffer, 0, dwPassedSize);
- if ( !DriveSubstitution( lpLocalPath, wchSubstName, sizeof( wchSubstName)))
+ if ( !bDriveSubstOk ||
+ !DriveSubstitution( lpLocalPath, pwchSubstName, dwSubstNameLength, &dwStatus))
{
wchLocalName[0] = towupper(lpLocalPath[0]);
wchLocalName[1] = L':';
ReadServerNameString();
- if ( wchSubstName[0] != L'\\' &&
- wchSubstName[1] == L':')
+ if ( pwchSubstName[0] != L'\\' &&
+ pwchSubstName[1] == L':')
{
- wchLocalName[0] = towupper(wchSubstName[0]);
+ wchLocalName[0] = towupper(pwchSubstName[0]);
wchLocalName[1] = L':';
wchLocalName[2] = L'\0';
#ifdef AFS_DEBUG_TRACE
AFSDbgPrint( L"NPGetUniversalName Requesting UNC for drive substitution %s -> %s\n",
- wchSubstName,
+ pwchSubstName,
wchLocalName);
#endif
}
- else if ( _wcsnicmp( wchSubstName, wszServerNameUNC, cbServerNameUNCLength / sizeof( WCHAR)) == 0 &&
- ( wchSubstName[cbServerNameUNCLength / sizeof( WCHAR)] == L'\\' ||
- wchSubstName[cbServerNameUNCLength / sizeof( WCHAR)] == 0))
+ else if ( _wcsnicmp( pwchSubstName, wszServerNameUNC, cbServerNameUNCLength / sizeof( WCHAR)) == 0 &&
+ ( pwchSubstName[cbServerNameUNCLength / sizeof( WCHAR)] == L'\\' ||
+ pwchSubstName[cbServerNameUNCLength / sizeof( WCHAR)] == 0))
{
HRESULT hr;
#ifdef AFS_DEBUG_TRACE
AFSDbgPrint( L"NPGetUniversalName drive substitution %s is AFS; Level 0x%x BufferSize 0x%x\n",
- wchSubstName,
+ pwchSubstName,
dwInfoLevel,
dwPassedSize);
#endif
- dwBufferSize = (wcslen( wchSubstName) + 1) * sizeof( WCHAR);
+ dwBufferSize = (wcslen( pwchSubstName) + 1) * sizeof( WCHAR);
switch( dwInfoLevel)
{
pUniversalInfo->lpUniversalName = (LPTSTR)((char *)lpBuffer + sizeof( UNIVERSAL_NAME_INFO));
memcpy( pUniversalInfo->lpUniversalName,
- wchSubstName,
+ pwchSubstName,
min( dwBufferSize, dwRemainingLength));
dwRemainingLength -= min( dwBufferSize, dwRemainingLength);
pRemoteInfo->lpUniversalName = (LPTSTR)((char *)lpBuffer + sizeof( REMOTE_NAME_INFO));
memcpy( pRemoteInfo->lpUniversalName,
- wchSubstName,
+ pwchSubstName,
min( dwRemainingLength, dwBufferSize));
dwRemainingLength -= min( dwRemainingLength, dwBufferSize);
pRemoteInfo->lpConnectionName = (LPTSTR)((char *)pRemoteInfo->lpUniversalName + dwBufferSize);
memcpy( pRemoteInfo->lpConnectionName,
- wchSubstName,
+ pwchSubstName,
min( dwRemainingLength, dwBufferSize));
dwRemainingLength -= min( dwRemainingLength, dwBufferSize) - sizeof( WCHAR);
#ifdef AFS_DEBUG_TRACE
AFSDbgPrint( L"NPGetUniversalName drive substitution %s is not AFS\n",
- wchSubstName);
+ pwchSubstName);
#endif
try_return( dwStatus = WN_NOT_CONNECTED);
}
CloseHandle( hControlDevice);
}
+ if ( pwchSubstName)
+ {
+
+ HeapFree( GetProcessHeap(), 0, (PVOID) pwchSubstName);
+ }
+
if( pConnectCB != NULL)
{
Buffer[0] = L'\0';
+ if ( dwFlags == 0)
+ {
+ return L"NONE";
+ }
+
if ( dwFlags & WNFMT_MULTILINE )
{
StringCbCat( Buffer, sizeof(Buffer), L"MULTILINE|");
#ifdef AFS_DEBUG_TRACE
AFSDbgPrint( L"NPFormatNetworkName Remote %s Flags %s (0x%x) CharsPerLine %u\n",
lpRemoteName,
- dwFlags,
GetFormatFlags( dwFlags),
+ dwFlags,
dwAveCharPerLine);
#endif
{
HANDLE hControlDevice = NULL;
- WCHAR wchError[ 256];
hControlDevice = CreateFile( AFS_SYMLINK_W,
GENERIC_READ | GENERIC_WRITE,
HANDLE hFile;
int len;
char * buffer;
- DWORD dwWritten;
- BOOL bRet;
+ DWORD dwWritten;
+ BOOL bRet;
if ( !wszbuffer || !wszbuffer[0] )
return;
#endif
GetCurrentThreadId());
- rc = StringCbVPrintfW( &wszbuffer[ 14], sizeof(wszbuffer) - 14, Format, marker);
+ rc = StringCbVPrintfW( &wszbuffer[ 14], sizeof(wszbuffer) - 14 * sizeof(WCHAR), Format, marker);
if (SUCCEEDED(rc)) {
if (debug & 1)
git://git.openafs.org / openafs.git / blobdiff