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

Fixed severe bug: SetCurrentDirectory32A didn't set pTask->curdir 

correctly due to current drive being set too late.
This commit is contained in:
Andreas Mohr 1998-10-11 17:36:06 +00:00 committed by Alexandre Julliard
parent 927875fdbe
commit fe6dfb0522
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
files/drive.c
View File

@ -894,7 +894,7 @@ BOOL16 WINAPI SetCurrentDirectory16( LPCSTR dir )
*/ */
BOOL32 WINAPI SetCurrentDirectory32A( LPCSTR dir ) BOOL32 WINAPI SetCurrentDirectory32A( LPCSTR dir )
{ {
int drive = DRIVE_GetCurrentDrive(); int olddrive, drive = DRIVE_GetCurrentDrive();
if (!dir) { if (!dir) {
ERR(file,"(NULL)!\n"); ERR(file,"(NULL)!\n");
@ -903,17 +903,20 @@ BOOL32 WINAPI SetCurrentDirectory32A( LPCSTR dir )
if (dir[0] && (dir[1]==':')) if (dir[0] && (dir[1]==':'))
{ {
drive = tolower( *dir ) - 'a'; drive = tolower( *dir ) - 'a';
if (!DRIVE_IsValid( drive ))
{
DOS_ERROR( ER_InvalidDrive, EC_MediaError, SA_Abort, EL_Disk );
return FALSE;
}
dir += 2; dir += 2;
} }
/* WARNING: we need to set the drive before the dir, as DRIVE_Chdir
sets pTask->curdir only if pTask->curdrive is drive */
olddrive = drive; /* in case DRIVE_Chdir fails */
if (!(DRIVE_SetCurrentDrive( drive )))
return FALSE;
/* FIXME: what about empty strings? Add a \\ ? */ /* FIXME: what about empty strings? Add a \\ ? */
if (!DRIVE_Chdir( drive, dir )) return FALSE; if (!DRIVE_Chdir( drive, dir )) {
if (drive == DRIVE_GetCurrentDrive()) return TRUE; DRIVE_SetCurrentDrive(olddrive);
return DRIVE_SetCurrentDrive( drive ); return FALSE;
}
return TRUE;
} }