From cc0da780ef0ec3bdc625e4cb414cc9f39f544ac6 Mon Sep 17 00:00:00 2001
From: Andrea Fioraldi <andreafioraldi@gmail.com>
Date: Thu, 18 Mar 2021 16:32:16 +0100
Subject: [PATCH] fixes for win32

---
 libafl/build.rs           |  2 +-
 libafl/src/bolts/shmem.rs | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libafl/build.rs b/libafl/build.rs
index 4b557ca9e9..bbacc85fa4 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},
+        windows::win32::system_services::{HANDLE, BOOL},
         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 8f6d6324ec..86f7be1c9f 100644
--- a/libafl/src/bolts/shmem.rs
+++ b/libafl/src/bolts/shmem.rs
@@ -446,7 +446,7 @@ pub mod shmem {
     use super::ShMem;
     use crate::{
         bolts::bindings::{
-            windows::win32::system_services::HANDLE,
+            windows::win32::system_services::{HANDLE, BOOL},
             windows::win32::system_services::{
                 CreateFileMappingA, MapViewOfFile, OpenFileMappingA, UnmapViewOfFile,
             },
@@ -509,7 +509,7 @@ pub mod shmem {
     impl Win32ShMem {
         pub fn from_str(map_str_bytes: &[u8; 20], map_size: usize) -> Result<Self, Error> {
             unsafe {
-                let handle = OpenFileMappingA(FILE_MAP_ALL_ACCESS, 0, map_str_bytes as *const u8 as *const i8);
+                let handle = OpenFileMappingA(FILE_MAP_ALL_ACCESS, BOOL(0), map_str_bytes as *const u8 as *const i8);
                 if handle == HANDLE(0) {
                     return Err(Error::Unknown(format!(
                         "Cannot open shared memory {}",
@@ -562,14 +562,12 @@ pub mod shmem {
                         String::from_utf8_lossy(map_str_bytes)
                     )));
                 }
-                let mut ret = Self {
-                    shm_str: [0; 20],
+                Ok(Self {
+                    shm_str: map_str_bytes[0..20],
                     handle: handle,
                     map: map,
                     map_size: map_size,
-                };
-                ret.shm_str.clone_from_slice(map_str_bytes[0..20]);
-                Ok(ret)
+                })
             }
         }
     }