Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOBJSHEX]

Browse source 
Improve the GetDisplayNameOf logic from "badly broken" to "seems to work". I'm not convinced it's perfect, but it's better than before.

svn path=/trunk/; revision=75157
This commit is contained in:
David Quintana 2017-06-20 23:03:24 +00:00
parent 3832e3a6d8
commit 05bae83b22
2 changed files with 76 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
reactos/dll/shellext/ntobjshex/ntobjfolder.cpp
View file

@ -651,52 +651,57 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::GetDisplayNameOf(
if (FAILED_UNEXPECTEDLY(hr))
return hr;
if ((GET_SHGDN_RELATION(uFlags) == SHGDN_NORMAL) &&
(GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING))
if (GET_SHGDN_FOR(uFlags) & SHGDN_FOREDITING)
{
WCHAR path[MAX_PATH] = { 0 };
hr = GetFullName(m_shellPidl, uFlags, path, _countof(path));
hr = MakeStrRetFromString(info->entryName, info->entryNameLength, lpName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
}
PathAppendW(path, info->entryName);
WCHAR path[MAX_PATH] = { 0 };
hr = MakeStrRetFromString(path, lpName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
LPCITEMIDLIST pidlFirst = ILCloneFirst(pidl);
LPCITEMIDLIST pidlNext = ILGetNext(pidl);
if (pidlNext && pidlNext->mkid.cb > 0)
if (GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING)
{
if (GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER)
{
CComPtr<IShellFolder> psfChild;
hr = BindToObject(pidlFirst, NULL, IID_PPV_ARG(IShellFolder, &psfChild));
hr = GetFullName(m_shellPidl, uFlags, path, _countof(path));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
WCHAR temp[MAX_PATH];
STRRET childName;
hr = psfChild->GetDisplayNameOf(pidlNext, uFlags | SHGDN_INFOLDER, &childName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
hr = StrRetToBufW(&childName, pidlNext, temp, _countof(temp));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
PathAppendW(path, temp);
}
}
ILFree((LPITEMIDLIST) pidlFirst);
}
else
PathAppendW(path, info->entryName);
LPCITEMIDLIST pidlNext = ILGetNext(pidl);
if (pidlNext && pidlNext->mkid.cb > 0)
{
MakeStrRetFromString(info->entryName, info->entryNameLength, lpName);
LPITEMIDLIST pidlFirst = ILCloneFirst(pidl);
CComPtr<IShellFolder> psfChild;
hr = BindToObject(pidlFirst, NULL, IID_PPV_ARG(IShellFolder, &psfChild));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
WCHAR temp[MAX_PATH];
STRRET childName;
hr = psfChild->GetDisplayNameOf(pidlNext, uFlags | SHGDN_INFOLDER, &childName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
hr = StrRetToBufW(&childName, pidlNext, temp, _countof(temp));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
PathAppendW(path, temp);
ILFree(pidlFirst);
}
hr = MakeStrRetFromString(path, lpName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
return S_OK;
}

71
reactos/dll/shellext/ntobjshex/regfolder.cpp
View file

@ -706,52 +706,57 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::GetDisplayNameOf(
if (FAILED_UNEXPECTEDLY(hr))
return hr;
if ((GET_SHGDN_RELATION(uFlags) == SHGDN_NORMAL) &&
(GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING))
if (GET_SHGDN_FOR(uFlags) & SHGDN_FOREDITING)
{
WCHAR path[MAX_PATH] = { 0 };
hr = GetFullName(m_shellPidl, uFlags, path, _countof(path));
hr = MakeStrRetFromString(info->entryName, info->entryNameLength, lpName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
}
PathAppendW(path, info->entryName);
WCHAR path[MAX_PATH] = { 0 };
hr = MakeStrRetFromString(path, lpName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
LPCITEMIDLIST pidlFirst = ILCloneFirst(pidl);
LPCITEMIDLIST pidlNext = ILGetNext(pidl);
if (pidlNext && pidlNext->mkid.cb > 0)
if (GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING)
{
if (GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER)
{
CComPtr<IShellFolder> psfChild;
hr = BindToObject(pidlFirst, NULL, IID_PPV_ARG(IShellFolder, &psfChild));
hr = GetFullName(m_shellPidl, uFlags, path, _countof(path));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
WCHAR temp[MAX_PATH];
STRRET childName;
hr = psfChild->GetDisplayNameOf(pidlNext, uFlags | SHGDN_INFOLDER, &childName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
hr = StrRetToBufW(&childName, pidlNext, temp, _countof(temp));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
PathAppendW(path, temp);
}
}
ILFree((LPITEMIDLIST) pidlFirst);
}
else
PathAppendW(path, info->entryName);
LPCITEMIDLIST pidlNext = ILGetNext(pidl);
if (pidlNext && pidlNext->mkid.cb > 0)
{
MakeStrRetFromString(info->entryName, info->entryNameLength, lpName);
LPITEMIDLIST pidlFirst = ILCloneFirst(pidl);
CComPtr<IShellFolder> psfChild;
hr = BindToObject(pidlFirst, NULL, IID_PPV_ARG(IShellFolder, &psfChild));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
WCHAR temp[MAX_PATH];
STRRET childName;
hr = psfChild->GetDisplayNameOf(pidlNext, uFlags | SHGDN_INFOLDER, &childName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
hr = StrRetToBufW(&childName, pidlNext, temp, _countof(temp));
if (FAILED_UNEXPECTEDLY(hr))
return hr;
PathAppendW(path, temp);
ILFree(pidlFirst);
}
hr = MakeStrRetFromString(path, lpName);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
return S_OK;
}