system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Gives back the ERROR_FILE_NOT_FOUND to GetFileAttributes.

Browse source
This commit is contained in:
Gerard Patel 2001-02-16 19:05:42 +00:00 committed by Alexandre Julliard
parent 4988696cd4
commit d52e1c4be9
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
files/directory.c
View file

@ -44,7 +44,7 @@ static DOS_FULL_NAME DIR_System;
* Get a path name from the wine.ini file and make sure it is valid. * Get a path name from the wine.ini file and make sure it is valid.
*/ */
static int DIR_GetPath( const char *keyname, const char *defval, static int DIR_GetPath( const char *keyname, const char *defval,
DOS_FULL_NAME *full_name ) DOS_FULL_NAME *full_name, BOOL warn )
{ {
char path[MAX_PATHNAME_LEN]; char path[MAX_PATHNAME_LEN];
BY_HANDLE_FILE_INFORMATION info; BY_HANDLE_FILE_INFORMATION info;
@ -55,6 +55,7 @@ static int DIR_GetPath( const char *keyname, const char *defval,
(!FILE_Stat( full_name->long_name, &info ) && (mess=strerror(errno)))|| (!FILE_Stat( full_name->long_name, &info ) && (mess=strerror(errno)))||
(!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (mess="not a directory"))) (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && (mess="not a directory")))
{ {
if (warn)
MESSAGE("Invalid path '%s' for %s directory: %s\n", path, keyname, mess); MESSAGE("Invalid path '%s' for %s directory: %s\n", path, keyname, mess);
return 0; return 0;
} }
@ -90,9 +91,9 @@ int DIR_Init(void)
DRIVE_Chdir( drive, cwd ); DRIVE_Chdir( drive, cwd );
} }
if (!(DIR_GetPath( "windows", "c:\\windows", &DIR_Windows )) || if (!(DIR_GetPath( "windows", "c:\\windows", &DIR_Windows, TRUE )) ||
!(DIR_GetPath( "system", "c:\\windows\\system", &DIR_System )) || !(DIR_GetPath( "system", "c:\\windows\\system", &DIR_System, TRUE )) ||
!(DIR_GetPath( "temp", "c:\\windows", &tmp_dir ))) !(DIR_GetPath( "temp", "c:\\windows", &tmp_dir, TRUE )))
{ {
PROFILE_UsageWineIni(); PROFILE_UsageWineIni();
return 0; return 0;
@ -147,7 +148,7 @@ int DIR_Init(void)
TRACE("Cwd = %c:\\%s\n", TRACE("Cwd = %c:\\%s\n",
'A' + drive, DRIVE_GetDosCwd( drive ) ); 'A' + drive, DRIVE_GetDosCwd( drive ) );
if (DIR_GetPath( "profile", "", &profile_dir )) if (DIR_GetPath( "profile", "", &profile_dir, FALSE ))
{ {
TRACE("USERPROFILE= %s\n", profile_dir.short_name ); TRACE("USERPROFILE= %s\n", profile_dir.short_name );
SetEnvironmentVariableA( "USERPROFILE", profile_dir.short_name ); SetEnvironmentVariableA( "USERPROFILE", profile_dir.short_name );

6
files/dos_fs.c
View file

@ -843,6 +843,12 @@ BOOL DOSFS_GetFullName( LPCSTR name, BOOL check_last, DOS_FULL_NAME *full )
TRACE("%s (last=%d)\n", name, check_last ); TRACE("%s (last=%d)\n", name, check_last );
if ((!*name) || (*name=='\n'))
{ /* error code for Win98 */
SetLastError(ERROR_BAD_PATHNAME);
return FALSE;
}
if ((full->drive = DOSFS_GetPathDrive( &name )) == -1) return FALSE; if ((full->drive = DOSFS_GetPathDrive( &name )) == -1) return FALSE;
flags = DRIVE_GetFlags( full->drive ); flags = DRIVE_GetFlags( full->drive );

5
files/file.c
View file

@ -589,11 +589,8 @@ DWORD WINAPI GetFileAttributesA( LPCSTR name )
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
return -1; return -1;
} }
if (!*name || !DOSFS_GetFullName( name, TRUE, &full_name )) if (!DOSFS_GetFullName( name, TRUE, &full_name) )
{
SetLastError( ERROR_BAD_PATHNAME );
return -1; return -1;
}
if (!FILE_Stat( full_name.long_name, &info )) return -1; if (!FILE_Stat( full_name.long_name, &info )) return -1;
return info.dwFileAttributes; return info.dwFileAttributes;
} }