SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade all Windows crates (#2823)

Browse Source 
* Upgrade all win crates

* wtf

* fix
This commit is contained in:
Dominik Maier 2025-01-09 00:25:33 +01:00 committed by GitHub
parent fbd76721a1
commit f7745155c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -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 typed-builder = "0.20.0" # Implement the builder pattern at compiletime
uuid = { version = "1.10.0", features = ["serde", "v4"] } uuid = { version = "1.10.0", features = ["serde", "v4"] }
which = "6.0.3" which = "6.0.3"
windows = "0.58.0" windows = "0.59.0"
z3 = "0.12.1" z3 = "0.12.1"

4
libafl/src/executors/hooks/timer.rs
View File

@ -289,7 +289,7 @@ impl TimerStruct {
LeaveCriticalSection(self.critical_mut()); LeaveCriticalSection(self.critical_mut());
compiler_fence(Ordering::SeqCst); 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); compiler_fence(Ordering::SeqCst);
// previously this wa post_run_reset // previously this wa post_run_reset
SetThreadpoolTimer(*self.ptp_timer(), None, 0, 0); SetThreadpoolTimer(*self.ptp_timer(), None, 0, None);
} }
} }
} }

2
libafl_bolts/src/os/windows_exceptions.rs
View File

@ -600,7 +600,7 @@ pub(crate) unsafe fn setup_ctrl_handler<T: 'static + CtrlHandler>(
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
// Log the result of SetConsoleCtrlHandler // Log the result of SetConsoleCtrlHandler
let result = SetConsoleCtrlHandler(Some(ctrl_handler), true); let result = SetConsoleCtrlHandler(Some(Some(ctrl_handler)), true);
match result { match result {
Ok(()) => { Ok(()) => {
log::info!("SetConsoleCtrlHandler succeeded"); log::info!("SetConsoleCtrlHandler succeeded");

4
libafl_bolts/src/shmem.rs
View File

@ -1546,7 +1546,7 @@ pub mod win32_shmem {
use windows::{ use windows::{
core::PCSTR, core::PCSTR,
Win32::{ Win32::{
Foundation::{CloseHandle, BOOL, HANDLE}, Foundation::{CloseHandle, HANDLE},
System::Memory::{ System::Memory::{
CreateFileMappingA, MapViewOfFile, OpenFileMappingA, UnmapViewOfFile, CreateFileMappingA, MapViewOfFile, OpenFileMappingA, UnmapViewOfFile,
FILE_MAP_ALL_ACCESS, MEMORY_MAPPED_VIEW_ADDRESS, PAGE_READWRITE, FILE_MAP_ALL_ACCESS, MEMORY_MAPPED_VIEW_ADDRESS, PAGE_READWRITE,
@ -1621,7 +1621,7 @@ pub mod win32_shmem {
// Unlike MapViewOfFile this one needs u32 // Unlike MapViewOfFile this one needs u32
let handle = OpenFileMappingA( let handle = OpenFileMappingA(
FILE_MAP_ALL_ACCESS.0, FILE_MAP_ALL_ACCESS.0,
BOOL(0), false,
PCSTR(map_str_bytes.as_ptr().cast_mut()), PCSTR(map_str_bytes.as_ptr().cast_mut()),
)?; )?;