ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 12:23:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BROWSEUI]

Browse Source 
* SHOnCWMCommandLine: Fix IETHREADPARAM leak.

[SHELL32]
* Fix HMENU leak of the popup used in the view mode button of the toolbar.

[RSHELL]
* Undo a previous change to help debug the leaks.
* Remove child submenus when closing a menu band.
* Add some extra verification for debugging purposes. 

[BROWSEUI]
[RSHELL]
[SHELL32]
* Move ReleaseCComPtrExpectZero to the shared header.

svn path=/branches/shell-experiments/; revision=64858
This commit is contained in:
David Quintana
2014-10-20 21:35:22 +00:00
parent b138a8620d
commit 96cdae0a7c
9 changed files with 184 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/shell/rshell/CMenuBand.cpp
+40 -6
View File
@@ -56,7 +56,9 @@ CMenuBand::CMenuBand() :
m_popupBar(NULL),
m_popupItem(-1),
m_Show(FALSE),
m_shellBottom(FALSE)
m_shellBottom(FALSE),
m_trackedPopup(NULL),
m_trackedHwnd(NULL)
{
m_focusManager = CMenuFocusManager::AcquireManager();
}
@@ -418,6 +420,16 @@ HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow)
HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved)
{
if (m_subMenuChild)
{
m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
}
if (m_subMenuChild)
{
DbgPrint("Child object should have removed itself.\n");
}
ShowDW(FALSE);
if (m_staticToolbar != NULL)
@@ -594,7 +606,10 @@ HRESULT CMenuBand::_IsTracking()
HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient)
{
m_subMenuChild = NULL;
if (m_subMenuChild)
{
ReleaseCComPtrExpectZero(m_subMenuChild);
}
if (!punkClient)
{
@@ -738,10 +753,16 @@ HRESULT CMenuBand::_TrackSubMenu(HMENU popup, INT x, INT y, RECT& rcExclude)
UINT flags = TPM_VERPOSANIMATION | TPM_VERTICAL | TPM_LEFTALIGN;
HWND hwnd = m_menuOwner ? m_menuOwner : m_topLevelWindow;
m_trackedPopup = popup;
m_trackedHwnd = hwnd;
m_focusManager->PushTrackedPopup(popup);
::TrackPopupMenuEx(popup, flags, x, y, hwnd, &params);
m_focusManager->PopTrackedPopup(popup);
m_trackedPopup = NULL;
m_trackedHwnd = NULL;
_DisableMouseTrack(FALSE);
return S_OK;
@@ -950,11 +971,19 @@ HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType)
HRESULT CMenuBand::_CancelCurrentPopup()
{
if (!m_subMenuChild)
return S_FALSE;
if (m_subMenuChild)
{
HRESULT hr = m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
return hr;
}
HRESULT hr = m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
return hr;
if (m_trackedPopup)
{
::SendMessage(m_trackedHwnd, WM_CANCELMODE, 0, 0);
return S_OK;
}
return S_FALSE;
}
HRESULT CMenuBand::_OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RECTL * pExclude, BOOL keyInitiated)
@@ -1044,6 +1073,11 @@ HRESULT CMenuBand::_MenuBarMouseUp(HWND hwnd, INT item)
return S_OK;
}
HRESULT CMenuBand::_HasSubMenu()
{
return m_popupBar ? S_OK : S_FALSE;
}
HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags)
{
UNIMPLEMENTED;