From 043c8635a9f8c98b68f755ed0ed5f9646c43d142 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Tue, 20 Jan 2026 20:49:03 +0100 Subject: [PATCH] Upgrade `windows-sys` dependency to 0.61 (#4464) --- Cargo.toml | 2 +- winit-win32/src/dark_mode.rs | 4 ++-- winit-win32/src/definitions.rs | 4 ++-- winit-win32/src/monitor.rs | 3 ++- winit-win32/src/util.rs | 4 ++-- winit/src/changelog/unreleased.md | 4 ++++ 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 362b9da29..9081f70fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ objc2-ui-kit = { version = "0.3.2", default-features = false } # Windows dependencies. unicode-segmentation = "1.7.1" -windows-sys = "0.59.0" +windows-sys = "0.61" # Linux dependencies. ahash = { version = "0.8.7", features = ["no-rng"] } diff --git a/winit-win32/src/dark_mode.rs b/winit-win32/src/dark_mode.rs index be54f1680..e0e8746c1 100644 --- a/winit-win32/src/dark_mode.rs +++ b/winit-win32/src/dark_mode.rs @@ -3,7 +3,7 @@ use std::sync::LazyLock; /// which is inspired by the solution in https://github.com/ysc3839/win32-darkmode use std::{ffi::c_void, ptr}; -use windows_sys::Win32::Foundation::{BOOL, HWND, LPARAM, S_OK, WPARAM}; +use windows_sys::Win32::Foundation::{HWND, LPARAM, S_OK, WPARAM}; use windows_sys::Win32::System::LibraryLoader::{GetProcAddress, LoadLibraryA}; use windows_sys::Win32::UI::Accessibility::{HCF_HIGHCONTRASTON, HIGHCONTRASTA}; use windows_sys::Win32::UI::Controls::SetWindowTheme; @@ -11,7 +11,7 @@ use windows_sys::Win32::UI::Input::KeyboardAndMouse::GetActiveWindow; use windows_sys::Win32::UI::WindowsAndMessaging::{ DefWindowProcW, SPI_GETHIGHCONTRAST, SystemParametersInfoA, WM_NCACTIVATE, }; -use windows_sys::core::{PCSTR, PCWSTR}; +use windows_sys::core::{BOOL, PCSTR, PCWSTR}; use windows_sys::w; use winit_core::window::Theme; diff --git a/winit-win32/src/definitions.rs b/winit-win32/src/definitions.rs index 743c82c60..c5225cfee 100644 --- a/winit-win32/src/definitions.rs +++ b/winit-win32/src/definitions.rs @@ -3,9 +3,9 @@ use std::ffi::c_void; -use windows_sys::Win32::Foundation::{BOOL, HWND, POINTL}; +use windows_sys::Win32::Foundation::{HWND, POINTL}; use windows_sys::Win32::System::Com::{FORMATETC, STGMEDIUM}; -use windows_sys::core::{GUID, HRESULT}; +use windows_sys::core::{BOOL, GUID, HRESULT}; pub type IUnknown = *mut c_void; pub type IAdviseSink = *mut c_void; diff --git a/winit-win32/src/monitor.rs b/winit-win32/src/monitor.rs index fed4574b2..0e252418a 100644 --- a/winit-win32/src/monitor.rs +++ b/winit-win32/src/monitor.rs @@ -4,13 +4,14 @@ use std::num::{NonZeroU16, NonZeroU32}; use std::{io, iter, mem, ptr}; use dpi::{PhysicalPosition, PhysicalSize}; -use windows_sys::Win32::Foundation::{BOOL, HWND, LPARAM, POINT, RECT}; +use windows_sys::Win32::Foundation::{HWND, LPARAM, POINT, RECT}; use windows_sys::Win32::Graphics::Gdi::{ DEVMODEW, DM_BITSPERPEL, DM_DISPLAYFREQUENCY, DM_PELSHEIGHT, DM_PELSWIDTH, ENUM_CURRENT_SETTINGS, EnumDisplayMonitors, EnumDisplaySettingsExW, GetMonitorInfoW, HDC, HMONITOR, MONITOR_DEFAULTTONEAREST, MONITOR_DEFAULTTOPRIMARY, MONITORINFO, MONITORINFOEXW, MonitorFromPoint, MonitorFromWindow, }; +use windows_sys::core::BOOL; use winit_core::monitor::{MonitorHandleProvider, VideoMode}; use super::util::decode_wide; diff --git a/winit-win32/src/util.rs b/winit-win32/src/util.rs index 4dc6b5fc6..0218ff102 100644 --- a/winit-win32/src/util.rs +++ b/winit-win32/src/util.rs @@ -6,7 +6,7 @@ use std::sync::LazyLock; use std::sync::atomic::{AtomicBool, Ordering}; use std::{io, mem, ptr}; -use windows_sys::Win32::Foundation::{BOOL, HANDLE, HMODULE, HWND, NTSTATUS, POINT, RECT}; +use windows_sys::Win32::Foundation::{HANDLE, HMODULE, HWND, NTSTATUS, POINT, RECT}; use windows_sys::Win32::Graphics::Gdi::{ClientToScreen, HMONITOR}; use windows_sys::Win32::System::LibraryLoader::{GetProcAddress, LoadLibraryA}; use windows_sys::Win32::System::SystemInformation::OSVERSIONINFOW; @@ -23,7 +23,7 @@ use windows_sys::Win32::UI::WindowsAndMessaging::{ SM_CXVIRTUALSCREEN, SM_CYVIRTUALSCREEN, SM_XVIRTUALSCREEN, SM_YVIRTUALSCREEN, SW_MAXIMIZE, ShowCursor, WINDOW_LONG_PTR_INDEX, WINDOWPLACEMENT, }; -use windows_sys::core::{HRESULT, PCWSTR}; +use windows_sys::core::{BOOL, HRESULT, PCWSTR}; use winit_core::cursor::CursorIcon; use winit_core::event::DeviceId; diff --git a/winit/src/changelog/unreleased.md b/winit/src/changelog/unreleased.md index 62121352c..273f62019 100644 --- a/winit/src/changelog/unreleased.md +++ b/winit/src/changelog/unreleased.md @@ -44,6 +44,10 @@ changelog entry. - Add `keyboard` support for OpenHarmony. +### Changed + +- Updated `windows-sys` to `v0.61`. + ### Fixed - On X11, fix `set_hittest` not working on some window managers.