diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 40b8cafdc7c..a01d91baa6b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -501,7 +501,7 @@ static void test_Startup(void) PROCESS_INFORMATION info; STARTUPINFOA startup,si; static CHAR title[] = "I'm the title string", - desktop[] = "I'm the desktop string", + desktop[] = "winsta0\\default", empty[] = ""; /* let's start simplistic */ @@ -854,9 +854,9 @@ static void test_CommandLine(void) assert ( lpFilePart != 0); *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); - assert (p); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, "..%s/%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", p, exename, resfile); + if (p) sprintf(buffer, "..%s/%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", p, exename, resfile); + else sprintf(buffer, "./%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", exename, resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); @@ -864,7 +864,8 @@ static void test_CommandLine(void) ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, resfile); - sprintf(buffer, "..%s/%s", p, exename); + if (p) sprintf(buffer, "..%s/%s", p, exename); + else sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); assert(DeleteFileA(resfile) != 0); @@ -875,9 +876,9 @@ static void test_CommandLine(void) assert ( lpFilePart != 0); *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); - assert (p); /* Use exename to avoid buffer containing things like 'C:' */ - sprintf(buffer, "..%s/%s", p, exename); + if (p) sprintf(buffer, "..%s/%s", p, exename); + else sprintf(buffer, "./%s", exename); sprintf(buffer2, "dummy tests/process.c %s \"a\\\"b\\\\\" c\\\" d", resfile); SetLastError(0xdeadbeef); ret = CreateProcessA(buffer, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info);