From b769ae433bda0b40708687f6c0408af6afb41393 Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Thu, 18 Mar 2021 16:06:46 +0100 Subject: [PATCH] fix win32 build.rs --- libafl/build.rs | 2 +- libafl/src/bolts/shmem.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libafl/build.rs b/libafl/build.rs index ff09e9ff6c..4b557ca9e9 100644 --- a/libafl/build.rs +++ b/libafl/build.rs @@ -1,7 +1,7 @@ fn main() { #[cfg(target_os = "windows")] windows::build!( - windows::win32::system_services::{HANDLE, PSTR}, + windows::win32::system_services::{HANDLE}, windows::win32::windows_programming::CloseHandle, // API needed for the shared memory windows::win32::system_services::{CreateFileMappingA, OpenFileMappingA, MapViewOfFile, UnmapViewOfFile}, diff --git a/libafl/src/bolts/shmem.rs b/libafl/src/bolts/shmem.rs index fea8f01ab7..0dd74fae9f 100644 --- a/libafl/src/bolts/shmem.rs +++ b/libafl/src/bolts/shmem.rs @@ -446,10 +446,10 @@ pub mod shmem { use super::ShMem; use crate::{ bolts::bindings::{ + windows::win32::system_services::HANDLE, windows::win32::system_services::{ CreateFileMappingA, MapViewOfFile, OpenFileMappingA, UnmapViewOfFile, }, - windows::win32::system_services::{HANDLE}, windows::win32::windows_programming::CloseHandle, }, Error, @@ -516,8 +516,8 @@ pub mod shmem { String::from_utf8_lossy(map_str_bytes) ))); } - let map = - MapViewOfFile(handle.clone(), FILE_MAP_ALL_ACCESS, 0, 0, map_size as u32) as *mut u8; + let map = MapViewOfFile(handle.clone(), FILE_MAP_ALL_ACCESS, 0, 0, map_size as u32) + as *mut u8; if map == ptr::null_mut() { return Err(Error::Unknown(format!( "Cannot map shared memory {}", @@ -552,8 +552,8 @@ pub mod shmem { String::from_utf8_lossy(map_str_bytes) ))); } - let map = - MapViewOfFile(handle.clone(), FILE_MAP_ALL_ACCESS, 0, 0, map_size as u32) as *mut u8; + let map = MapViewOfFile(handle.clone(), FILE_MAP_ALL_ACCESS, 0, 0, map_size as u32) + as *mut u8; if map == ptr::null_mut() { return Err(Error::Unknown(format!( "Cannot map shared memory {}",