reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 22:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set environment variables from the HKCU\Environment key too.

Browse Source 
Moved current directory initialisation to process.c.
Make sure to always pass the correct current directory in the process
parameters for child processes.
This commit is contained in:
Alexandre Julliard 2004-05-14 05:03:29 +00:00
parent 106e13ab09
commit 6ab8827236
2 changed files with 131 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
dlls/kernel/process.c
View File

@ -398,36 +398,20 @@ static BOOL build_initial_environment( char **environ )
/*********************************************************************** /***********************************************************************
* set_registry_environment * set_registry_variables
* *
* Set the environment variables specified in the registry. * Set environment variables by enumerating the values of a key;
* helper for set_registry_environment().
*/ */
static void set_registry_environment(void) static void set_registry_variables( HKEY hkey )
{ {
static const WCHAR env_keyW[] = {'M','a','c','h','i','n','e','\\', UNICODE_STRING env_name, env_value;
'S','y','s','t','e','m','\\',
'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
'C','o','n','t','r','o','l','\\',
'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\',
'E','n','v','i','r','o','n','m','e','n','t',0};
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW, env_name, env_value;
NTSTATUS status; NTSTATUS status;
HKEY hkey;
DWORD size; DWORD size;
int index; int index;
char buffer[1024 + sizeof(KEY_VALUE_FULL_INFORMATION)]; char buffer[1024 + sizeof(KEY_VALUE_FULL_INFORMATION)];
KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer;
attr.Length = sizeof(attr);
attr.RootDirectory = 0;
attr.ObjectName = &nameW;
attr.Attributes = 0;
attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL;
RtlInitUnicodeString( &nameW, env_keyW );
if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) != STATUS_SUCCESS) return;
for (index = 0; ; index++) for (index = 0; ; index++)
{ {
status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation,
@ -443,7 +427,52 @@ static void set_registry_environment(void)
env_value.Length--; /* don't count terminating null if any */ env_value.Length--; /* don't count terminating null if any */
RtlSetEnvironmentVariable( NULL, &env_name, &env_value ); RtlSetEnvironmentVariable( NULL, &env_name, &env_value );
} }
NtClose( hkey ); }
/***********************************************************************
* set_registry_environment
*
* Set the environment variables specified in the registry.
*/
static void set_registry_environment(void)
{
static const WCHAR env_keyW[] = {'M','a','c','h','i','n','e','\\',
'S','y','s','t','e','m','\\',
'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
'C','o','n','t','r','o','l','\\',
'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\',
'E','n','v','i','r','o','n','m','e','n','t',0};
static const WCHAR envW[] = {'E','n','v','i','r','o','n','m','e','n','t',0};
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
HKEY hkey;
attr.Length = sizeof(attr);
attr.RootDirectory = 0;
attr.ObjectName = &nameW;
attr.Attributes = 0;
attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL;
/* first the system environment variables */
RtlInitUnicodeString( &nameW, env_keyW );
if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) == STATUS_SUCCESS)
{
set_registry_variables( hkey );
NtClose( hkey );
}
/* then the ones for the current user */
if (RtlOpenCurrentUser( KEY_ALL_ACCESS, (HKEY *)&attr.RootDirectory ) != STATUS_SUCCESS) return;
RtlInitUnicodeString( &nameW, envW );
if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) == STATUS_SUCCESS)
{
set_registry_variables( hkey );
NtClose( hkey );
}
NtClose( attr.RootDirectory );
} }
@ -692,6 +721,64 @@ static RTL_USER_PROCESS_PARAMETERS *init_user_process_params( size_t info_size )
} }
/***********************************************************************
* init_current_directory
*
* Initialize the current directory from the Unix cwd or the parent info.
*/
static void init_current_directory( CURDIR *cur_dir )
{
UNICODE_STRING dir_str;
char *cwd;
int size;
/* if we received a cur dir from the parent, try this first */
if (cur_dir->DosPath.Length)
{
if (RtlSetCurrentDirectory_U( &cur_dir->DosPath ) == STATUS_SUCCESS) goto done;
}
/* now try to get it from the Unix cwd */
for (size = 256; ; size *= 2)
{
if (!(cwd = HeapAlloc( GetProcessHeap(), 0, size ))) break;
if (getcwd( cwd, size )) break;
HeapFree( GetProcessHeap(), 0, cwd );
if (errno == ERANGE) continue;
cwd = NULL;
break;
}
if (cwd)
{
WCHAR *dirW;
int lenW = MultiByteToWideChar( CP_UNIXCP, 0, cwd, -1, NULL, 0 );
if ((dirW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) )))
{
MultiByteToWideChar( CP_UNIXCP, 0, cwd, -1, dirW, lenW );
RtlInitUnicodeString( &dir_str, dirW );
RtlSetCurrentDirectory_U( &dir_str );
RtlFreeUnicodeString( &dir_str );
}
}
if (!cur_dir->DosPath.Length) /* still not initialized */
{
MESSAGE("Warning: could not find DOS drive for current working directory '%s', "
"starting in the Windows directory.\n", cwd ? cwd : "" );
RtlInitUnicodeString( &dir_str, DIR_Windows );
RtlSetCurrentDirectory_U( &dir_str );
}
if (cwd) HeapFree( GetProcessHeap(), 0, cwd );
done:
if (!cur_dir->Handle) chdir("/"); /* change to root directory so as not to lock cdroms */
TRACE( "starting in %s %p\n", debugstr_w( cur_dir->DosPath.Buffer ), cur_dir->Handle );
}
/*********************************************************************** /***********************************************************************
* process_init * process_init
* *
@ -746,15 +833,9 @@ static BOOL process_init( char *argv[], char **environ )
wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, TRUE, &params->hStdOutput ); wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, TRUE, &params->hStdOutput );
wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, TRUE, &params->hStdError ); wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, TRUE, &params->hStdError );
/* <hack: to be changed later on> */ params->CurrentDirectory.DosPath.Length = 0;
params->CurrentDirectory.DosPath.Length = 3 * sizeof(WCHAR);
params->CurrentDirectory.DosPath.MaximumLength = RtlGetLongestNtPathLength() * sizeof(WCHAR); params->CurrentDirectory.DosPath.MaximumLength = RtlGetLongestNtPathLength() * sizeof(WCHAR);
params->CurrentDirectory.DosPath.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, params->CurrentDirectory.DosPath.MaximumLength); params->CurrentDirectory.DosPath.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, params->CurrentDirectory.DosPath.MaximumLength);
params->CurrentDirectory.DosPath.Buffer[0] = 'C';
params->CurrentDirectory.DosPath.Buffer[1] = ':';
params->CurrentDirectory.DosPath.Buffer[2] = '\\';
params->CurrentDirectory.DosPath.Buffer[3] = '\0';
/* </hack: to be changed later on> */
} }
else else
{ {
@ -798,6 +879,8 @@ static BOOL process_init( char *argv[], char **environ )
/* initialise DOS directories */ /* initialise DOS directories */
if (!DIR_Init()) return FALSE; if (!DIR_Init()) return FALSE;
init_current_directory( &params->CurrentDirectory );
/* registry initialisation */ /* registry initialisation */
SHELL_LoadRegistry(); SHELL_LoadRegistry();
@ -1215,10 +1298,10 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline,
* create_user_params * create_user_params
*/ */
static RTL_USER_PROCESS_PARAMETERS *create_user_params( LPCWSTR filename, LPCWSTR cmdline, static RTL_USER_PROCESS_PARAMETERS *create_user_params( LPCWSTR filename, LPCWSTR cmdline,
const STARTUPINFOW *startup ) LPCWSTR cur_dir, const STARTUPINFOW *startup )
{ {
RTL_USER_PROCESS_PARAMETERS *params; RTL_USER_PROCESS_PARAMETERS *params;
UNICODE_STRING image_str, cmdline_str, desktop, title; UNICODE_STRING image_str, cmdline_str, curdir_str, desktop, title;
NTSTATUS status; NTSTATUS status;
WCHAR buffer[MAX_PATH]; WCHAR buffer[MAX_PATH];
@ -1229,10 +1312,13 @@ static RTL_USER_PROCESS_PARAMETERS *create_user_params( LPCWSTR filename, LPCWST
RtlInitUnicodeString( &image_str, buffer ); RtlInitUnicodeString( &image_str, buffer );
RtlInitUnicodeString( &cmdline_str, cmdline ); RtlInitUnicodeString( &cmdline_str, cmdline );
if (cur_dir) RtlInitUnicodeString( &curdir_str, cur_dir );
if (startup->lpDesktop) RtlInitUnicodeString( &desktop, startup->lpDesktop ); if (startup->lpDesktop) RtlInitUnicodeString( &desktop, startup->lpDesktop );
if (startup->lpTitle) RtlInitUnicodeString( &title, startup->lpTitle ); if (startup->lpTitle) RtlInitUnicodeString( &title, startup->lpTitle );
status = RtlCreateProcessParameters( &params, &image_str, NULL, NULL, &cmdline_str, NULL, status = RtlCreateProcessParameters( &params, &image_str, NULL,
cur_dir ? &curdir_str : NULL,
&cmdline_str, NULL,
startup->lpTitle ? &title : NULL, startup->lpTitle ? &title : NULL,
startup->lpDesktop ? &desktop : NULL, startup->lpDesktop ? &desktop : NULL,
NULL, NULL ); NULL, NULL );
@ -1266,7 +1352,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_user_params( LPCWSTR filename, LPCWST
* file, otherwise it is a Winelib app. * file, otherwise it is a Winelib app.
*/ */
static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPWSTR env,
LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
BOOL inherit, DWORD flags, LPSTARTUPINFOW startup, BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
LPPROCESS_INFORMATION info, LPCSTR unixdir ) LPPROCESS_INFORMATION info, LPCSTR unixdir )
{ {
@ -1281,7 +1367,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW
if (!env) env = GetEnvironmentStringsW(); if (!env) env = GetEnvironmentStringsW();
if (!(params = create_user_params( filename, cmd_line, startup ))) if (!(params = create_user_params( filename, cmd_line, cur_dir, startup )))
return FALSE; return FALSE;
/* create the synchronization pipes */ /* create the synchronization pipes */
@ -1449,7 +1535,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW
* *
* Create a new VDM process for a 16-bit or DOS application. * Create a new VDM process for a 16-bit or DOS application.
*/ */
static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, LPCWSTR cur_dir,
LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
BOOL inherit, DWORD flags, LPSTARTUPINFOW startup, BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
LPPROCESS_INFORMATION info, LPCSTR unixdir ) LPPROCESS_INFORMATION info, LPCSTR unixdir )
@ -1466,7 +1552,7 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env,
return FALSE; return FALSE;
} }
sprintfW( new_cmd_line, argsW, winevdmW, filename, cmd_line ); sprintfW( new_cmd_line, argsW, winevdmW, filename, cmd_line );
ret = create_process( 0, winevdmW, new_cmd_line, env, psa, tsa, inherit, ret = create_process( 0, winevdmW, new_cmd_line, env, cur_dir, psa, tsa, inherit,
flags, startup, info, unixdir ); flags, startup, info, unixdir );
HeapFree( GetProcessHeap(), 0, new_cmd_line ); HeapFree( GetProcessHeap(), 0, new_cmd_line );
return ret; return ret;
@ -1478,10 +1564,10 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env,
* *
* Create a new cmd shell process for a .BAT file. * Create a new cmd shell process for a .BAT file.
*/ */
static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, LPCWSTR cur_dir,
LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
BOOL inherit, DWORD flags, LPSTARTUPINFOW startup, BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
LPPROCESS_INFORMATION info, LPCWSTR cur_dir ) LPPROCESS_INFORMATION info )
{ {
static const WCHAR comspecW[] = {'C','O','M','S','P','E','C',0}; static const WCHAR comspecW[] = {'C','O','M','S','P','E','C',0};
@ -1695,7 +1781,7 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB
if (!hFile) /* builtin exe */ if (!hFile) /* builtin exe */
{ {
TRACE( "starting %s as Winelib app\n", debugstr_w(name) ); TRACE( "starting %s as Winelib app\n", debugstr_w(name) );
retv = create_process( 0, name, tidy_cmdline, envW, process_attr, thread_attr, retv = create_process( 0, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
inherit, flags, startup_info, info, unixdir ); inherit, flags, startup_info, info, unixdir );
goto done; goto done;
} }
@ -1704,13 +1790,13 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB
{ {
case BINARY_PE_EXE: case BINARY_PE_EXE:
TRACE( "starting %s as Win32 binary\n", debugstr_w(name) ); TRACE( "starting %s as Win32 binary\n", debugstr_w(name) );
retv = create_process( hFile, name, tidy_cmdline, envW, process_attr, thread_attr, retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
inherit, flags, startup_info, info, unixdir ); inherit, flags, startup_info, info, unixdir );
break; break;
case BINARY_WIN16: case BINARY_WIN16:
case BINARY_DOS: case BINARY_DOS:
TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) );
retv = create_vdm_process( name, tidy_cmdline, envW, process_attr, thread_attr, retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
inherit, flags, startup_info, info, unixdir ); inherit, flags, startup_info, info, unixdir );
break; break;
case BINARY_OS216: case BINARY_OS216:
@ -1723,7 +1809,7 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB
break; break;
case BINARY_UNIX_LIB: case BINARY_UNIX_LIB:
TRACE( "%s is a Unix library, starting as Winelib app\n", debugstr_w(name) ); TRACE( "%s is a Unix library, starting as Winelib app\n", debugstr_w(name) );
retv = create_process( hFile, name, tidy_cmdline, envW, process_attr, thread_attr, retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
inherit, flags, startup_info, info, unixdir ); inherit, flags, startup_info, info, unixdir );
break; break;
case BINARY_UNKNOWN: case BINARY_UNKNOWN:
@ -1733,15 +1819,15 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB
if (!strcmpiW( p, comW )) if (!strcmpiW( p, comW ))
{ {
TRACE( "starting %s as DOS binary\n", debugstr_w(name) ); TRACE( "starting %s as DOS binary\n", debugstr_w(name) );
retv = create_vdm_process( name, tidy_cmdline, envW, process_attr, thread_attr, retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
inherit, flags, startup_info, info, unixdir ); inherit, flags, startup_info, info, unixdir );
break; break;
} }
if (!strcmpiW( p, batW )) if (!strcmpiW( p, batW ))
{ {
TRACE( "starting %s as batch binary\n", debugstr_w(name) ); TRACE( "starting %s as batch binary\n", debugstr_w(name) );
retv = create_cmd_process( name, tidy_cmdline, envW, process_attr, thread_attr, retv = create_cmd_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
inherit, flags, startup_info, info, cur_dir ); inherit, flags, startup_info, info );
break; break;
} }
} }

