diff --git a/crates/gpui/src/platform/windows/dispatcher.rs b/crates/gpui/src/platform/windows/dispatcher.rs index 05f0e36d564c8d3347d7747e72a2ff1b6a07a386..5a7e2b8ee1d18dc3cea39acc7198923549bfe8e1 100644 --- a/crates/gpui/src/platform/windows/dispatcher.rs +++ b/crates/gpui/src/platform/windows/dispatcher.rs @@ -10,15 +10,7 @@ use async_task::Runnable; use flume::Sender; use parking::Parker; use parking_lot::Mutex; -use windows::Win32::{ - Foundation::{BOOLEAN, HANDLE}, - System::Threading::{ - CreateThreadpool, CreateThreadpoolWork, CreateTimerQueueTimer, DeleteTimerQueueTimer, - SetEvent, SetThreadpoolThreadMinimum, SubmitThreadpoolWork, PTP_CALLBACK_INSTANCE, - PTP_POOL, PTP_WORK, TP_CALLBACK_ENVIRON_V3, TP_CALLBACK_PRIORITY_NORMAL, - WT_EXECUTEONLYONCE, - }, -}; +use windows::Win32::{Foundation::*, System::Threading::*}; use crate::{PlatformDispatcher, TaskLabel}; diff --git a/crates/gpui/src/platform/windows/display.rs b/crates/gpui/src/platform/windows/display.rs index 0a733afe84ce015ccd524cf3ceadd444978e71f2..6eff3c7870a5592a81aed262b47520a67d3742a8 100644 --- a/crates/gpui/src/platform/windows/display.rs +++ b/crates/gpui/src/platform/windows/display.rs @@ -2,13 +2,7 @@ use itertools::Itertools; use smallvec::SmallVec; use std::rc::Rc; use uuid::Uuid; -use windows::Win32::{ - Foundation::{BOOL, LPARAM, POINT, RECT}, - Graphics::Gdi::{ - EnumDisplayMonitors, GetMonitorInfoW, MonitorFromPoint, HDC, HMONITOR, MONITORINFO, - MONITORINFOEXW, MONITOR_DEFAULTTOPRIMARY, - }, -}; +use windows::Win32::{Foundation::*, Graphics::Gdi::*}; use crate::{Bounds, DisplayId, GlobalPixels, PlatformDisplay, Point, Size}; diff --git a/crates/gpui/src/platform/windows/platform.rs b/crates/gpui/src/platform/windows/platform.rs index 5fb83957e5e7f4c89adbfc06490d5f1e3a4a3ed5..dca29e321c7c91c3019a3fc718367d0f50baf365 100644 --- a/crates/gpui/src/platform/windows/platform.rs +++ b/crates/gpui/src/platform/windows/platform.rs @@ -21,35 +21,13 @@ use smallvec::SmallVec; use time::UtcOffset; use util::{ResultExt, SemanticVersion}; use windows::{ - core::{IUnknown, HRESULT, HSTRING, PCWSTR, PWSTR}, - Wdk::System::SystemServices::RtlGetVersion, + core::*, + Wdk::System::SystemServices::*, Win32::{ - Foundation::{CloseHandle, HANDLE, HWND}, - Graphics::{ - DirectComposition::DCompositionWaitForCompositorClock, - Gdi::{RedrawWindow, HRGN, RDW_INVALIDATE, RDW_UPDATENOW}, - }, - System::{ - Com::{CoCreateInstance, CreateBindCtx, CLSCTX_ALL}, - Ole::{OleInitialize, OleUninitialize}, - Threading::{CreateEventW, INFINITE}, - Time::{GetTimeZoneInformation, TIME_ZONE_ID_INVALID}, - }, - UI::{ - Input::KeyboardAndMouse::GetDoubleClickTime, - Shell::{ - FileOpenDialog, FileSaveDialog, IFileOpenDialog, IFileSaveDialog, IShellItem, - SHCreateItemFromParsingName, ShellExecuteW, FILEOPENDIALOGOPTIONS, - FOS_ALLOWMULTISELECT, FOS_FILEMUSTEXIST, FOS_PICKFOLDERS, SIGDN_FILESYSPATH, - }, - WindowsAndMessaging::{ - DispatchMessageW, LoadImageW, PeekMessageW, PostQuitMessage, SetCursor, - SystemParametersInfoW, TranslateMessage, HCURSOR, IDC_ARROW, IDC_CROSS, IDC_HAND, - IDC_IBEAM, IDC_NO, IDC_SIZENS, IDC_SIZEWE, IMAGE_CURSOR, LR_DEFAULTSIZE, LR_SHARED, - MSG, PM_REMOVE, SPI_GETWHEELSCROLLCHARS, SPI_GETWHEELSCROLLLINES, SW_SHOWDEFAULT, - SYSTEM_PARAMETERS_INFO_UPDATE_FLAGS, WM_QUIT, WM_SETTINGCHANGE, - }, - }, + Foundation::*, + Graphics::{DirectComposition::*, Gdi::*}, + System::{Com::*, Ole::*, Threading::*, Time::*}, + UI::{Input::KeyboardAndMouse::*, Shell::*, WindowsAndMessaging::*}, }, }; diff --git a/crates/gpui/src/platform/windows/util.rs b/crates/gpui/src/platform/windows/util.rs index fbb19a365497fb4ea0d936177849376920d657c0..7093f564cafcb76fca122a1ba47743122d602acf 100644 --- a/crates/gpui/src/platform/windows/util.rs +++ b/crates/gpui/src/platform/windows/util.rs @@ -1,9 +1,4 @@ -use windows::Win32::{ - Foundation::{HWND, LPARAM, WPARAM}, - UI::WindowsAndMessaging::{ - GetWindowLongPtrW, GetWindowLongW, SetWindowLongPtrW, SetWindowLongW, WINDOW_LONG_PTR_INDEX, - }, -}; +use windows::Win32::{Foundation::*, UI::WindowsAndMessaging::*}; pub(crate) trait HiLoWord { fn hiword(&self) -> u16;