Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Fix CDefaultContextMenu DFM_MERGECONTEXTMENU handling

Browse source
This commit is contained in:
Mark Jansen 2022-09-01 21:54:31 +02:00
parent 6a1f287820
commit 9efa7cc498
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dll/win32/shell32/CDefaultContextMenu.cpp
View file

@ -433,7 +433,7 @@ CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UIN
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
info.iIdCmdFirst = cIds; info.iIdCmdFirst = cIds;
info.NumIds = LOWORD(hr); info.NumIds = HRESULT_CODE(hr);
(*pIndexMenu) += info.NumIds; (*pIndexMenu) += info.NumIds;
cIds += info.NumIds; cIds += info.NumIds;
@ -646,8 +646,9 @@ CDefaultContextMenu::QueryContextMenu(
QCMINFO qcminfo = {hMenu, IndexMenu, idCmdNext, idCmdLast, NULL}; QCMINFO qcminfo = {hMenu, IndexMenu, idCmdNext, idCmdLast, NULL};
if (SUCCEEDED(_DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo))) if (SUCCEEDED(_DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo)))
{ {
cIds += qcminfo.idCmdFirst; UINT added = idCmdNext - (idCmdFirst + cIds);
IndexMenu += qcminfo.idCmdFirst; cIds += added;
IndexMenu += added;
m_iIdCBFirst = m_iIdSHELast; m_iIdCBFirst = m_iIdSHELast;
m_iIdCBLast = cIds; m_iIdCBLast = cIds;
idCmdNext = idCmdFirst + cIds; idCmdNext = idCmdFirst + cIds;