Use extern "C" instead of extern "cdecl"

Author: ChrisDenton

crates/libs/bindgen/src/tables/method_def.rs

@@ -51,7 +51,7 @@ impl MethodDef {
             if flags.contains(PInvokeAttributes::CallConvPlatformapi) {
                 "system"
             } else if flags.contains(PInvokeAttributes::CallConvCdecl) {
-                "cdecl"
+                "C"
             } else {
                 ""
             }

crates/libs/link/src/lib.rs

@@ -32,7 +32,7 @@ macro_rules! link {
 #[macro_export]
 macro_rules! link {
     ($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
-        extern $abi {
+        extern "C" {
             pub fn $($function)*;
         }
     )

crates/libs/metadata/src/reader/tables/method_def.rs

@@ -47,7 +47,7 @@ impl<'a> MethodDef<'a> {
             if flags.contains(PInvokeAttributes::CallConvPlatformapi) {
                 "system"
             } else if flags.contains(PInvokeAttributes::CallConvCdecl) {
-                "cdecl"
+                "C"
             } else {
                 ""
             }

crates/libs/targets/src/lib.rs

@@ -28,7 +28,7 @@ macro_rules! link {
 }
 
 /// Defines an external function to import.
-#[cfg(all(windows, not(windows_raw_dylib)))]
+#[cfg(all(windows, not(windows_raw_dylib), target_arch = "x86"))]
 #[macro_export]
 macro_rules! link {
     ($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
@@ -40,12 +40,25 @@ macro_rules! link {
     )
 }
 
+/// Defines an external function to import.
+#[cfg(all(windows, not(windows_raw_dylib), not(target_arch = "x86")))]
+#[macro_export]
+macro_rules! link {
+    ($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
+        #[link(name = "windows.0.53.0")]
+        extern "C" {
+            $(#[link_name=$link_name])?
+            pub fn $($function)*;
+        }
+    )
+}
+
 /// Defines an external function to import.
 #[cfg(all(not(windows), not(windows_raw_dylib)))]
 #[macro_export]
 macro_rules! link {
     ($library:literal $abi:literal $($link_name:literal)? fn $($function:tt)*) => (
-        extern $abi {
+        extern "C" {
             pub fn $($function)*;
         }
     )

crates/samples/windows-sys/delay_load/src/main.rs

@@ -37,7 +37,7 @@ fn main() {
     }
 }
 
-type ShellMessageBoxW = unsafe extern "cdecl" fn(
+type ShellMessageBoxW = unsafe extern "C" fn(
     happinst: usize,
     hwnd: usize,
     lpctext: PCWSTR,

crates/samples/windows/delay_load/src/main.rs

@@ -33,7 +33,7 @@ fn main() {
     }
 }
 
-type ShellMessageBoxW = unsafe extern "cdecl" fn(
+type ShellMessageBoxW = unsafe extern "C" fn(
     happinst: usize,
     hwnd: usize,
     lpctext: PCWSTR,

crates/tests/libs/link/tests/link.rs

@@ -22,7 +22,7 @@ fn link_name() {
 
 #[test]
 fn cdecl() {
-    windows_link::link!("wldap32.dll" "cdecl" fn LdapMapErrorToWin32(code : i32) -> u32);
+    windows_link::link!("wldap32.dll" "C" fn LdapMapErrorToWin32(code : i32) -> u32);
     const LDAP_BUSY: i32 = 51;
     const ERROR_BUSY: u32 = 170;
 

crates/tests/libs/targets/tests/link.rs

@@ -22,7 +22,7 @@ fn link_name() {
 
 #[test]
 fn cdecl() {
-    windows_targets::link!("wldap32.dll" "cdecl" fn LdapMapErrorToWin32(code : i32) -> u32);
+    windows_targets::link!("wldap32.dll" "C" fn LdapMapErrorToWin32(code : i32) -> u32);
     const LDAP_BUSY: i32 = 51;
     const ERROR_BUSY: u32 = 170;
 

crates/tests/misc/standalone/src/b_std.rs

@@ -10,7 +10,7 @@ windows_link::link!("kernel32.dll" "system" fn CloseHandle(hobject : HANDLE) ->
 windows_link::link!("kernel32.dll" "system" fn GetLastError() -> WIN32_ERROR);
 windows_link::link!("advapi32.dll" "system" "SystemFunction036" fn RtlGenRandom(randombuffer : *mut core::ffi::c_void, randombufferlength : u32) -> bool);
 windows_link::link!("ws2_32.dll" "system" fn socket(af : i32, r#type : WINSOCK_SOCKET_TYPE, protocol : i32) -> SOCKET);
-windows_link::link!("user32.dll" "cdecl" fn wsprintfA(param0 : PSTR, param1 : PCSTR, ...) -> i32);
+windows_link::link!("user32.dll" "C" fn wsprintfA(param0 : PSTR, param1 : PCSTR, ...) -> i32);
 pub type BCRYPT_ALG_HANDLE = *mut core::ffi::c_void;
 pub type BCRYPT_HANDLE = *mut core::ffi::c_void;
 pub type BOOL = i32;

crates/tests/misc/standalone/src/b_test.rs

@@ -11,7 +11,7 @@ windows_link::link!("ole32.dll" "system" fn CoCreateInstance(rclsid : *const GUI
 windows_link::link!("kernel32.dll" "system" fn CreateEventW(lpeventattributes : *const SECURITY_ATTRIBUTES, bmanualreset : BOOL, binitialstate : BOOL, lpname : PCWSTR) -> HANDLE);
 windows_link::link!("kernel32.dll" "system" fn SetEvent(hevent : HANDLE) -> BOOL);
 windows_link::link!("kernel32.dll" "system" fn WaitForSingleObject(hhandle : HANDLE, dwmilliseconds : u32) -> WAIT_EVENT);
-windows_link::link!("user32.dll" "cdecl" fn wsprintfA(param0 : PSTR, param1 : PCSTR, ...) -> i32);
+windows_link::link!("user32.dll" "C" fn wsprintfA(param0 : PSTR, param1 : PCSTR, ...) -> i32);
 pub type BOOL = i32;
 pub type CLSCTX = u32;
 pub const CLSCTX_ALL: CLSCTX = 23u32;