From 64d76d81675d77135b0a1112788b1b6c7bb9acd4 Mon Sep 17 00:00:00 2001
From: Chris Denton <christophersdenton@gmail.com>
Date: Sat, 10 Sep 2022 11:23:15 +0100
Subject: [PATCH] Explicitly link kernel32.lib

Currently backtrace depends on something else to link kernel32.lib, which is usually a safe assumption. However, it may become more of a problem once raw-dylib is stable and used by the standard library and other crates.

Using `#[link]` also allows calling into the function directly instead of going through a jump stub.
---
 src/windows.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/windows.rs b/src/windows.rs
index d091874f..9ec3ba99 100644
--- a/src/windows.rs
+++ b/src/windows.rs
@@ -162,8 +162,8 @@ macro_rules! ffi {
         ffi!($($rest)*);
     );
 
-    (extern "system" { $(pub fn $name:ident($($args:tt)*) -> $ret:ty;)* } $($rest:tt)*) => (
-        extern "system" {
+    ($(#[$meta:meta])* extern "system" { $(pub fn $name:ident($($args:tt)*) -> $ret:ty;)* } $($rest:tt)*) => (
+        $(#[$meta])* extern "system" {
             $(pub fn $name($($args)*) -> $ret;)*
         }
 
@@ -371,6 +371,7 @@ ffi! {
     pub type LPCVOID = *const c_void;
     pub type LPMODULEENTRY32W = *mut MODULEENTRY32W;
 
+    #[link(name = "kernel32")]
     extern "system" {
         pub fn GetCurrentProcess() -> HANDLE;
         pub fn GetCurrentThread() -> HANDLE;
@@ -438,6 +439,7 @@ ffi! {
 
 #[cfg(target_pointer_width = "64")]
 ffi! {
+    #[link(name = "kernel32")]
     extern "system" {
         pub fn RtlLookupFunctionEntry(
             ControlPc: DWORD64,