commit fe6dfb052285ccc1fae3d17bab5d44f57e73020e
author Andreas Mohr <100.30936@germany.net> Sun Oct 11 17:36:06 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Oct 11 17:36:06 1998 +0000
tree afa6ec708a8f5a798eb6249c0753b78e173d417c
parent 927875fdbec1a843f8e89f5c80211f0105db871f

Fixed severe bug: SetCurrentDirectory32A didn't set pTask->curdir
correctly due to current drive being set too late.

files/drive.c

diff --git a/files/drive.c b/files/drive.c
index 9f3e0e8..8afe419 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -894,7 +894,7 @@
  */
 BOOL32 WINAPI SetCurrentDirectory32A( LPCSTR dir )
 {
-    int drive = DRIVE_GetCurrentDrive();
+    int olddrive, drive = DRIVE_GetCurrentDrive();
 
     if (!dir) {
     	ERR(file,"(NULL)!\n");
@@ -903,17 +903,20 @@
     if (dir[0] && (dir[1]==':'))
     {
         drive = tolower( *dir ) - 'a';
-        if (!DRIVE_IsValid( drive ))
-        {
-            DOS_ERROR( ER_InvalidDrive, EC_MediaError, SA_Abort, EL_Disk );
-            return FALSE;
-        }
         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 \\ ? */
-    if (!DRIVE_Chdir( drive, dir )) return FALSE;
-    if (drive == DRIVE_GetCurrentDrive()) return TRUE;
-    return DRIVE_SetCurrentDrive( drive );
+    if (!DRIVE_Chdir( drive, dir )) {
+	DRIVE_SetCurrentDrive(olddrive);
+	return FALSE;
+    }
+    return TRUE;
 }