Fix #175: Update launchers with improved job setup logic.

vsajip · Aug 3, 2022 · 52de225 · 52de225
1 parent 1e1c8f2
commit 52de225
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 1 deletion.
diff --git a/PC/launcher.c b/PC/launcher.c
@@ -831,6 +831,8 @@ run_child(wchar_t * cmdline)
                        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), emessage, MSGSIZE, NULL);
         wassert(ok, L"Unable to create process using '%ls': %ls", cmdline, emessage);
     }
+    // Assign the process to the job straight away. See https://github.com/pypa/distlib/issues/175
+    AssignProcessToJobObject(job, child_process_info.hProcess);
     post_spawn_cleanup(si.cbReserved2, si.lpReserved2);
     /*
      * Control handler setting is now done after process creation because the handler needs access
@@ -841,7 +843,6 @@ run_child(wchar_t * cmdline)
 #if !defined(_CONSOLE)
     clear_app_starting_state(&child_process_info);
 #endif
-    AssignProcessToJobObject(job, child_process_info.hProcess);
     CloseHandle(child_process_info.hThread);
     WaitForSingleObjectEx(child_process_info.hProcess, INFINITE, FALSE);
     ok = GetExitCodeProcess(child_process_info.hProcess, &rc);

diff --git a/distlib/t32.exe b/distlib/t32.exe
diff --git a/distlib/t64-arm.exe b/distlib/t64-arm.exe
diff --git a/distlib/t64.exe b/distlib/t64.exe
diff --git a/distlib/w32.exe b/distlib/w32.exe
diff --git a/distlib/w64-arm.exe b/distlib/w64-arm.exe
diff --git a/distlib/w64.exe b/distlib/w64.exe