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

kernel: Error out of CreateProcess if the specified current directory 

doesn't exist.
This commit is contained in:
James Hawkins 2006-03-26 21:53:09 -06:00 committed by Alexandre Julliard
parent 94dcabecd8
commit 61c3bb03a0
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/kernel/process.c
View File

@ -1661,7 +1661,11 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB
if (cur_dir) if (cur_dir)
{ {
unixdir = wine_get_unix_file_name( cur_dir ); if (!(unixdir = wine_get_unix_file_name( cur_dir )))
{
SetLastError(ERROR_DIRECTORY);
goto done;
}
} }
else else
{ {

12
dlls/kernel/tests/process.c
View File

@ -811,6 +811,18 @@ static void test_Directory(void)
okChildIString("Misc", "CurrDirA", windir); okChildIString("Misc", "CurrDirA", windir);
release_memory(); release_memory();
assert(DeleteFileA(resfile) != 0); assert(DeleteFileA(resfile) != 0);
/* search PATH for the exe if directory is NULL */
ok(CreateProcessA(NULL, "winver.exe", NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n");
ok(TerminateProcess(info.hProcess, 0), "Child process termination\n");
/* if any directory is provided, don't search PATH, error on bad directory */
SetLastError(0xdeadbeef);
memset(&info, 0, sizeof(info));
ok(!CreateProcessA(NULL, "winver.exe", NULL, NULL, FALSE, 0L,
NULL, "non\\existent\\directory", &startup, &info), "CreateProcess\n");
ok(GetLastError() == ERROR_DIRECTORY, "Expected ERROR_DIRECTORY, got %ld\n", GetLastError());
ok(!TerminateProcess(info.hProcess, 0), "Child process should not exist\n");
} }
static BOOL is_str_env_drive_dir(const char* str) static BOOL is_str_env_drive_dir(const char* str)