port

Author: kennykerr

.github/workflows/main.yml

@@ -63,7 +63,7 @@ jobs:
     - run: cargo build
     - run: cargo test
     - run: cargo test --features "serialize-serde"
-    - run: cargo test --features "verify-winapi"
+    - run: cargo test --features "verify-windows-sys"
     - run: cargo test --features "cpp_demangle"
     - run: cargo test --no-default-features
     - run: cargo test --no-default-features --features "std"
@@ -144,7 +144,7 @@ jobs:
       shell: bash
     - run: rustup target add aarch64-pc-windows-msvc
     - run: cargo test --no-run --target aarch64-pc-windows-msvc
-    - run: cargo test --no-run --target aarch64-pc-windows-msvc --features verify-winapi
+    - run: cargo test --no-run --target aarch64-pc-windows-msvc --features verify-windows-sys
 
   ios:
     name: iOS

Cargo.toml

@@ -49,8 +49,18 @@ version = "0.36.0"
 default-features = false
 features = ['read_core', 'elf', 'macho', 'pe', 'xcoff', 'unaligned', 'archive']
 
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.9", optional = true }
+[target.'cfg(windows)'.dependencies.windows-sys]
+version = "0.42.0"
+features = [
+    "Win32_Foundation",
+    "Win32_Security",
+    "Win32_System_Diagnostics_Debug",
+    "Win32_System_Kernel",
+    "Win32_System_LibraryLoader",
+    "Win32_System_SystemInformation",
+    "Win32_System_Threading",
+    "Win32_System_WindowsProgramming",
+]
 
 [build-dependencies]
 # Only needed for Android, but cannot be target dependent
@@ -82,20 +92,7 @@ dladdr = []
 kernel32 = []
 libunwind = []
 unix-backtrace = []
-verify-winapi = [
-  'winapi/dbghelp',
-  'winapi/handleapi',
-  'winapi/libloaderapi',
-  'winapi/memoryapi',
-  'winapi/minwindef',
-  'winapi/processthreadsapi',
-  'winapi/synchapi',
-  'winapi/tlhelp32',
-  'winapi/winbase',
-  'winapi/winnt',
-  'winapi/winnls',
-  'winapi/stringapiset',
-]
+verify-windows-sys = []
 
 [[example]]
 name = "backtrace"

src/backtrace/dbghelp32.rs

@@ -11,7 +11,12 @@
 
 #![allow(bad_style)]
 
-use super::super::{dbghelp, windows::*};
+use windows_sys::{
+    Win32::Foundation::*, Win32::System::Diagnostics::Debug::*,
+    Win32::System::SystemInformation::*, Win32::System::Threading::*,
+};
+
+use super::super::dbghelp;
 use core::ffi::c_void;
 use core::mem;
 
@@ -129,7 +134,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
     match (*dbghelp.dbghelp()).StackWalkEx() {
         Some(StackWalkEx) => {
             let mut inner: STACKFRAME_EX = mem::zeroed();
-            inner.StackFrameSize = mem::size_of::<STACKFRAME_EX>() as DWORD;
+            inner.StackFrameSize = mem::size_of::<STACKFRAME_EX>() as u32;
             let mut frame = super::Frame {
                 inner: Frame {
                     stack_frame: StackFrame::New(inner),
@@ -143,7 +148,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
             };
 
             while StackWalkEx(
-                image as DWORD,
+                image as u32,
                 process,
                 thread,
                 frame_ptr,
@@ -153,7 +158,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
                 Some(get_module_base),
                 None,
                 0,
-            ) == TRUE
+            ) == 1
             {
                 frame.inner.base_address = get_module_base(process_handle, frame.ip() as _) as _;
 
@@ -176,7 +181,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
             };
 
             while dbghelp.StackWalk64()(
-                image as DWORD,
+                image as _,
                 process,
                 thread,
                 frame_ptr,
@@ -185,7 +190,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
                 Some(function_table_access),
                 Some(get_module_base),
                 None,
-            ) == TRUE
+            ) == 1
             {
                 frame.inner.base_address = get_module_base(process_handle, frame.ip() as _) as _;
 
@@ -198,7 +203,7 @@ pub unsafe fn trace(cb: &mut dyn FnMut(&super::Frame) -> bool) {
 }
 
 #[cfg(target_arch = "x86")]
-fn init_frame(frame: &mut Frame, ctx: &CONTEXT) -> WORD {
+fn init_frame(frame: &mut Frame, ctx: &CONTEXT) -> u16 {
     frame.addr_pc_mut().Offset = ctx.Eip as u64;
     frame.addr_pc_mut().Mode = AddrModeFlat;
     frame.addr_stack_mut().Offset = ctx.Esp as u64;
@@ -210,7 +215,7 @@ fn init_frame(frame: &mut Frame, ctx: &CONTEXT) -> WORD {
 }
 
 #[cfg(target_arch = "arm")]
-fn init_frame(frame: &mut Frame, ctx: &CONTEXT) -> WORD {
+fn init_frame(frame: &mut Frame, ctx: &CONTEXT) -> u16 {
     frame.addr_pc_mut().Offset = ctx.Pc as u64;
     frame.addr_pc_mut().Mode = AddrModeFlat;
     frame.addr_stack_mut().Offset = ctx.Sp as u64;