21
files/directory.c
View File

@ -107,7 +107,6 @@ int DIR_Init(void)
OBJECT_ATTRIBUTES attr; OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW; UNICODE_STRING nameW;
HKEY hkey; HKEY hkey;
char path[MAX_PATHNAME_LEN];
WCHAR longpath[MAX_PATHNAME_LEN]; WCHAR longpath[MAX_PATHNAME_LEN];
WCHAR *tmp_dir, *profile_dir; WCHAR *tmp_dir, *profile_dir;
static const WCHAR wineW[] = {'M','a','c','h','i','n','e','\\', static const WCHAR wineW[] = {'M','a','c','h','i','n','e','\\',
@ -153,26 +152,6 @@ int DIR_Init(void)
return 0; return 0;
} }
if (!getcwd( path, MAX_PATHNAME_LEN ))
{
MESSAGE("Warning: could not get current Unix working directory, "
"starting in the Windows directory.\n" );
SetCurrentDirectoryW( DIR_Windows );
}
else
{
MultiByteToWideChar( CP_UNIXCP, 0, path, -1, longpath, MAX_PATHNAME_LEN);
GetFullPathNameW( longpath, MAX_PATHNAME_LEN, longpath, NULL );
if (!SetCurrentDirectoryW( longpath ))
{
MESSAGE("Warning: could not find DOS drive for current working directory '%s', "
"starting in the Windows directory.\n", path );
SetCurrentDirectoryW( DIR_Windows );
}
else if (!NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.Handle)
chdir("/"); /* change to root directory so as not to lock cdroms */
}
/* Set the environment variables */ /* Set the environment variables */
/* set COMSPEC only if it doesn't exist already */ /* set COMSPEC only if it doesn't exist already */