tauri-apps/archived-tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-01-31 00:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Fixed GDI object leak when a resizable window is created and then closed on Windows platform (#14209)

Browse Source 
Co-authored-by: Kirill Gribunin <kgribunin@contoso.local>
This commit is contained in:
Kirill Gribunin
2025-09-24 20:57:05 +02:00
committed by GitHub
parent d340b8c8b1
commit b0c493a4ea
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/tauri-runtime-wry/src/undecorated_resizing.rs
View File

@@ -420,17 +420,24 @@ mod windows {
let border_x = util::get_system_metrics_for_dpi(SM_CXFRAME, dpi);
let border_y = util::get_system_metrics_for_dpi(SM_CYFRAME, dpi);
let hrgn1 = CreateRectRgn(0, 0, width, height);
// hrgn1 must be mutable to call .free() later
let mut hrgn1 = CreateRectRgn(0, 0, width, height);
let x1 = if only_top { 0 } else { border_x };
let y1 = border_y;
let x2 = if only_top { width } else { width - border_x };
let y2 = if only_top { height } else { height - border_y };
let hrgn2 = CreateRectRgn(x1, y1, x2, y2);
CombineRgn(Some(hrgn1), Some(hrgn1), Some(hrgn2), RGN_DIFF);
// Wrap hrgn2 in Owned so it is automatically freed when going out of scope
let hrgn2 = Owned::new(CreateRectRgn(x1, y1, x2, y2));
SetWindowRgn(hwnd, Some(hrgn1), true);
CombineRgn(Some(hrgn1), Some(hrgn1), Some(*hrgn2), RGN_DIFF);
// Try to set the window region
if SetWindowRgn(hwnd, Some(hrgn1), true) == 0 {
// If it fails, we must free hrgn1 manually
hrgn1.free();
}
}
pub fn update_drag_hwnd_rgn_for_undecorated(hwnd: isize, has_undecorated_shadows: bool) {