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

[SHELL32] -Simplify the drop target of CRecycleBin to let the data object generate the list of names that can be passed to SHFileOperationW.

Browse source 
svn path=/trunk/; revision=75622
This commit is contained in:
Giannis Adamopoulos 2017-08-19 11:09:28 +00:00
parent fe4d4aa690
commit 3c6b222f15
1 changed files with 7 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

97
reactos/dll/win32/shell32/folders/CRecycleBin.cpp
View file

@ -1079,98 +1079,18 @@ HRESULT WINAPI CRecycleBin::Drop(IDataObject *pDataObject,
HRESULT WINAPI DoDeleteDataObject(IDataObject *pda, DWORD fMask) HRESULT WINAPI DoDeleteDataObject(IDataObject *pda, DWORD fMask)
{ {
TRACE("performing delete");
HRESULT hr; HRESULT hr;
STGMEDIUM medium; STGMEDIUM medium;
FORMATETC formatetc; FORMATETC formatetc;
InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); InitFormatEtc (formatetc, CF_HDROP, TYMED_HGLOBAL);
hr = pda->GetData(&formatetc, &medium); hr = pda->GetData(&formatetc, &medium);
if (FAILED(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;
/* lock the handle */ LPDROPFILES lpdf = (LPDROPFILES) GlobalLock(medium.hGlobal);
LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); if (!lpdf)
if (!lpcida)
{ {
ReleaseStgMedium(&medium); ERR("Error locking global\n");
return E_FAIL;
}
/* convert the data into pidl */
LPITEMIDLIST pidl;
LPITEMIDLIST *apidl = _ILCopyCidaToaPidl(&pidl, lpcida);
if (!apidl)
{
ReleaseStgMedium(&medium);
return E_FAIL;
}
CComPtr<IShellFolder> psfDesktop;
CComPtr<IShellFolder> psfFrom = NULL;
/* Grab the desktop shell folder */
hr = SHGetDesktopFolder(&psfDesktop);
if (FAILED(hr))
{
ERR("SHGetDesktopFolder failed\n");
SHFree(pidl);
_ILFreeaPidl(apidl, lpcida->cidl);
ReleaseStgMedium(&medium);
return E_FAIL;
}
/* Find source folder, this is where the clipboard data was copied from */
if (_ILIsDesktop(pidl))
{
psfFrom = psfDesktop;
}
else
{
hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom));
if (FAILED(hr))
{
ERR("no IShellFolder\n");
SHFree(pidl);
_ILFreeaPidl(apidl, lpcida->cidl);
ReleaseStgMedium(&medium);
return E_FAIL;
}
}
STRRET strTemp;
hr = psfFrom->GetDisplayNameOf(apidl[0], SHGDN_FORPARSING, &strTemp);
if (FAILED(hr))
{
ERR("IShellFolder_GetDisplayNameOf failed with %x\n", hr);
SHFree(pidl);
_ILFreeaPidl(apidl, lpcida->cidl);
ReleaseStgMedium(&medium);
return hr;
}
WCHAR wszPath[MAX_PATH];
hr = StrRetToBufW(&strTemp, apidl[0], wszPath, _countof(wszPath));
if (FAILED(hr))
{
ERR("StrRetToBufW failed with %x\n", hr);
SHFree(pidl);
_ILFreeaPidl(apidl, lpcida->cidl);
ReleaseStgMedium(&medium);
return hr;
}
/* Only keep the base path */
LPWSTR pwszFilename = PathFindFileNameW(wszPath);
*pwszFilename = L'\0';
/* Build paths list */
LPWSTR pwszPaths = BuildPathsList(wszPath, lpcida->cidl, (LPCITEMIDLIST*) apidl, FALSE);
if (!pwszPaths)
{
SHFree(pidl);
_ILFreeaPidl(apidl, lpcida->cidl);
ReleaseStgMedium(&medium);
return E_FAIL; return E_FAIL;
} }
@ -1178,19 +1098,16 @@ HRESULT WINAPI DoDeleteDataObject(IDataObject *pda, DWORD fMask)
SHFILEOPSTRUCTW FileOp; SHFILEOPSTRUCTW FileOp;
ZeroMemory(&FileOp, sizeof(FileOp)); ZeroMemory(&FileOp, sizeof(FileOp));
FileOp.wFunc = FO_DELETE; FileOp.wFunc = FO_DELETE;
FileOp.pFrom = pwszPaths; FileOp.pFrom = (LPWSTR) (((byte*) lpdf) + lpdf->pFiles);;
if ((fMask & CMIC_MASK_SHIFT_DOWN) == 0) if ((fMask & CMIC_MASK_SHIFT_DOWN) == 0)
FileOp.fFlags = FOF_ALLOWUNDO; FileOp.fFlags = FOF_ALLOWUNDO;
if (SHFileOperationW(&FileOp) != 0) if (SHFileOperationW(&FileOp) != 0)
{ {
ERR("SHFileOperation failed with 0x%x for %s\n", GetLastError(), debugstr_w(pwszPaths)); ERR("SHFileOperation failed with 0x%x\n", GetLastError());
hr = E_FAIL; hr = E_FAIL;
} }
HeapFree(GetProcessHeap(), 0, pwszPaths);
SHFree(pidl);
_ILFreeaPidl(apidl, lpcida->cidl);
ReleaseStgMedium(&medium); ReleaseStgMedium(&medium);
return hr; return hr;