system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Authors: Chris Morgan <cmorgan@wpi.edu>, James Abbatiello <abbeyj@wpi.edu>

Browse source 
Fixed response of GetFullPathNameA when buffer==NULL.
This commit is contained in:
Alexandre Julliard 1999-06-06 17:09:21 +00:00
parent e4f46dc3a2
commit 08b9b4f21d
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
files/dos_fs.c
View file

@ -1072,7 +1072,7 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
TRACE_(dosfs)("converting '%s'\n", name ); TRACE_(dosfs)("converting '%s'\n", name );
if (!name || !result || ((drive = DOSFS_GetPathDrive( &name )) == -1) ) if (!name || ((drive = DOSFS_GetPathDrive( &name )) == -1) )
{ SetLastError( ERROR_INVALID_PARAMETER ); { SetLastError( ERROR_INVALID_PARAMETER );
return 0; return 0;
} }
@ -1136,10 +1136,13 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
if (!(DRIVE_GetFlags(drive) & DRIVE_CASE_PRESERVING)) if (!(DRIVE_GetFlags(drive) & DRIVE_CASE_PRESERVING))
CharUpperA( buffer ); CharUpperA( buffer );
if (unicode) if (result)
lstrcpynAtoW( (LPWSTR)result, buffer, len ); {
else if (unicode)
lstrcpynA( result, buffer, len ); lstrcpynAtoW( (LPWSTR)result, buffer, len );
else
lstrcpynA( result, buffer, len );
}
TRACE_(dosfs)("returning '%s'\n", buffer ); TRACE_(dosfs)("returning '%s'\n", buffer );
@ -1164,7 +1167,7 @@ DWORD WINAPI GetFullPathNameA( LPCSTR name, DWORD len, LPSTR buffer,
LPSTR *lastpart ) LPSTR *lastpart )
{ {
DWORD ret = DOSFS_DoGetFullPathName( name, len, buffer, FALSE ); DWORD ret = DOSFS_DoGetFullPathName( name, len, buffer, FALSE );
if (ret && lastpart) if (ret && buffer && lastpart)
{ {
LPSTR p = buffer + strlen(buffer); LPSTR p = buffer + strlen(buffer);
@ -1188,7 +1191,7 @@ DWORD WINAPI GetFullPathNameW( LPCWSTR name, DWORD len, LPWSTR buffer,
LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name ); LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
DWORD ret = DOSFS_DoGetFullPathName( nameA, len, (LPSTR)buffer, TRUE ); DWORD ret = DOSFS_DoGetFullPathName( nameA, len, (LPSTR)buffer, TRUE );
HeapFree( GetProcessHeap(), 0, nameA ); HeapFree( GetProcessHeap(), 0, nameA );
if (ret && lastpart) if (ret && buffer && lastpart)
{ {
LPWSTR p = buffer + lstrlenW(buffer); LPWSTR p = buffer + lstrlenW(buffer);
if (*p != (WCHAR)'\\') if (*p != (WCHAR)'\\')