fix: release private desktop on worker launch failure

This commit is contained in:
阿白叔 committed 2026-11-05 14:47:03 +08:00
1 parent 39985f7cfd
commit 311d0dd9a4
4 files changed
+137 -19

No files matched your search

+42 -17
View File
@@ -72,27 +72,52 @@ class DesktopWorker:
def __init__(self, command, name, *, interactive_input=False):
self.name = name
self.interactive_input = bool(interactive_input)
self.desktop = None if self.interactive_input else win32service.CreateDesktop(
name, 0, win32con.GENERIC_ALL, None)
# Track the session, but never use kill-on-close: PCB descendants can
# still own a database transaction when the Python supervisor exits.
self.job = win32job.CreateJobObject(None, '')
self.job_bound = False
self.desktop = None
self.job = None
self.handle = None
self.companions = []
self.companion_pids = []
startup = win32process.STARTUPINFO()
# subprocess.STARTUPINFO does NOT pass lpDesktop to CreateProcess.
startup.lpDesktop = startup_desktop_name(name, interactive_input=self.interactive_input)
self.handle, thread, self.pid, _ = win32process.CreateProcess(
command[0], subprocess.list2cmdline(command), None, None, False,
win32con.CREATE_NO_WINDOW, None, None, startup)
thread.Close()
self.job_bound = False
# Track the session, but never use kill-on-close: PCB descendants can
# still own a database transaction when the Python supervisor exits.
try:
win32job.AssignProcessToJobObject(self.job, self.handle)
self.job_bound = True
self.desktop = None if self.interactive_input else win32service.CreateDesktop(
name, 0, win32con.GENERIC_ALL, None)
self.job = win32job.CreateJobObject(None, '')
startup = win32process.STARTUPINFO()
# subprocess.STARTUPINFO does NOT pass lpDesktop to CreateProcess.
startup.lpDesktop = startup_desktop_name(name, interactive_input=self.interactive_input)
self.handle, thread, self.pid, _ = win32process.CreateProcess(
command[0], subprocess.list2cmdline(command), None, None, False,
win32con.CREATE_NO_WINDOW, None, None, startup)
thread.Close()
try:
win32job.AssignProcessToJobObject(self.job, self.handle)
self.job_bound = True
except Exception:
# Kill-through-job is a cleanup guarantee, not a launch requirement.
self.job_bound = False
except Exception:
# Kill-through-job is a cleanup guarantee, not a launch requirement.
self.job_bound = False
if self.handle is not None:
try:
win32process.TerminateProcess(self.handle, 1)
except Exception:
pass
try:
self.handle.Close()
except Exception:
pass
if self.job is not None:
try:
self.job.Close()
except Exception:
pass
if self.desktop is not None:
try:
self.desktop.CloseDesktop()
except Exception:
pass
raise
def start_companion(self, command):
startup = win32process.STARTUPINFO()
+3 -2
View File
@@ -1407,11 +1407,12 @@ def read_library_flag(library, name, *, timeout_seconds=90, log_path=None):
if not executable.is_file():
return FLAG_UNKNOWN, f'找不到 Library Manager: {executable}'
from pywinauto import Desktop
from pywinauto.controls.common_controls import TreeViewWrapper
deadline = time.monotonic() + timeout_seconds
desktop_name = 'CbbFlagRead_' + os.urandom(5).hex()
desktop = win32service.CreateDesktop(desktop_name, 0, win32con.GENERIC_ALL, None)
from pywinauto import Desktop
from pywinauto.controls.common_controls import TreeViewWrapper
handle = None
pid = None