Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-16 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Fix separator not showing for CopyTo and MoveTo menu

Browse source 
Fix wrong previous item index.
This commit is contained in:
Thamatip Chitpong 2024-04-09 22:33:32 +07:00
parent d4ca55f65e
commit a706f6ba78
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dll/win32/shell32/CCopyMoveToMenu.cpp
View file

@ -257,6 +257,21 @@ HRESULT CCopyMoveToMenu::DoAction(LPCMINVOKECOMMANDINFO lpici)
return hr; return hr;
} }
static BOOL
GetPreviousMenuItemInfo(HMENU hMenu, UINT iItem, LPMENUITEMINFOW lpmii)
{
BOOL bSuccess = FALSE;
while (iItem > 0)
{
bSuccess = GetMenuItemInfoW(hMenu, --iItem, TRUE, lpmii);
if (bSuccess || (!bSuccess && GetLastError() != ERROR_MENU_ITEM_NOT_FOUND))
break;
}
return bSuccess;
}
STDMETHODIMP STDMETHODIMP
CCopyToMenu::QueryContextMenu(HMENU hMenu, CCopyToMenu::QueryContextMenu(HMENU hMenu,
UINT indexMenu, UINT indexMenu,
@ -279,7 +294,7 @@ CCopyToMenu::QueryContextMenu(HMENU hMenu,
ZeroMemory(&mii, sizeof(mii)); ZeroMemory(&mii, sizeof(mii));
mii.cbSize = sizeof(mii); mii.cbSize = sizeof(mii);
mii.fMask = MIIM_TYPE; mii.fMask = MIIM_TYPE;
if (GetMenuItemInfoW(hMenu, indexMenu - 1, TRUE, &mii) && if (GetPreviousMenuItemInfo(hMenu, indexMenu, &mii) &&
mii.fType != MFT_SEPARATOR) mii.fType != MFT_SEPARATOR)
{ {
ZeroMemory(&mii, sizeof(mii)); ZeroMemory(&mii, sizeof(mii));
@ -338,7 +353,7 @@ CMoveToMenu::QueryContextMenu(HMENU hMenu,
mii.fMask = MIIM_TYPE; mii.fMask = MIIM_TYPE;
mii.dwTypeData = szBuff; mii.dwTypeData = szBuff;
mii.cch = _countof(szBuff); mii.cch = _countof(szBuff);
if (GetMenuItemInfoW(hMenu, indexMenu - 1, TRUE, &mii) && if (GetPreviousMenuItemInfo(hMenu, indexMenu, &mii) &&
mii.fType != MFT_SEPARATOR && mii.fType != MFT_SEPARATOR &&
!(mii.fType == MFT_STRING && CStringW(szBuff) == strCopyTo)) !(mii.fType == MFT_STRING && CStringW(szBuff) == strCopyTo))
{ {