Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 20:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RSHELL]

Browse source 
* Fix stack overflow when pressing enter with a menu item selected. Executing with enter now works correctly.
CORE-7586

svn path=/branches/shell-experiments/; revision=62957
This commit is contained in:
David Quintana 2014-04-24 16:17:53 +00:00
parent 663bc1da24
commit cfb6a8a36e
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
base/shell/rshell/CMenuToolbars.cpp
View file

@ -816,13 +816,6 @@ HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theRe
INT iItem = (INT)wParam;
return ExecuteItem(iItem);
}
HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
{
m_menuBand->_KillPopupTimers();
if (PopupItem(iItem) == S_OK)
{
TRACE("PopupItem returned S_OK\n");
@ -831,10 +824,12 @@ HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
TRACE("Executing...\n");
HRESULT hr = m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE);
return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE);
}
if (FAILED_UNEXPECTEDLY(hr))
return hr;
HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
{
m_menuBand->_KillPopupTimers();
INT index;
DWORD_PTR data;