marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Use the PWD variable to set the initial current directory.

oldstable
Alexandre Julliard 2009-10-15 12:05:55 +02:00
parent a54ba8712f
commit 87894c5f7b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/kernel32/process.c
View File

@ -759,6 +759,7 @@ static BOOL build_command_line( WCHAR **argv )
static void init_current_directory( CURDIR *cur_dir )
{
UNICODE_STRING dir_str;
const char *pwd;
char *cwd;
int size;
@ -781,13 +782,25 @@ static void init_current_directory( CURDIR *cur_dir )
break;
}
/* try to use PWD if it is valid, so that we don't resolve symlinks */
pwd = getenv( "PWD" );
if (cwd)
{
struct stat st1, st2;
if (!pwd || stat( pwd, &st1 ) == -1 ||
(!stat( cwd, &st2 ) && (st1.st_dev != st2.st_dev || st1.st_ino != st2.st_ino)))
pwd = cwd;
}
if (pwd)
{
WCHAR *dirW;
int lenW = MultiByteToWideChar( CP_UNIXCP, 0, cwd, -1, NULL, 0 );
int lenW = MultiByteToWideChar( CP_UNIXCP, 0, pwd, -1, NULL, 0 );
if ((dirW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) )))
{
MultiByteToWideChar( CP_UNIXCP, 0, cwd, -1, dirW, lenW );
MultiByteToWideChar( CP_UNIXCP, 0, pwd, -1, dirW, lenW );
RtlInitUnicodeString( &dir_str, dirW );
RtlSetCurrentDirectory_U( &dir_str );
RtlFreeUnicodeString( &dir_str );