[RSHELL]

[reactos.git] / base / shell / rshell / CMenuToolbars.cpp

diff --git a/base/shell/rshell/CMenuToolbars.cpp b/base/shell/rshell/CMenuToolbars.cpp
index 5ea31b2..aa879a2 100644 (file)
--- a/base/shell/rshell/CMenuToolbars.cpp
+++ b/base/shell/rshell/CMenuToolbars.cpp
@@ -846,16 +846,17 @@ HRESULT CMenuToolbarBase::MenuBarMouseUp(INT iIndex)
     return ProcessClick(btn.idCommand);
 }
 
-HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
+HRESULT CMenuToolbarBase::PrepareExecuteItem(INT iItem)
 {
     this->m_menuBand->_KillPopupTimers();
 
-    INT index;
-    DWORD_PTR data;
-
-    GetDataFromId(iItem, &index, &data);
+    m_executeItem = iItem;
+    return GetDataFromId(iItem, &m_executeIndex, &m_executeData);
+}
 
-    return InternalExecuteItem(iItem, index, data);
+HRESULT CMenuToolbarBase::ExecuteItem()
+{
+    return InternalExecuteItem(m_executeItem, m_executeItem, m_executeData);
 }
 
 HRESULT CMenuToolbarBase::OnContextMenu(NMMOUSE * rclick)
@@ -1373,6 +1374,7 @@ HRESULT CMenuSFToolbar::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REF
             pidl = ILClone(m_idList);
             if (!pidl)
             {
+                ERR("ILClone failed!\n");
                 (*reinterpret_cast<IUnknown**>(ppv))->Release();
                 return E_FAIL;
             }