[BROWSEUI]

* Allow the static items in the Favorites menu to be received by the shell browse window.
* Handle the Organize Favorites menu item by opening either the USER favorites, or the COMMON version of the folder.

[RSHELL]
* Send the proper HWND together with the HMENU, when sending callbacks.

svn path=/branches/shell-experiments/; revision=65111
This commit is contained in:
David Quintana 2014-10-29 22:28:51 +00:00
parent 5ee771bbc6
commit 2e0e5f7174
8 changed files with 64 additions and 13 deletions

View file

@ -738,18 +738,14 @@ HRESULT CMenuBand::_CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id, LPI
if (!m_psmc)
return S_FALSE;
HWND hwnd;
GetWindow(&hwnd);
SMDATA smData = { 0 };
smData.punk = static_cast<IShellMenu2*>(this);
smData.uId = id;
smData.uIdParent = m_uId;
smData.uIdAncestor = m_uIdAncestor;
smData.pidlItem = pidl;
smData.hwnd = hwnd;
if (m_hmenu)
smData.hmenu = m_hmenu;
smData.hwnd = m_menuOwner ? m_menuOwner : m_topLevelWindow;
smData.hmenu = m_hmenu;
smData.pvUserData = NULL;
if (m_SFToolbar)
m_SFToolbar->GetShellFolder(NULL, &smData.pidlFolder, IID_PPV_ARG(IShellFolder, &smData.psf));