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

kernel32/tests: Fix test_Toolhelp()'s nested process lookup. 

On Windows, processes are not reassigned to pid 1 when their parent
dies. This means many processes could have the same ppid despite being
started by unrelated processes. It also means test_Toolhelp() cannot
reliably look up the nested process by its ppid.
So look up for the nested process by its pid and only then check its
ppid, executable file, etc.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48664
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2020-03-02 18:27:30 +01:00 committed by Alexandre Julliard
parent 1947f7fb80
commit e4c15b5bbd
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/kernel32/tests/process.c
View File

@ -1157,6 +1157,7 @@ static void test_Toolhelp(void)
STARTUPINFOA startup; STARTUPINFOA startup;
PROCESS_INFORMATION info; PROCESS_INFORMATION info;
HANDLE process, thread, snapshot; HANDLE process, thread, snapshot;
DWORD nested_pid;
PROCESSENTRY32 pe; PROCESSENTRY32 pe;
THREADENTRY32 te; THREADENTRY32 te;
DWORD ret; DWORD ret;
@ -1209,17 +1210,24 @@ static void test_Toolhelp(void)
/* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */
ok(i < 20 || broken(i == 20), "process object not released\n"); ok(i < 20 || broken(i == 20), "process object not released\n");
/* Look for the nested process by pid */
WritePrivateProfileStringA(NULL, NULL, NULL, resfile);
nested_pid = GetPrivateProfileIntA("Nested", "Pid", 0, resfile);
DeleteFileA(resfile);
snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError());
memset(&pe, 0, sizeof(pe)); memset(&pe, 0, sizeof(pe));
pe.dwSize = sizeof(pe); pe.dwSize = sizeof(pe);
if (pProcess32First(snapshot, &pe)) if (pProcess32First(snapshot, &pe))
{ {
while (pe.th32ParentProcessID != info.dwProcessId) while (pe.th32ProcessID != nested_pid)
if (!pProcess32Next(snapshot, &pe)) break; if (!pProcess32Next(snapshot, &pe)) break;
} }
CloseHandle(snapshot); CloseHandle(snapshot);
ok(pe.th32ParentProcessID == info.dwProcessId, "failed to find nested child process\n"); ok(pe.th32ProcessID == nested_pid, "failed to find nested child process\n");
ok(pe.th32ParentProcessID == info.dwProcessId, "nested child process has parent %u instead of %u\n", pe.th32ParentProcessID, info.dwProcessId);
ok(stricmp(pe.szExeFile, exename) == 0, "nested executable is %s instead of %s\n", pe.szExeFile, exename);
process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pe.th32ProcessID); process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pe.th32ProcessID);
ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); ok(process != NULL, "OpenProcess failed %u\n", GetLastError());
@ -1242,7 +1250,8 @@ static void test_Toolhelp(void)
ok(ret == 1, "expected 1, got %u\n", ret); ok(ret == 1, "expected 1, got %u\n", ret);
CloseHandle(thread); CloseHandle(thread);
ok(WaitForSingleObject(process, 30000) == WAIT_OBJECT_0, "Child process termination\n"); ret = WaitForSingleObject(process, 30000);
ok(ret == WAIT_OBJECT_0, "Child process termination got %u le=%u\n", ret, GetLastError());
CloseHandle(process); CloseHandle(process);
WritePrivateProfileStringA(NULL, NULL, NULL, resfile); WritePrivateProfileStringA(NULL, NULL, NULL, resfile);
@ -4048,6 +4057,7 @@ START_TEST(process)
char buffer[MAX_PATH + 26]; char buffer[MAX_PATH + 26];
STARTUPINFOA startup; STARTUPINFOA startup;
PROCESS_INFORMATION info; PROCESS_INFORMATION info;
HANDLE hFile;
memset(&startup, 0, sizeof(startup)); memset(&startup, 0, sizeof(startup));
startup.cb = sizeof(startup); startup.cb = sizeof(startup);
@ -4058,6 +4068,14 @@ START_TEST(process)
ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n"); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n");
CloseHandle(info.hProcess); CloseHandle(info.hProcess);
CloseHandle(info.hThread); CloseHandle(info.hThread);
/* The nested process is suspended so we can use the same resource
* file and it's up to the parent to read it before resuming the
* nested process.
*/
hFile = CreateFileA(myARGV[3], GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
childPrintf(hFile, "[Nested]\nPid=%08u\n", info.dwProcessId);
CloseHandle(hFile);
return; return;
} }
else if (!strcmp(myARGV[2], "parent") && myARGC >= 5) else if (!strcmp(myARGV[2], "parent") && myARGC >= 5)