Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
- Fix a hack that broke copying files after recent fixes.

svn path=/trunk/; revision=68892
This commit is contained in:
Giannis Adamopoulos 2015-09-01 10:18:40 +00:00
parent e441f06d17
commit 4a52a2ec13
1 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
reactos/dll/win32/shell32/folders/CFSFolder.cpp
View file

@ -1034,7 +1034,6 @@ HRESULT WINAPI CFSFolder::CopyItems(IShellFolder * pSFFrom, UINT cidl,
LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList, pszFileName; LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList, pszFileName;
int res, length; int res, length;
HRESULT hr; HRESULT hr;
STRRET strRet;
TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl); TRACE ("(%p)->(%p,%u,%p)\n", this, pSFFrom, cidl, apidl);
@ -1047,21 +1046,12 @@ HRESULT WINAPI CFSFolder::CopyItems(IShellFolder * pSFFrom, UINT cidl,
return hr; return hr;
} }
hr = pSFFrom->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strRet); hr = SHGetPathFromIDListW(pidl, szSrcPath);
if (FAILED(hr))
{
SHFree(pidl);
return hr;
}
hr = StrRetToBufW(&strRet, pidl, szSrcPath, MAX_PATH);
if (FAILED(hr))
{
SHFree(pidl);
return hr;
}
SHFree(pidl); SHFree(pidl);
if (FAILED(hr))
return hr;
pszSrc = PathAddBackslashW(szSrcPath); pszSrc = PathAddBackslashW(szSrcPath);
wcscpy(szTargetPath, sPathTarget); wcscpy(szTargetPath, sPathTarget);