Remove the windows-sys dependency (#60)

* Remove the windows-sys dependency * Fix build.rs Co-authored-by: Jake Shadle <[email protected]>
rust-minidump · Oct 26, 2022 · 18d57a8 · 18d57a8
1 parent ef6c87d
commit 18d57a8
Show file tree

Hide file tree

Showing 7 changed files with 628 additions and 56 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,19 +31,6 @@ nix = { version = "0.25", default-features = false, features = [
     "user",
 ] }
 
-[target.'cfg(target_os = "windows")'.dependencies.windows-sys]
-version = "0.42"
-features = [
-    # MiniDumpWriteDump requires...a lot of features
-    "Win32_Foundation",
-    "Win32_Storage_FileSystem",
-    "Win32_System_Diagnostics_Debug",
-    "Win32_System_Kernel",
-    "Win32_System_Memory",
-    # GetCurrentThreadId & OpenProcess
-    "Win32_System_Threading",
-]
-
 [target.'cfg(target_os = "macos")'.dependencies]
 # Binds some additional mac specifics not in libc
 mach2 = "0.4"

diff --git a/build.rs b/build.rs
@@ -0,0 +1,5 @@
+fn main() {
+    if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("windows") {
+        println!("cargo:rustc-link-lib=dylib=dbghelp");
+    }
+}
diff --git a/src/bin/test.rs b/src/bin/test.rs
@@ -295,12 +295,13 @@ mod linux {
 
 #[cfg(target_os = "windows")]
 mod windows {
+    use minidump_writer::ffi::{
+        GetCurrentProcessId, GetCurrentThread, GetCurrentThreadId, GetThreadContext, CONTEXT,
+        EXCEPTION_POINTERS, EXCEPTION_RECORD,
+    };
+
     use super::*;
     use std::mem;
-    use windows_sys::Win32::System::{
-        Diagnostics::Debug::{GetThreadContext, CONTEXT, EXCEPTION_POINTERS, EXCEPTION_RECORD},
-        Threading::{GetCurrentProcessId, GetCurrentThread, GetCurrentThreadId},
-    };
 
     #[inline(never)]
     pub(super) fn real_main(args: Vec<String>) -> Result<()> {

diff --git a/src/windows.rs b/src/windows.rs
@@ -1,2 +1,3 @@
 pub mod errors;
+pub mod ffi;
 pub mod minidump_writer;