Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix menu leaks in explorer

Browse source 
svn path=/trunk/; revision=34284
This commit is contained in:
Jeffrey Morlan 2008-07-03 15:58:37 +00:00
parent 9865603d81
commit 32111e8715
4 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/base/shell/explorer/desktop/desktop.cpp
View file

@ -656,6 +656,7 @@ HRESULT DesktopShellView::DoDesktopContextMenu(int x, int y)
} }
} else } else
_cm_ifs.reset(); _cm_ifs.reset();
DestroyMenu(hmenu);
} }
pcm->Release(); pcm->Release();

2
reactos/base/shell/explorer/explorer.cpp
View file

@ -855,6 +855,8 @@ PopupMenu::PopupMenu(UINT nid)
{ {
HMENU hMenu = LoadMenu(g_Globals._hInstance, MAKEINTRESOURCE(nid)); HMENU hMenu = LoadMenu(g_Globals._hInstance, MAKEINTRESOURCE(nid));
_hmenu = GetSubMenu(hMenu, 0); _hmenu = GetSubMenu(hMenu, 0);
RemoveMenu(hMenu, 0, MF_BYPOSITION);
DestroyMenu(hMenu);
} }

1
reactos/base/shell/explorer/utility/shellclasses.cpp
View file

@ -566,6 +566,7 @@ HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParent, int
} }
} else } else
cm_ifs.reset(); cm_ifs.reset();
DestroyMenu(hmenu);
} }
pcm->Release(); pcm->Release();

5
reactos/base/shell/explorer/utility/utility.h
View file

@ -663,6 +663,11 @@ struct PopupMenu
{ {
} }
~PopupMenu()
{
DestroyMenu(_hmenu);
}
PopupMenu(UINT nid); PopupMenu(UINT nid);
operator HMENU() {return _hmenu;} operator HMENU() {return _hmenu;}