[ZIPFLDR] Fix number of menu items returned for DFM_MERGECONTEXTMENU

This commit is contained in:
Mark Jansen 2019-09-13 21:37:07 +02:00
parent 936b54faa3
commit a99325c716
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B

View file

@ -370,7 +370,7 @@ public:
if (FAILED_UNEXPECTEDLY(hr))
return hr;
pqcminfo->indexMenu += HRESULT_CODE(hr);
pqcminfo->idCmdFirst += HRESULT_CODE(hr);
return S_OK;
}
case DFM_INVOKECOMMAND:
@ -523,7 +523,7 @@ public:
}
STDMETHODIMP QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
{
int Entries = 0;
UINT idCmd = idCmdFirst;
if (!(uFlags & CMF_DEFAULTONLY))
{
@ -532,13 +532,11 @@ public:
if (indexMenu)
{
InsertMenuW(hmenu, indexMenu++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
Entries++;
}
InsertMenuW(hmenu, indexMenu++, MF_BYPOSITION | MF_STRING, idCmdFirst++, menuText);
Entries++;
InsertMenuW(hmenu, indexMenu++, MF_BYPOSITION | MF_STRING, idCmd++, menuText);
}
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Entries);
return MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, idCmd - idCmdFirst);
}
// *** IShellExtInit methods ***