Skip to content

Stop overwriting the ABI in windows-link #3689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennykerr merged 2 commits into from
Jul 31, 2025
Merged

Stop overwriting the ABI in windows-link #3689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2cf99b
link-abi
kennykerr Jul 30, 2025
e3c0fb7
remove old compat test
kennykerr Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions crates/libs/link/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ macro_rules! link {
macro_rules! link {
($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
#[link(name = $library, kind = "raw-dylib", modifiers = "+verbatim")]
// TODO: remove hardcoded "C" before next major update - https://github.com/microsoft/windows-rs/pull/3669
extern "C" {
extern $abi {
$(#[link_name=$link_name])?
pub fn $($function)*;
}
Expand Down
14 changes: 14 additions & 0 deletions crates/tests/libs/link/tests/link.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,17 @@ fn cdecl() {
assert_eq!(LdapMapErrorToWin32(LDAP_BUSY), ERROR_BUSY);
}
}

// Test for https://github.com/microsoft/windows-rs/pull/3669#issuecomment-3097317771
#[test]
fn fn_ptr() {
windows_link::link!("kernel32.dll" "system" fn GetTickCount() -> u32);

type GetTickCountType = unsafe extern "system" fn() -> u32;

static GET_TICK_COUNT: GetTickCountType = GetTickCount;

unsafe {
GET_TICK_COUNT();
}
}
20 changes: 0 additions & 20 deletions crates/tests/misc/calling_convention/tests/ptr.rs
View file
Open in desktop

This file was deleted.