Skip to content

fix(windows): dangling pointer when remove_for_hwnd called before drop #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Legend-Master merged 1 commit into from
Jun 17, 2026
Merged

fix(windows): dangling pointer when remove_for_hwnd called before drop #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/fix-windows-dangling-pointer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"muda": patch
---

On Windows, fixed a bug that would truncate menubar items text to ~10 characters in dark-mode.

@Legend-Master Legend-Master Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I swear I wrote the change file and it didn't look like this 🤦‍♂️

23 changes: 11 additions & 12 deletions src/platform_impl/windows/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ pub(crate) struct Menu {

impl Drop for Menu {
fn drop(&mut self) {
let hwnds = self.hwnds.borrow().keys().copied().collect::<Vec<_>>();
for hwnd in &hwnds {
let _ = unsafe { self.remove_for_hwnd(*hwnd) };
for (hwnd, _) in self.hwnds.borrow_mut().drain() {
unsafe { Self::remove_from_hwnd(hwnd) };
}

fn remove_from_children_stores(internal_id: u32, children: &Vec<Rc<RefCell<MenuChild>>>) {
Expand Down Expand Up @@ -143,10 +142,6 @@ impl Drop for Menu {
}

unsafe {
for hwnd in &hwnds {
SetMenu(*hwnd as _, std::ptr::null_mut());
RemoveWindowSubclass(*hwnd as _, Some(menu_subclass_proc), MENU_SUBCLASS_ID);
}
DestroyMenu(self.hmenu);
DestroyMenu(self.hpopupmenu);
}
Expand Down Expand Up @@ -346,13 +341,13 @@ impl Menu {
self.hwnds.borrow_mut().insert(hwnd, theme);

// SAFETY: HWND validity is upheld by caller
SetMenu(hwnd as _, self.hmenu);
SetWindowSubclass(
hwnd as _,
Some(menu_subclass_proc),
MENU_SUBCLASS_ID,
dwrefdata_from_obj(self),
);
SetMenu(hwnd as _, self.hmenu);
DrawMenuBar(hwnd as _);

Ok(())
Expand All @@ -367,12 +362,16 @@ impl Menu {
.borrow_mut()
.remove(&hwnd)
.ok_or(crate::Error::NotInitialized)?;
Self::remove_from_hwnd(hwnd);
Ok(())
}

unsafe fn remove_from_hwnd(hwnd: isize) {
let hwnd = hwnd as windows_sys::Win32::Foundation::HWND;
// SAFETY: HWND validity is upheld by caller
SetMenu(hwnd as _, std::ptr::null_mut());
DrawMenuBar(hwnd as _);

Ok(())
RemoveWindowSubclass(hwnd, Some(menu_subclass_proc), MENU_SUBCLASS_ID);
SetMenu(hwnd, std::ptr::null_mut());
DrawMenuBar(hwnd);
}

pub unsafe fn attach_menu_subclass_for_hwnd(&self, hwnd: isize) {
Expand Down
Loading