Module: wine Branch: master Commit: 91a8b4819ead8609f0e1828de527d61da18f1508 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91a8b4819ead8609f0e1828de...
Author: Damjan Jovanovic damjan.jov@gmail.com Date: Fri Apr 30 07:39:10 2021 +0200
shell32: The menu wIDs in hmenu were rebased by idCmdFirst.
Signed-off-by: Damjan Jovanovic damjan.jov@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/shell32/shlview_cmenu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 04ac0b6fd3c..351d1e5d141 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -174,14 +174,14 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( mi.fMask = MIIM_ID | MIIM_STRING | MIIM_FTYPE; mi.dwTypeData = str; mi.cch = 255; - GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND, &mi); + GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND, &mi); RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND);
mi.cbSize = sizeof(mi); mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING; mi.dwTypeData = str; mi.fState = MFS_ENABLED; - mi.wID = FCIDM_SHVIEW_EXPLORE; + mi.wID = FCIDM_SHVIEW_EXPLORE + idCmdFirst; mi.fType = MFT_STRING; InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi); } @@ -189,7 +189,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION);
if(uFlags & ~CMF_CANRENAME) - RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND); + RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, MF_BYCOMMAND); else { UINT enable = MF_BYCOMMAND; @@ -205,7 +205,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu( enable |= (attr & SFGAO_CANRENAME) ? MFS_ENABLED : MFS_DISABLED; }
- EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, enable); + EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, enable); }
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst);