Skip to content

W
wine-winehq
Commit 9bf8a5ec authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

kernel32: Simplify constant string length calculation.

parent 54017b0f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlls/kernel32/volume.c
View file @ 9bf8a5ec
...@@ -1031,7 +1031,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD ...@@ -1031,7 +1031,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD
BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWORD size ) BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWORD size )
{ {
static const WCHAR prefixW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; static const WCHAR prefixW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0};
static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{',0}; static const WCHAR volumeW[] = {'\\','?','?','\\','V','o','l','u','m','e','{'};
static const WCHAR trailingW[] = {'\\',0}; static const WCHAR trailingW[] = {'\\',0};
MOUNTMGR_MOUNT_POINT *input = NULL, *o1; MOUNTMGR_MOUNT_POINT *input = NULL, *o1;
...@@ -1133,7 +1133,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR ...@@ -1133,7 +1133,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR
debugstr_wn((WCHAR*)((char *)output + o1->DeviceNameOffset), debugstr_wn((WCHAR*)((char *)output + o1->DeviceNameOffset),
o1->DeviceNameLength/sizeof(WCHAR))); o1->DeviceNameLength/sizeof(WCHAR)));
if (!strncmpW( p, volumeW, (sizeof(volumeW)-1)/sizeof(WCHAR) )) if (!strncmpW( p, volumeW, sizeof(volumeW)/sizeof(WCHAR) ))
{ {
/* is there space in the return variable ?? */ /* is there space in the return variable ?? */
if ((o1->SymbolicLinkNameLength/sizeof(WCHAR))+2 > size) if ((o1->SymbolicLinkNameLength/sizeof(WCHAR))+2 > size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment