diff --git a/Cargo.toml b/Cargo.toml index 6a834b6bd7..66cd22bc30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -121,7 +121,7 @@ toml = "0.8.19" # For parsing the injections toml file typed-builder = "0.20.0" # Implement the builder pattern at compiletime uuid = { version = "1.10.0", features = ["serde", "v4"] } which = "6.0.3" -windows = "0.58.0" +windows = "0.59.0" z3 = "0.12.1" diff --git a/libafl/src/executors/hooks/timer.rs b/libafl/src/executors/hooks/timer.rs index 3f335848be..3fb7dd72e6 100644 --- a/libafl/src/executors/hooks/timer.rs +++ b/libafl/src/executors/hooks/timer.rs @@ -289,7 +289,7 @@ impl TimerStruct { LeaveCriticalSection(self.critical_mut()); compiler_fence(Ordering::SeqCst); - SetThreadpoolTimer(*self.ptp_timer(), Some(&ft), 0, 0); + SetThreadpoolTimer(*self.ptp_timer(), Some(&ft), 0, None); } } @@ -375,7 +375,7 @@ impl TimerStruct { compiler_fence(Ordering::SeqCst); // previously this wa post_run_reset - SetThreadpoolTimer(*self.ptp_timer(), None, 0, 0); + SetThreadpoolTimer(*self.ptp_timer(), None, 0, None); } } } diff --git a/libafl_bolts/src/os/windows_exceptions.rs b/libafl_bolts/src/os/windows_exceptions.rs index d1098c98e8..ca147f03d1 100644 --- a/libafl_bolts/src/os/windows_exceptions.rs +++ b/libafl_bolts/src/os/windows_exceptions.rs @@ -600,7 +600,7 @@ pub(crate) unsafe fn setup_ctrl_handler( compiler_fence(Ordering::SeqCst); // Log the result of SetConsoleCtrlHandler - let result = SetConsoleCtrlHandler(Some(ctrl_handler), true); + let result = SetConsoleCtrlHandler(Some(Some(ctrl_handler)), true); match result { Ok(()) => { log::info!("SetConsoleCtrlHandler succeeded"); diff --git a/libafl_bolts/src/shmem.rs b/libafl_bolts/src/shmem.rs index d3b0d8b7c6..55a587b0ab 100644 --- a/libafl_bolts/src/shmem.rs +++ b/libafl_bolts/src/shmem.rs @@ -1546,7 +1546,7 @@ pub mod win32_shmem { use windows::{ core::PCSTR, Win32::{ - Foundation::{CloseHandle, BOOL, HANDLE}, + Foundation::{CloseHandle, HANDLE}, System::Memory::{ CreateFileMappingA, MapViewOfFile, OpenFileMappingA, UnmapViewOfFile, FILE_MAP_ALL_ACCESS, MEMORY_MAPPED_VIEW_ADDRESS, PAGE_READWRITE, @@ -1621,7 +1621,7 @@ pub mod win32_shmem { // Unlike MapViewOfFile this one needs u32 let handle = OpenFileMappingA( FILE_MAP_ALL_ACCESS.0, - BOOL(0), + false, PCSTR(map_str_bytes.as_ptr().cast_mut()), )?;