Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-27 21:18:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] RegFolder must correctly handle GetDisplayNameOf parsing paths (#6265)

Browse source
This commit is contained in:
Whindmar Saksit 2024-01-08 17:02:59 +01:00 committed by GitHub
parent 7c2e8c67f1
commit 55a5d7a177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
dll/win32/shell32/folders/CRegFolder.cpp
View file

@ -641,7 +641,8 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags,
} }
/* Allocate the buffer for the result */ /* Allocate the buffer for the result */
LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); SIZE_T cchPath = MAX_PATH + 1;
LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc(cchPath * sizeof(WCHAR));
if (!pszPath) if (!pszPath)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
@ -649,18 +650,41 @@ HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags,
if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING) if (GET_SHGDN_FOR (dwFlags) == SHGDN_FORPARSING)
{ {
wcscpy(pszPath, m_rootPath); SIZE_T pathlen = 0;
PWCHAR pItemName = &pszPath[wcslen(pszPath)]; PWCHAR pItemName = pszPath; // GET_SHGDN_RELATION(dwFlags) == SHGDN_INFOLDER
if (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)
{
hr = StringCchCopyW(pszPath, cchPath, m_rootPath);
if (SUCCEEDED(hr))
{
pathlen = wcslen(pszPath);
pItemName = &pszPath[pathlen];
if (pathlen)
{
if (++pathlen < cchPath)
*pItemName++ = L'\\';
else
hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
}
}
}
if (SUCCEEDED(hr) && pathlen + 2 + 38 + 1 < cchPath)
{
/* parsing name like ::{...} */ /* parsing name like ::{...} */
pItemName[0] = ':'; pItemName[0] = L':';
pItemName[1] = ':'; pItemName[1] = L':';
SHELL32_GUIDToStringW(*clsid, &pItemName[2]); SHELL32_GUIDToStringW(*clsid, &pItemName[2]);
} }
else else
{
hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
}
}
else
{ {
/* user friendly name */ /* user friendly name */
if (!HCR_GetClassNameW (*clsid, pszPath, MAX_PATH)) if (!HCR_GetClassNameW(*clsid, pszPath, cchPath))
hr = E_FAIL; hr = E_FAIL;
} }