Windows Fix

Author: steel-bucket

Cargo.toml

@@ -22,7 +22,7 @@ libc = "0.2" # For setpgid and signal constants
 tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] } # For logging setup
 tempfile = "3" # For creating temporary directories in examples/tests
 anyhow = "1.0" # For simple error handling in examples
-windows-sys = { version = "0.59.0", features = ["Win32", "Win32_System", "Win32_System_Threading"] }
+windows-sys = { version = "0.59.0", features = ["Win32", "Win32_System", "Win32_System_Threading", "Win32_Foundation"] }
 # Dependency on the library itself (needed for building examples within the workspace)
 # This line might not be strictly necessary if cargo automatically detects it,
 # but explicitly listing it can sometimes help.

src/lib.rs

@@ -13,12 +13,8 @@ use tracing::{debug, instrument, warn};
 // --- Add nix imports ---
 #[cfg(unix)]
 use nix::sys::signal::{killpg, Signal};
-#[cfg(windows)]
-use windows_sys::Win32::System::Threading::{OpenProcess, TerminateProcess, PROCESS_TERMINATE};
 #[cfg(unix)]
 use nix::unistd::Pid;
-#[cfg(windows)]
-use windows_sys::Win32::Foundation::HANDLE;
 
 // --- End add ---
 
@@ -272,13 +268,12 @@ async fn handle_timeout_event(
             "Killing process group due to timeout"
         );
         // Convert u32 PID to nix's Pid type (i32)
-        #[cfg(unix)]
-        let pid = Pid::from_raw(pid_u32 as i32);
-        #[cfg(windows)]
-        let pid = HANDLE::from(pid_u32 as *mut c_void);
         // Send SIGKILL to the entire process group.
         // killpg takes the PID of any process in the group (usually the leader)
         // and signals the entire group associated with that process.
+
+        #[cfg(unix)]
+        let pid = Pid::from_raw(pid_u32 as i32);
         #[cfg(unix)]
         match killpg(pid, Signal::SIGKILL) {
             Ok(()) => {
@@ -323,13 +318,16 @@ async fn handle_timeout_event(
         }
         #[cfg(windows)]
         {
+            use std::ffi::c_void;
             use windows_sys::Win32::Foundation::{CloseHandle, HANDLE};
+            use windows_sys::Win32::Foundation::INVALID_HANDLE_VALUE;
             use windows_sys::Win32::System::Threading::{OpenProcess, TerminateProcess, PROCESS_TERMINATE};
+            use windows_sys::Win32::Foundation::BOOL;
 
             unsafe {
                 // Open a handle to the process with termination privileges.
-                let handle: HANDLE = OpenProcess(PROCESS_TERMINATE, false, pid_u32);
-                if handle.is_invalid() {
+                let handle: HANDLE = OpenProcess(PROCESS_TERMINATE, BOOL::from(false), pid_u32);
+                if handle == INVALID_HANDLE_VALUE {
                     // Could not obtain a handle, perhaps the process already exited.
                     let err = std::io::Error::last_os_error();
                     warn!(pid = pid_u32, error = %err, "Failed to open process handle for termination (possibly already exited). Checking child status.");
@@ -350,7 +348,7 @@ async fn handle_timeout_event(
                     }
                 } else {
                     // Attempt to terminate the process.
-                    if TerminateProcess(handle, 1).as_bool() {
+                    if TerminateProcess(handle, 1).is_positive() {
                         debug!(pid = pid_u32, "Process terminated successfully via TerminateProcess.");
                         CloseHandle(handle);
                         Ok(None)