[SHELL32] Follow-up of #5008 (8e036fe)

Now the menu item actions on start button should work. CORE-16544
This commit is contained in:
Katayama Hirofumi MZ 2023-01-30 08:01:15 +09:00
parent 7a17c7d9ad
commit f156f9a137
3 changed files with 6 additions and 6 deletions

View file

@ -272,7 +272,7 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu,
hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY))
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst);
m_idCmdFirst = m_idCmdLast = idCmdFirst; m_idCmdFirst = m_idCmdLast = idCmdFirst;
@ -310,7 +310,7 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu,
++Count; ++Count;
} }
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst + Count);
} }
HRESULT WINAPI HRESULT WINAPI

View file

@ -271,7 +271,7 @@ CMoveToMenu::QueryContextMenu(HMENU hMenu,
hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY))
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst);
m_idCmdFirst = m_idCmdLast = idCmdFirst; m_idCmdFirst = m_idCmdLast = idCmdFirst;
@ -314,7 +314,7 @@ CMoveToMenu::QueryContextMenu(HMENU hMenu,
++Count; ++Count;
} }
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst + Count);
} }
HRESULT WINAPI HRESULT WINAPI

View file

@ -296,7 +296,7 @@ CSendToMenu::QueryContextMenu(HMENU hMenu,
hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY)) if (uFlags & (CMF_NOVERBS | CMF_VERBSONLY))
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst);
HMENU hSubMenu = CreateMenu(); HMENU hSubMenu = CreateMenu();
if (!hSubMenu) if (!hSubMenu)
@ -327,7 +327,7 @@ CSendToMenu::QueryContextMenu(HMENU hMenu,
m_hSubMenu = hSubMenu; m_hSubMenu = hSubMenu;
DestroyMenu(hOldSubMenu); DestroyMenu(hOldSubMenu);
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cItems); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdFirst + cItems);
} }
STDMETHODIMP STDMETHODIMP