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

Update the drive environment strings when changing the current 

directory from 16-bit or DOS code.
This commit is contained in:
Alexandre Julliard 2004-04-16 00:08:11 +00:00
parent b3f32d9686
commit bd1fdeddaa
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/kernel/file16.c
View File

@ -580,6 +580,16 @@ BOOL16 WINAPI GetPrivateProfileStruct16(LPCSTR section, LPCSTR key,
*/ */
BOOL16 WINAPI SetCurrentDirectory16( LPCSTR dir ) BOOL16 WINAPI SetCurrentDirectory16( LPCSTR dir )
{ {
char fulldir[MAX_PATH];
if (!GetFullPathNameA( dir, MAX_PATH, fulldir, NULL )) return FALSE;
if (fulldir[0] && fulldir[1] == ':')
{
char env_var[4] = "=A:";
env_var[1] = fulldir[0];
SetEnvironmentVariableA( env_var, fulldir );
}
return SetCurrentDirectoryA( dir ); return SetCurrentDirectoryA( dir );
} }

46
dlls/winedos/int21.c
View File

@ -666,16 +666,15 @@ static BOOL INT21_FillDrivePB( BYTE drive )
static BOOL INT21_GetCurrentDirectory( CONTEXT86 *context, BOOL islong ) static BOOL INT21_GetCurrentDirectory( CONTEXT86 *context, BOOL islong )
{ {
char *buffer = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Esi); char *buffer = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Esi);
BYTE new_drive = INT21_MapDrive( DL_reg(context) ); BYTE drive = INT21_MapDrive( DL_reg(context) );
BYTE old_drive = INT21_GetCurrentDrive();
WCHAR pathW[MAX_PATH]; WCHAR pathW[MAX_PATH];
char pathA[MAX_PATH]; char pathA[MAX_PATH];
WCHAR *ptr = pathW; WCHAR *ptr = pathW;
TRACE( "drive %d\n", DL_reg(context) ); TRACE( "drive %d\n", DL_reg(context) );
if (new_drive == MAX_DOS_DRIVES) if (drive == MAX_DOS_DRIVES)
{ {
SetLastError(ERROR_INVALID_DRIVE); SetLastError(ERROR_INVALID_DRIVE);
return FALSE; return FALSE;
} }
@ -684,13 +683,25 @@ static BOOL INT21_GetCurrentDirectory( CONTEXT86 *context, BOOL islong )
* Grab current directory. * Grab current directory.
*/ */
INT21_SetCurrentDrive( new_drive ); if (!GetCurrentDirectoryW( MAX_PATH, pathW )) return FALSE;
if (!GetCurrentDirectoryW( MAX_PATH, pathW ))
{ if (toupperW(pathW[0]) - 'A' != drive || pathW[1] != ':')
INT21_SetCurrentDrive( old_drive ); {
return FALSE; /* cwd is not on the requested drive, get the environment string instead */
WCHAR env_var[4];
env_var[0] = '=';
env_var[1] = 'A' + drive;
env_var[2] = ':';
env_var[3] = 0;
if (!GetEnvironmentVariableW( env_var, pathW, MAX_PATH ))
{
/* return empty path */
buffer[0] = 0;
return TRUE;
}
} }
INT21_SetCurrentDrive( old_drive );
/* /*
* Convert into short format. * Convert into short format.
@ -761,7 +772,7 @@ static BOOL INT21_GetCurrentDirectory( CONTEXT86 *context, BOOL islong )
pathA[63] = 0; pathA[63] = 0;
} }
TRACE( "%c:=%s\n", 'A' + new_drive, pathA ); TRACE( "%c:=%s\n", 'A' + drive, pathA );
strcpy( buffer, pathA ); strcpy( buffer, pathA );
return TRUE; return TRUE;
@ -778,6 +789,7 @@ static BOOL INT21_GetCurrentDirectory( CONTEXT86 *context, BOOL islong )
static BOOL INT21_SetCurrentDirectory( CONTEXT86 *context ) static BOOL INT21_SetCurrentDirectory( CONTEXT86 *context )
{ {
WCHAR dirW[MAX_PATH]; WCHAR dirW[MAX_PATH];
WCHAR env_var[4];
char *dirA = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); char *dirA = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx);
BYTE drive = INT21_GetCurrentDrive(); BYTE drive = INT21_GetCurrentDrive();
BOOL result; BOOL result;
@ -785,10 +797,16 @@ static BOOL INT21_SetCurrentDirectory( CONTEXT86 *context )
TRACE( "SET CURRENT DIRECTORY %s\n", dirA ); TRACE( "SET CURRENT DIRECTORY %s\n", dirA );
MultiByteToWideChar(CP_OEMCP, 0, dirA, -1, dirW, MAX_PATH); MultiByteToWideChar(CP_OEMCP, 0, dirA, -1, dirW, MAX_PATH);
result = SetCurrentDirectoryW( dirW ); if (!GetFullPathNameW( dirW, MAX_PATH, dirW, NULL )) return FALSE;
/* This function must not change current drive. */ env_var[0] = '=';
INT21_SetCurrentDrive( drive ); env_var[1] = dirW[0];
env_var[2] = ':';
env_var[3] = 0;
result = SetEnvironmentVariableW( env_var, dirW );
/* only set current directory if on the current drive */
if (result && (toupperW(dirW[0]) - 'A' == drive)) result = SetCurrentDirectoryW( dirW );
return result; return result;
} }