fix: default style memory leak

winbar/src/container.rs

@@ -6,7 +6,10 @@ use windows::{
     core::w,
     Win32::{
         Foundation::{COLORREF, HWND, LPARAM, LRESULT, WPARAM},
-        Graphics::Gdi::{BeginPaint, CreateSolidBrush, EndPaint, InvalidateRect, PAINTSTRUCT},
+        Graphics::Gdi::{
+            BeginPaint, CreateSolidBrush, DeleteObject, EndPaint, InvalidateRect, SelectObject,
+            SetBkColor, SetTextColor, PAINTSTRUCT, PS_SOLID,
+        },
         System::{
             LibraryLoader::GetModuleHandleW,
             Threading::{GetStartupInfoW, STARTUPINFOW},
@@ -20,7 +23,10 @@ use windows::{
     },
 };
 
-use crate::{windows_api::WindowsApi, COMPONENT_MANAGER, HEIGHT, TRANSPARENT_COLOR, WIDTH};
+use crate::{
+    styles::Styles, windows_api::WindowsApi, COMPONENT_MANAGER, DEFAULT_BG_COLOR, DEFAULT_FG_COLOR,
+    DEFAULT_FONT, DEFAULT_FONT_SIZE, HEIGHT, TRANSPARENT_COLOR, WIDTH,
+};
 
 pub fn create_window() -> HWND {
     unsafe {
@@ -117,7 +123,29 @@ pub extern "system" fn window_proc(
                 let mut ps = PAINTSTRUCT::default();
                 let hdc = BeginPaint(hwnd, &mut ps);
 
-                WindowsApi::set_default_styles(hdc);
+                let default_bg_color = {
+                    let color = DEFAULT_BG_COLOR.lock().unwrap();
+                    color.bgr()
+                };
+                let default_fg_color = {
+                    let color = DEFAULT_FG_COLOR.lock().unwrap();
+                    color.bgr()
+                };
+                let default_font = {
+                    let font = DEFAULT_FONT.lock().unwrap();
+                    font.to_string()
+                };
+                let default_font_size = DEFAULT_FONT_SIZE.load(Ordering::SeqCst);
+
+                let pen = Styles::pen(default_bg_color, PS_SOLID);
+                let brush = Styles::solid_brush(default_bg_color);
+                let font = Styles::font(default_font_size, &default_font);
+
+                SelectObject(hdc, pen);
+                SelectObject(hdc, brush);
+                SelectObject(hdc, font);
+                SetBkColor(hdc, COLORREF(default_bg_color));
+                SetTextColor(hdc, COLORREF(default_fg_color));
 
                 match COMPONENT_MANAGER.lock() {
                     Ok(mut manager) => {
@@ -132,6 +160,10 @@ pub extern "system" fn window_proc(
                     }
                 }
 
+                DeleteObject(pen);
+                DeleteObject(brush);
+                DeleteObject(font);
+
                 EndPaint(hwnd, &ps);
                 tracing::trace!("Finished painting");
             }

winbar/src/main.rs

@@ -31,6 +31,7 @@ pub mod component_impl;
 pub mod config;
 pub mod container;
 pub mod server;
+pub mod styles;
 pub mod windows_api;
 
 // runtime variables

winbar/src/styles.rs

@@ -0,0 +1,56 @@
+use windows::{
+    core::HSTRING,
+    Win32::{
+        Foundation::COLORREF,
+        Graphics::Gdi::{
+            CreateFontW, CreatePen, CreateSolidBrush, ANSI_CHARSET, CLIP_DEFAULT_PRECIS,
+            DEFAULT_PITCH, FF_DONTCARE, FW_DONTCARE, HBRUSH, HFONT, HPEN, OUT_TT_PRECIS, PEN_STYLE,
+            PROOF_QUALITY,
+        },
+    },
+};
+
+pub struct Styles {}
+
+impl Styles {
+    /// Creates a new pen.
+    ///
+    /// Note that it is the caller's responsibility to call SelectObject to use the object, and
+    /// DeleteObject to cleanup the resource.
+    pub fn pen(color: u32, style: PEN_STYLE) -> HPEN {
+        unsafe { CreatePen(style, 0, COLORREF(color)) }
+    }
+
+    /// Creates a new solid brush.
+    ///
+    /// Note that it is the caller's responsibility to call SelectObject to use the object, and
+    /// DeleteObject to cleanup the resource.
+    pub fn solid_brush(color: u32) -> HBRUSH {
+        unsafe { CreateSolidBrush(COLORREF(color)) }
+    }
+
+    /// Creates a new font.
+    ///
+    /// Note that it is the caller's responsibility to call SelectObject to use the object, and
+    /// DeleteObject to cleanup the resource.
+    pub fn font(size: i32, name: &str) -> HFONT {
+        unsafe {
+            CreateFontW(
+                size,
+                0,
+                0,
+                0,
+                FW_DONTCARE.0 as i32,
+                0,
+                0,
+                0,
+                ANSI_CHARSET.0.into(),
+                OUT_TT_PRECIS.0.into(),
+                CLIP_DEFAULT_PRECIS.0.into(),
+                PROOF_QUALITY.0.into(),
+                DEFAULT_PITCH.0 as u32 | FF_DONTCARE.0 as u32,
+                &HSTRING::from(name),
+            )
+        }
+    }
+}

winbar/src/windows_api.rs

@@ -1,79 +1,20 @@
-use std::{mem::MaybeUninit, sync::atomic::Ordering};
+use std::mem::MaybeUninit;
 
 use anyhow::{bail, Result};
 use tracing::instrument;
-use windows::{
-    core::HSTRING,
-    Win32::{
-        Foundation::{COLORREF, HWND, LPARAM, WPARAM},
-        Graphics::{
-            Gdi::{
-                CreateFontW, CreatePen, CreateSolidBrush, SelectObject, SetBkColor, SetTextColor,
-                ANSI_CHARSET, CLIP_DEFAULT_PRECIS, DEFAULT_PITCH, FF_DONTCARE, FW_DONTCARE, HDC,
-                OUT_TT_PRECIS, PROOF_QUALITY, PS_SOLID,
-            },
-            GdiPlus::{GdiplusShutdown, GdiplusStartup, GdiplusStartupInput, Status},
-        },
-        UI::WindowsAndMessaging::{PostMessageW, ShowWindow, SW_HIDE, SW_SHOW, WM_CLOSE},
-    },
+use windows::Win32::{
+    Foundation::{HWND, LPARAM, WPARAM},
+    Graphics::GdiPlus::{GdiplusShutdown, GdiplusStartup, GdiplusStartupInput, Status},
+    UI::WindowsAndMessaging::{PostMessageW, ShowWindow, SW_HIDE, SW_SHOW, WM_CLOSE},
 };
 
-use crate::{DEFAULT_BG_COLOR, DEFAULT_FG_COLOR, DEFAULT_FONT, DEFAULT_FONT_SIZE};
-
 pub struct WindowsApi {}
 
 impl WindowsApi {
     pub fn str_to_u16_slice(s: &str) -> Vec<u16> {
         s.encode_utf16().collect::<Vec<u16>>()
     }
 
-    pub fn set_default_styles(hdc: HDC) {
-        let default_bg_color = {
-            let color = DEFAULT_BG_COLOR.lock().unwrap();
-            color.bgr()
-        };
-        let default_fg_color = {
-            let color = DEFAULT_FG_COLOR.lock().unwrap();
-            color.bgr()
-        };
-        let default_font = {
-            let font = DEFAULT_FONT.lock().unwrap();
-            font.to_string()
-        };
-        let default_font_size = DEFAULT_FONT_SIZE.load(Ordering::SeqCst);
-
-        unsafe {
-            let pen = CreatePen(PS_SOLID, 0, COLORREF(default_bg_color));
-            let brush = CreateSolidBrush(COLORREF(default_bg_color));
-
-            SelectObject(hdc, pen);
-            SelectObject(hdc, brush);
-            SetBkColor(hdc, COLORREF(default_bg_color));
-            // SetBkColor(hdc, COLORREF(TRANSPARENT_COLOR));
-
-            let font = CreateFontW(
-                default_font_size,
-                0,
-                0,
-                0,
-                FW_DONTCARE.0 as i32,
-                0,
-                0,
-                0,
-                ANSI_CHARSET.0.into(),
-                OUT_TT_PRECIS.0.into(),
-                CLIP_DEFAULT_PRECIS.0.into(),
-                PROOF_QUALITY.0.into(),
-                DEFAULT_PITCH.0 as u32 | FF_DONTCARE.0 as u32,
-                &HSTRING::from(default_font),
-            );
-
-            SelectObject(hdc, font);
-
-            SetTextColor(hdc, COLORREF(default_fg_color));
-        }
-    }
-
     pub fn show_window(hwnd: HWND) {
         unsafe {
             let _ = ShowWindow(hwnd, SW_SHOW);