migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-29 04:40:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

win32: fix window hwnd_dpi leaks HDC handles

Browse Source
This commit is contained in:
Tony
2026-07-27 19:42:31 +08:00
committed by GitHub
parent a9e7bef8ff
commit 4a0fd4d4d5
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
winit-win32/src/dpi.rs
View File

@@ -5,6 +5,7 @@ use std::sync::Once;
use windows_sys::Win32::Foundation::{HWND, S_OK}; use windows_sys::Win32::Foundation::{HWND, S_OK};
use windows_sys::Win32::Graphics::Gdi::{ use windows_sys::Win32::Graphics::Gdi::{
GetDC, GetDeviceCaps, HMONITOR, LOGPIXELSX, MONITOR_DEFAULTTONEAREST, MonitorFromWindow, GetDC, GetDeviceCaps, HMONITOR, LOGPIXELSX, MONITOR_DEFAULTTONEAREST, MonitorFromWindow,
ReleaseDC,
}; };
use windows_sys::Win32::UI::HiDpi::{ use windows_sys::Win32::UI::HiDpi::{
DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE, DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2, DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE, DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2,
@@ -72,10 +73,6 @@ pub fn dpi_to_scale_factor(dpi: u32) -> f64 {
} }
pub unsafe fn hwnd_dpi(hwnd: HWND) -> u32 { pub unsafe fn hwnd_dpi(hwnd: HWND) -> u32 {
let hdc = unsafe { GetDC(hwnd) };
if hdc.is_null() {
panic!("[winit] `GetDC` returned null!");
}
if let Some(GetDpiForWindow) = *GET_DPI_FOR_WINDOW { if let Some(GetDpiForWindow) = *GET_DPI_FOR_WINDOW {
// We are on Windows 10 Anniversary Update (1607) or later. // We are on Windows 10 Anniversary Update (1607) or later.
match unsafe { GetDpiForWindow(hwnd) } { match unsafe { GetDpiForWindow(hwnd) } {
@@ -99,9 +96,15 @@ pub unsafe fn hwnd_dpi(hwnd: HWND) -> u32 {
} else { } else {
// We are on Vista or later. // We are on Vista or later.
if unsafe { IsProcessDPIAware() } != false.into() { if unsafe { IsProcessDPIAware() } != false.into() {
let hdc = unsafe { GetDC(hwnd) };
if hdc.is_null() {
panic!("[winit] `GetDC` returned null!");
}
// If the process is DPI aware, then scaling must be handled by the application using // If the process is DPI aware, then scaling must be handled by the application using
// this DPI value. // this DPI value.
unsafe { GetDeviceCaps(hdc, LOGPIXELSX as i32) as u32 } let dpi = unsafe { GetDeviceCaps(hdc, LOGPIXELSX as i32) as u32 };
unsafe { ReleaseDC(hwnd, hdc) };
dpi
} else { } else {
// If the process is DPI unaware, then scaling is performed by the OS; we thus return // If the process is DPI unaware, then scaling is performed by the OS; we thus return
// 96 (scale factor 1.0) to prevent the window from being re-scaled by both the // 96 (scale factor 1.0) to prevent the window from being re-scaled by both the

2
winit/src/changelog/unreleased.md
View File

@@ -64,6 +64,8 @@ changelog entry.
tools such as Punto Switcher. The `WM_INPUTLANGCHANGE` message is now handled tools such as Punto Switcher. The `WM_INPUTLANGCHANGE` message is now handled
to refresh the cached keyboard layout, while still deferring to to refresh the cached keyboard layout, while still deferring to
`DefWindowProc` for normal propagation. `DefWindowProc` for normal propagation.
- On Windows, fix getting the window's DPI internally leaks `HDC` handles.
Also only call `GetDC` when on < Windows 8.1 which improves its performance.
- On Redox, handle `EINTR` when reading from `event_socket` instead of panicking. - On Redox, handle `EINTR` when reading from `event_socket` instead of panicking.
- On Wayland, switch from using the `ahash` hashing algorithm to `foldhash`. - On Wayland, switch from using the `ahash` hashing algorithm to `foldhash`.
- On macOS, fix borderless game presentation options not sticking after switching spaces. - On macOS, fix borderless game presentation options not sticking after switching spaces.