Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 00:12:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Use FS compatible PIDL format for Recycle Bin items (#7532)

Browse source 
* [SHELL32] Use FS compatible PIDL format for Recycle Bin items

This allows SHChangeNotify to handle these items and DefView will correctly update the recycle folder.

CORE-18005 CORE-19239 CORE-13950 CORE-18435 CORE-18436 CORE-18437
This commit is contained in:
Whindmar Saksit 2024-12-19 14:38:27 +01:00 • committed by GitHub
parent a18424267b
commit 28399a216b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 1151 additions and 951 deletions
Download patch file Download diff file Expand all files Collapse all files

37
dll/win32/shell32/CDefaultContextMenu.cpp
View file

@ -84,6 +84,25 @@ UINT MapVerbToDfmCmd(_In_ LPCSTR verba)
return 0;
}
static HRESULT
MapVerbToCmdId(PVOID Verb, BOOL IsUnicode, IContextMenu *pCM, UINT idFirst, UINT idLast)
{
const UINT gcs = IsUnicode ? GCS_VERBW : GCS_VERBA;
for (UINT id = idFirst; id <= idLast; ++id)
{
WCHAR buf[MAX_PATH];
*buf = UNICODE_NULL;
HRESULT hr = pCM->GetCommandString(id, gcs, NULL, (LPSTR)buf, _countof(buf));
if (FAILED(hr) || !*buf)
continue;
else if (IsUnicode && !_wcsicmp((LPWSTR)Verb, buf))
return id;
else if (!IsUnicode && !lstrcmpiA((LPSTR)Verb, (LPSTR)buf))
return id;
}
return HRESULT_FROM_WIN32(ERROR_NOT_FOUND);
}
static inline bool IsVerbListSeparator(WCHAR Ch)
{
return Ch == L' ' || Ch == L','; // learn.microsoft.com/en-us/windows/win32/shell/context-menu-handlers
@ -738,7 +757,7 @@ CDefaultContextMenu::AddStaticContextMenusToMenu(
return cIds;
}
void WINAPI _InsertMenuItemW(
BOOL WINAPI _InsertMenuItemW(
HMENU hMenu,
UINT indexMenu,
BOOL fByPosition,
@ -764,7 +783,7 @@ void WINAPI _InsertMenuItemW(
else
{
ERR("failed to load string %p\n", dwTypeData);
return;
return FALSE;
}
}
else
@ -774,7 +793,7 @@ void WINAPI _InsertMenuItemW(
mii.wID = wID;
mii.fType = fType;
InsertMenuItemW(hMenu, indexMenu, fByPosition, &mii);
return InsertMenuItemW(hMenu, indexMenu, fByPosition, &mii);
}
void
@ -1212,6 +1231,18 @@ CDefaultContextMenu::MapVerbToCmdId(PVOID Verb, PUINT idCmd, BOOL IsUnicode)
}
}
for (POSITION it = m_DynamicEntries.GetHeadPosition(); it != NULL;)
{
DynamicShellEntry& entry = m_DynamicEntries.GetNext(it);
if (!entry.NumIds)
continue;
HRESULT hr = ::MapVerbToCmdId(Verb, IsUnicode, entry.pCM, 0, entry.NumIds - 1);
if (SUCCEEDED(hr))
{
*idCmd = m_iIdSHEFirst + entry.iIdCmdFirst + hr;
return TRUE;
}
}
return FALSE;
}