From 5044e826ab440c2915edf31778cd8d43e29467b1 Mon Sep 17 00:00:00 2001 From: iceweasel-oai Date: Mon, 23 Mar 2026 15:32:55 -0700 Subject: [PATCH] do not prematurely drop desktop handle --- .../windows-sandbox-rs/src/elevated/command_runner_win.rs | 5 +++-- codex-rs/windows-sandbox-rs/src/lib.rs | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/codex-rs/windows-sandbox-rs/src/elevated/command_runner_win.rs b/codex-rs/windows-sandbox-rs/src/elevated/command_runner_win.rs index 8b33926ecf..a031650762 100644 --- a/codex-rs/windows-sandbox-rs/src/elevated/command_runner_win.rs +++ b/codex-rs/windows-sandbox-rs/src/elevated/command_runner_win.rs @@ -32,6 +32,7 @@ use codex_windows_sandbox::parse_policy; use codex_windows_sandbox::read_handle_loop; use codex_windows_sandbox::spawn_process_with_pipes; use codex_windows_sandbox::to_wide; +use codex_windows_sandbox::LaunchDesktop; use codex_windows_sandbox::PipeSpawnHandles; use codex_windows_sandbox::SandboxPolicy; use codex_windows_sandbox::StderrMode; @@ -85,6 +86,7 @@ struct IpcSpawnedProcess { stderr_handle: HANDLE, stdin_handle: Option, hpc_handle: Option, + _desktop_owner: Option, _pipe_handles: Option, } @@ -281,8 +283,6 @@ fn spawn_ipc_process( unsafe { CloseHandle(h_token); } - let _desktop_owner = desktop_owner; - Ok(IpcSpawnedProcess { log_dir, pi, @@ -290,6 +290,7 @@ fn spawn_ipc_process( stderr_handle, stdin_handle, hpc_handle, + _desktop_owner: desktop_owner, _pipe_handles: pipe_handles, }) } diff --git a/codex-rs/windows-sandbox-rs/src/lib.rs b/codex-rs/windows-sandbox-rs/src/lib.rs index 9ae845b628..0157c5be87 100644 --- a/codex-rs/windows-sandbox-rs/src/lib.rs +++ b/codex-rs/windows-sandbox-rs/src/lib.rs @@ -86,6 +86,8 @@ pub use cap::workspace_cap_sid_for_cwd; #[cfg(target_os = "windows")] pub use conpty::spawn_conpty_process_as_user; #[cfg(target_os = "windows")] +pub use desktop::LaunchDesktop; +#[cfg(target_os = "windows")] pub use dpapi::protect as dpapi_protect; #[cfg(target_os = "windows")] pub use dpapi::unprotect as dpapi_unprotect;