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>
This commit is contained in:
Damjan Jovanovic 2021-04-30 07:39:10 +02:00 committed by Alexandre Julliard
parent 7af66935a0
commit 91a8b4819e
1 changed files with 4 additions and 4 deletions

View File

@ -174,14 +174,14 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu(
mi.fMask = MIIM_ID | MIIM_STRING | MIIM_FTYPE; mi.fMask = MIIM_ID | MIIM_STRING | MIIM_FTYPE;
mi.dwTypeData = str; mi.dwTypeData = str;
mi.cch = 255; 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); RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE + idCmdFirst, MF_BYCOMMAND);
mi.cbSize = sizeof(mi); mi.cbSize = sizeof(mi);
mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING; mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_STRING;
mi.dwTypeData = str; mi.dwTypeData = str;
mi.fState = MFS_ENABLED; mi.fState = MFS_ENABLED;
mi.wID = FCIDM_SHVIEW_EXPLORE; mi.wID = FCIDM_SHVIEW_EXPLORE + idCmdFirst;
mi.fType = MFT_STRING; mi.fType = MFT_STRING;
InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi); InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi);
} }
@ -189,7 +189,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu(
SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION);
if(uFlags & ~CMF_CANRENAME) if(uFlags & ~CMF_CANRENAME)
RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND); RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME + idCmdFirst, MF_BYCOMMAND);
else else
{ {
UINT enable = MF_BYCOMMAND; UINT enable = MF_BYCOMMAND;
@ -205,7 +205,7 @@ static HRESULT WINAPI ItemMenu_QueryContextMenu(
enable |= (attr & SFGAO_CANRENAME) ? MFS_ENABLED : MFS_DISABLED; 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); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst);