diff options
| -rw-r--r-- | talpid-core/src/dns/windows/netsh.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/split_tunnel/windows/driver.rs | 3 | ||||
| -rw-r--r-- | talpid-core/src/split_tunnel/windows/path_monitor.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/split_tunnel/windows/volume_monitor.rs | 7 | ||||
| -rw-r--r-- | talpid-core/src/split_tunnel/windows/windows.rs | 4 |
5 files changed, 9 insertions, 11 deletions
diff --git a/talpid-core/src/dns/windows/netsh.rs b/talpid-core/src/dns/windows/netsh.rs index 406b3710c4..17cf551b1f 100644 --- a/talpid-core/src/dns/windows/netsh.rs +++ b/talpid-core/src/dns/windows/netsh.rs @@ -13,8 +13,8 @@ use talpid_windows_net::{index_from_luid, luid_from_alias}; use windows_sys::Win32::{ Foundation::{MAX_PATH, WAIT_OBJECT_0, WAIT_TIMEOUT}, System::{ - SystemInformation::GetSystemDirectoryW, Threading::WaitForSingleObject, - WindowsProgramming::INFINITE, + SystemInformation::GetSystemDirectoryW, + Threading::{WaitForSingleObject, INFINITE}, }, }; diff --git a/talpid-core/src/split_tunnel/windows/driver.rs b/talpid-core/src/split_tunnel/windows/driver.rs index 04666de9ec..6200329696 100644 --- a/talpid-core/src/split_tunnel/windows/driver.rs +++ b/talpid-core/src/split_tunnel/windows/driver.rs @@ -32,8 +32,7 @@ use windows_sys::Win32::{ System::{ Diagnostics::ToolHelp::TH32CS_SNAPPROCESS, Ioctl::{FILE_ANY_ACCESS, METHOD_BUFFERED, METHOD_NEITHER}, - Threading::{WaitForMultipleObjects, WaitForSingleObject}, - WindowsProgramming::INFINITE, + Threading::{WaitForMultipleObjects, WaitForSingleObject, INFINITE}, IO::{DeviceIoControl, GetOverlappedResult, OVERLAPPED}, }, }; diff --git a/talpid-core/src/split_tunnel/windows/path_monitor.rs b/talpid-core/src/split_tunnel/windows/path_monitor.rs index 9470c66d9f..8843909fd8 100644 --- a/talpid-core/src/split_tunnel/windows/path_monitor.rs +++ b/talpid-core/src/split_tunnel/windows/path_monitor.rs @@ -28,7 +28,7 @@ use windows_sys::Win32::{ System::{ Ioctl::FSCTL_GET_REPARSE_POINT, SystemServices::{IO_REPARSE_TAG_MOUNT_POINT, IO_REPARSE_TAG_SYMLINK}, - WindowsProgramming::INFINITE, + Threading::INFINITE, IO::{ CancelIoEx, CreateIoCompletionPort, DeviceIoControl, GetQueuedCompletionStatus, PostQueuedCompletionStatus, OVERLAPPED, diff --git a/talpid-core/src/split_tunnel/windows/volume_monitor.rs b/talpid-core/src/split_tunnel/windows/volume_monitor.rs index 0d35187070..982a3cf6f2 100644 --- a/talpid-core/src/split_tunnel/windows/volume_monitor.rs +++ b/talpid-core/src/split_tunnel/windows/volume_monitor.rs @@ -12,11 +12,10 @@ use std::{ use talpid_types::ErrorExt; use windows_sys::Win32::{ Storage::FileSystem::GetLogicalDrives, - System::SystemServices::{ - DBTF_NET, DBT_DEVICEARRIVAL, DBT_DEVICEREMOVECOMPLETE, DBT_DEVTYP_VOLUME, - DEV_BROADCAST_HDR, DEV_BROADCAST_VOLUME, + UI::WindowsAndMessaging::{ + DefWindowProcW, DBTF_NET, DBT_DEVICEARRIVAL, DBT_DEVICEREMOVECOMPLETE, DBT_DEVTYP_VOLUME, + DEV_BROADCAST_HDR, DEV_BROADCAST_VOLUME, WM_DEVICECHANGE, }, - UI::WindowsAndMessaging::{DefWindowProcW, WM_DEVICECHANGE}, }; pub(super) struct VolumeMonitor(()); diff --git a/talpid-core/src/split_tunnel/windows/windows.rs b/talpid-core/src/split_tunnel/windows/windows.rs index aad3d2e63c..f526ddf933 100644 --- a/talpid-core/src/split_tunnel/windows/windows.rs +++ b/talpid-core/src/split_tunnel/windows/windows.rs @@ -21,7 +21,7 @@ use windows_sys::Win32::{ Diagnostics::ToolHelp::{ CreateToolhelp32Snapshot, Process32FirstW, Process32NextW, PROCESSENTRY32W, }, - ProcessStatus::K32GetProcessImageFileNameW, + ProcessStatus::GetProcessImageFileNameW, Threading::{ CreateEventW, GetProcessTimes, OpenProcess, SetEvent, PROCESS_QUERY_LIMITED_INFORMATION, }, @@ -285,7 +285,7 @@ fn get_process_device_path_inner( buffer.reserve_exact(buffer_capacity); let written = unsafe { - K32GetProcessImageFileNameW( + GetProcessImageFileNameW( handle, buffer.as_mut_ptr() as *mut _, buffer.capacity() as u32, |
