Fix pc-windows-gnu builds

Author: CraftSpider

Cargo.toml

@@ -20,10 +20,10 @@ rust-version = "1.65.0"
 [workspace]
 members = ['crates/cpp_smoke_test', 'crates/as-if-std']
 exclude = [
-  'crates/without_debuginfo',
-  'crates/macos_frames_test',
-  'crates/line-tables-only',
-  'crates/debuglink',
+    'crates/without_debuginfo',
+    'crates/macos_frames_test',
+    'crates/line-tables-only',
+    'crates/debuglink',
 ]
 
 [dependencies]
@@ -36,7 +36,7 @@ serde = { version = "1.0", optional = true, features = ['derive'] }
 
 # Optionally demangle C++ frames' symbols in backtraces.
 cpp_demangle = { default-features = false, version = "0.4.0", optional = true, features = [
-  "alloc",
+    "alloc",
 ] }
 
 [target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies]
@@ -55,12 +55,14 @@ features = [
     "Win32_Foundation",
     "Win32_Security",
     "Win32_System_Diagnostics_Debug",
+    "Win32_System_Diagnostics_ToolHelp",
     "Win32_System_Kernel",
     "Win32_System_LibraryLoader",
     "Win32_System_SystemInformation",
     "Win32_System_Threading",
     "Win32_System_WindowsProgramming",
     "Win32_Globalization",
+    "Win32_System_Memory"
 ]
 
 [build-dependencies]

src/backtrace/dbghelp32.rs

@@ -12,11 +12,11 @@
 #![allow(bad_style)]
 
 use windows_sys::{
-    Win32::Foundation::*, Win32::System::Diagnostics::Debug::*,
-    Win32::System::SystemInformation::*, Win32::System::Threading::*,
+    Win32::System::Diagnostics::Debug::*, Win32::System::SystemInformation::*,
+    Win32::System::Threading::*,
 };
 
-use super::super::dbghelp;
+use super::super::{dbghelp, windows::*};
 use core::ffi::c_void;
 use core::mem;
 

src/symbolize/gimli/libs_windows.rs

@@ -1,3 +1,5 @@
+use windows_sys::{Win32::Foundation::*, Win32::System::Diagnostics::ToolHelp::*};
+
 use super::super::super::windows::*;
 use super::mystd::os::windows::prelude::*;
 use super::{coff, mmap, Library, LibrarySegment, OsString};

src/symbolize/gimli/mmap_windows.rs

@@ -1,6 +1,8 @@
-use super::super::super::windows::*;
+use windows_sys::{Win32::Foundation::*, Win32::System::Memory::*};
+
 use super::mystd::fs::File;
 use super::mystd::os::windows::prelude::*;
+use core::ffi::c_void;
 use core::ops::Deref;
 use core::ptr;
 use core::slice;
@@ -17,14 +19,14 @@ impl Mmap {
     pub unsafe fn map(file: &File, len: usize) -> Option<Mmap> {
         let file = file.try_clone().ok()?;
         let mapping = CreateFileMappingA(
-            file.as_raw_handle().cast(),
+            file.as_raw_handle() as isize,
             ptr::null_mut(),
             PAGE_READONLY,
             0,
             0,
             ptr::null(),
         );
-        if mapping.is_null() {
+        if mapping == 0 {
             return None;
         }
         let ptr = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, len);