ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix return value of GetWindowsDirectoryA/W and GetSystemDirectoryA/W.

Browse Source
This commit is contained in:
Dmitry Timoshkov 2002-01-18 18:53:11 +00:00 committed by Alexandre Julliard
parent 8121e941a2
commit 4291e45c98
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
files/directory.c
View File

@ -261,24 +261,37 @@ UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count )
/*********************************************************************** /***********************************************************************
* GetWindowsDirectoryA (KERNEL32.@) * GetWindowsDirectoryA (KERNEL32.@)
*
* See comment for GetWindowsDirectoryW.
*/ */
UINT WINAPI GetWindowsDirectoryA( LPSTR path, UINT count ) UINT WINAPI GetWindowsDirectoryA( LPSTR path, UINT count )
{ {
if (path) lstrcpynA( path, DIR_Windows.short_name, count ); UINT len = strlen( DIR_Windows.short_name ) + 1;
return strlen( DIR_Windows.short_name ); if (path && count >= len)
{
strcpy( path, DIR_Windows.short_name );
len--;
}
return len;
} }
/*********************************************************************** /***********************************************************************
* GetWindowsDirectoryW (KERNEL32.@) * GetWindowsDirectoryW (KERNEL32.@)
*
* Return value:
* If buffer is large enough to hold full path and terminating '\0' character
* function copies path to buffer and returns length of the path without '\0'.
* Otherwise function returns required size including '\0' character and
* does not touch the buffer.
*/ */
UINT WINAPI GetWindowsDirectoryW( LPWSTR path, UINT count ) UINT WINAPI GetWindowsDirectoryW( LPWSTR path, UINT count )
{ {
UINT len = MultiByteToWideChar( CP_ACP, 0, DIR_Windows.short_name, -1, NULL, 0 ); UINT len = MultiByteToWideChar( CP_ACP, 0, DIR_Windows.short_name, -1, NULL, 0 );
if (path && count) if (path && count >= len)
{ {
if (!MultiByteToWideChar( CP_ACP, 0, DIR_Windows.short_name, -1, path, count )) MultiByteToWideChar( CP_ACP, 0, DIR_Windows.short_name, -1, path, count );
path[count-1] = 0; len--;
} }
return len; return len;
} }
@ -313,24 +326,33 @@ UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count )
/*********************************************************************** /***********************************************************************
* GetSystemDirectoryA (KERNEL32.@) * GetSystemDirectoryA (KERNEL32.@)
*
* See comment for GetWindowsDirectoryW.
*/ */
UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count )
{ {
if (path) lstrcpynA( path, DIR_System.short_name, count ); UINT len = strlen( DIR_System.short_name ) + 1;
return strlen( DIR_System.short_name ); if (path && count >= len)
{
strcpy( path, DIR_System.short_name );
len--;
}
return len;
} }
/*********************************************************************** /***********************************************************************
* GetSystemDirectoryW (KERNEL32.@) * GetSystemDirectoryW (KERNEL32.@)
*
* See comment for GetWindowsDirectoryW.
*/ */
UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count ) UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count )
{ {
UINT len = MultiByteToWideChar( CP_ACP, 0, DIR_System.short_name, -1, NULL, 0 ); UINT len = MultiByteToWideChar( CP_ACP, 0, DIR_System.short_name, -1, NULL, 0 );
if (path && count) if (path && count >= len)
{ {
if (!MultiByteToWideChar( CP_ACP, 0, DIR_System.short_name, -1, path, count )) MultiByteToWideChar( CP_ACP, 0, DIR_System.short_name, -1, path, count );
path[count-1] = 0; len--;
} }
return len; return len;
} }