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

[SHELL32] CDefViewBckgrndMenu: Fix handling string verbs.

Browse source 
It shouldn't be necessary for QueryContextMenu to be called before InvokeCommand.
Move retrieving the IContextMenu of the folder to the initialization of the class.
CORE-12866
This commit is contained in:
Giannis Adamopoulos 2018-02-14 00:03:35 +02:00
parent eb3987e172
commit 111c40e012
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dll/win32/shell32/CDefViewBckgrndMenu.cpp
View file

@ -113,6 +113,11 @@ HRESULT
CDefViewBckgrndMenu::Initialize(IShellFolder* psf) CDefViewBckgrndMenu::Initialize(IShellFolder* psf)
{ {
m_psf = psf; m_psf = psf;
/* Get the context menu of the folder. Do it here because someone may call
InvokeCommand without calling QueryContextMenu. It is fine if this fails */
m_psf->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &m_folderCM));
return S_OK; return S_OK;
} }
@ -154,9 +159,8 @@ CDefViewBckgrndMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFir
but as stated above, its sole user is CDefView and should really be that way. */ but as stated above, its sole user is CDefView and should really be that way. */
m_idCmdFirst = idCmdFirst; m_idCmdFirst = idCmdFirst;
/* Query the shell folder to add any items it wants to add in the background context menu */ /* Let the shell folder add any items it wants to add in the background context menu */
hr = m_psf->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &m_folderCM)); if (m_folderCM)
if (SUCCEEDED(hr))
{ {
hr = m_folderCM->QueryContextMenu(hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); hr = m_folderCM->QueryContextMenu(hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))