Skip to content

Commit a340ccf

Browse files
authored
Fix clippy warnings about calling convention (#18)
1 parent f949cf7 commit a340ccf

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/log.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static LOG_CONTAINER: std::sync::LazyLock<std::sync::Mutex<std::collections::Vec
3535
///
3636
/// # Safety
3737
/// `message` must be a valid pointer that points to an aligned null terminated UTF-16 string
38-
pub unsafe extern "stdcall" fn default_logger(
38+
pub unsafe extern "system" fn default_logger(
3939
level: wintun_raw::WINTUN_LOGGER_LEVEL,
4040
_timestamp: wintun_raw::DWORD64,
4141
message: windows_sys::core::PCWSTR,

src/wintun_raw.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub const WINTUN_LOGGER_LEVEL_WINTUN_LOG_ERR: WINTUN_LOGGER_LEVEL = 2;
3030
pub type WINTUN_LOGGER_LEVEL = ::std::os::raw::c_int;
3131
#[doc = " Called by internal logger to report diagnostic messages\n\n @param Level Message level.\n\n @param Timestamp Message timestamp in in 100ns intervals since 1601-01-01 UTC.\n\n @param Message Message text."]
3232
pub type WINTUN_LOGGER_CALLBACK =
33-
::std::option::Option<unsafe extern "stdcall" fn(Level: WINTUN_LOGGER_LEVEL, Timestamp: DWORD64, Message: LPCWSTR)>;
33+
::std::option::Option<unsafe extern "system" fn(Level: WINTUN_LOGGER_LEVEL, Timestamp: DWORD64, Message: LPCWSTR)>;
3434
#[repr(C)]
3535
#[derive(Debug, Copy, Clone)]
3636
pub struct _TUN_SESSION {
@@ -42,21 +42,21 @@ extern crate libloading;
4242
pub struct wintun {
4343
__library: ::libloading::Library,
4444
pub WintunCreateAdapter:
45-
unsafe extern "stdcall" fn(arg1: LPCWSTR, arg2: LPCWSTR, arg3: *const GUID) -> WINTUN_ADAPTER_HANDLE,
46-
pub WintunCloseAdapter: unsafe extern "stdcall" fn(arg1: WINTUN_ADAPTER_HANDLE),
47-
pub WintunOpenAdapter: unsafe extern "stdcall" fn(arg1: LPCWSTR) -> WINTUN_ADAPTER_HANDLE,
48-
pub WintunGetAdapterLUID: unsafe extern "stdcall" fn(arg1: WINTUN_ADAPTER_HANDLE, arg2: *mut NET_LUID),
49-
pub WintunGetRunningDriverVersion: unsafe extern "stdcall" fn() -> DWORD,
50-
pub WintunDeleteDriver: unsafe extern "stdcall" fn() -> BOOL,
51-
pub WintunSetLogger: unsafe extern "stdcall" fn(arg1: WINTUN_LOGGER_CALLBACK),
45+
unsafe extern "system" fn(arg1: LPCWSTR, arg2: LPCWSTR, arg3: *const GUID) -> WINTUN_ADAPTER_HANDLE,
46+
pub WintunCloseAdapter: unsafe extern "system" fn(arg1: WINTUN_ADAPTER_HANDLE),
47+
pub WintunOpenAdapter: unsafe extern "system" fn(arg1: LPCWSTR) -> WINTUN_ADAPTER_HANDLE,
48+
pub WintunGetAdapterLUID: unsafe extern "system" fn(arg1: WINTUN_ADAPTER_HANDLE, arg2: *mut NET_LUID),
49+
pub WintunGetRunningDriverVersion: unsafe extern "system" fn() -> DWORD,
50+
pub WintunDeleteDriver: unsafe extern "system" fn() -> BOOL,
51+
pub WintunSetLogger: unsafe extern "system" fn(arg1: WINTUN_LOGGER_CALLBACK),
5252
pub WintunStartSession:
53-
unsafe extern "stdcall" fn(arg1: WINTUN_ADAPTER_HANDLE, arg2: DWORD) -> WINTUN_SESSION_HANDLE,
54-
pub WintunEndSession: unsafe extern "stdcall" fn(arg1: WINTUN_SESSION_HANDLE),
55-
pub WintunGetReadWaitEvent: unsafe extern "stdcall" fn(arg1: WINTUN_SESSION_HANDLE) -> HANDLE,
56-
pub WintunReceivePacket: unsafe extern "stdcall" fn(arg1: WINTUN_SESSION_HANDLE, arg2: *mut DWORD) -> *mut BYTE,
57-
pub WintunReleaseReceivePacket: unsafe extern "stdcall" fn(arg1: WINTUN_SESSION_HANDLE, arg2: *const BYTE),
58-
pub WintunAllocateSendPacket: unsafe extern "stdcall" fn(arg1: WINTUN_SESSION_HANDLE, arg2: DWORD) -> *mut BYTE,
59-
pub WintunSendPacket: unsafe extern "stdcall" fn(arg1: WINTUN_SESSION_HANDLE, arg2: *const BYTE),
53+
unsafe extern "system" fn(arg1: WINTUN_ADAPTER_HANDLE, arg2: DWORD) -> WINTUN_SESSION_HANDLE,
54+
pub WintunEndSession: unsafe extern "system" fn(arg1: WINTUN_SESSION_HANDLE),
55+
pub WintunGetReadWaitEvent: unsafe extern "system" fn(arg1: WINTUN_SESSION_HANDLE) -> HANDLE,
56+
pub WintunReceivePacket: unsafe extern "system" fn(arg1: WINTUN_SESSION_HANDLE, arg2: *mut DWORD) -> *mut BYTE,
57+
pub WintunReleaseReceivePacket: unsafe extern "system" fn(arg1: WINTUN_SESSION_HANDLE, arg2: *const BYTE),
58+
pub WintunAllocateSendPacket: unsafe extern "system" fn(arg1: WINTUN_SESSION_HANDLE, arg2: DWORD) -> *mut BYTE,
59+
pub WintunSendPacket: unsafe extern "system" fn(arg1: WINTUN_SESSION_HANDLE, arg2: *const BYTE),
6060
}
6161
impl wintun {
6262
pub unsafe fn new<P>(path: P) -> Result<Self, ::libloading::Error>

0 commit comments

Comments
 (0)