niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

shell32: Respect the parent PIDL when pasting from CFSTR_SHELLIDLIST.

Browse source
This commit is contained in:
Zebediah Figura 2024-03-03 21:02:09 -06:00 • committed by Alexandre Julliard
parent c4b38894cd
commit 5744ef64a4
2 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
dlls/shell32/shlview_cmenu.c
View file

@ -311,50 +311,39 @@ static void DoCopyOrCut(ContextMenu *This, HWND hwnd, BOOL cut)
}
}
static HRESULT paste_pidls(ContextMenu *menu, ITEMIDLIST **pidls, unsigned int count)
static HRESULT paste_pidls(ContextMenu *menu, const ITEMIDLIST *src_parent, ITEMIDLIST **pidls, unsigned int count)
{
IShellFolder *desktop_folder;
IShellFolder *src_folder;
HRESULT hr = S_OK;
if (FAILED(hr = SHGetDesktopFolder(&desktop_folder)))
if (FAILED(hr = SHBindToObject(NULL, src_parent, NULL, &IID_IShellFolder, (void **)&src_folder)))
{
ERR("Failed to get folder from source PIDL, hr %#lx.\n", hr);
return hr;
}
for (unsigned int i = 0; SUCCEEDED(hr) && i < count; i++)
{
IShellFolder *folder = NULL;
ITEMIDLIST *pidl_dir;
ITEMIDLIST *pidl_item;
ISFHelper *psfhlpdst = NULL, *psfhlpsrc = NULL;
pidl_dir = ILClone(pidls[i]);
ILRemoveLastID(pidl_dir);
pidl_item = ILFindLastID(pidls[i]);
hr = IShellFolder_BindToObject(desktop_folder, pidl_dir, NULL, &IID_IShellFolder, (void **)&folder);
hr = IShellFolder_QueryInterface(menu->parent, &IID_ISFHelper, (void **)&psfhlpdst);
if (SUCCEEDED(hr))
hr = IShellFolder_QueryInterface(src_folder, &IID_ISFHelper, (void **)&psfhlpsrc);
if (folder)
if (psfhlpdst && psfhlpsrc)
{
ISFHelper *psfhlpdst = NULL, *psfhlpsrc = NULL;
hr = IShellFolder_QueryInterface(menu->parent, &IID_ISFHelper, (void **)&psfhlpdst);
if (SUCCEEDED(hr))
hr = IShellFolder_QueryInterface(folder, &IID_ISFHelper, (void **)&psfhlpsrc);
if (psfhlpdst && psfhlpsrc)
{
hr = ISFHelper_CopyItems(psfhlpdst, folder, 1, (LPCITEMIDLIST*)&pidl_item);
/* FIXME handle move
ISFHelper_DeleteItems(psfhlpsrc, 1, &pidl_item);
*/
}
if (psfhlpdst)
ISFHelper_Release(psfhlpdst);
if (psfhlpsrc)
ISFHelper_Release(psfhlpsrc);
IShellFolder_Release(folder);
hr = ISFHelper_CopyItems(psfhlpdst, src_folder, 1, (LPCITEMIDLIST *)&pidls[i]);
/* FIXME handle move
ISFHelper_DeleteItems(psfhlpsrc, 1, &pidl_item);
*/
}
ILFree(pidl_dir);
if (psfhlpdst)
ISFHelper_Release(psfhlpdst);
if (psfhlpsrc)
ISFHelper_Release(psfhlpsrc);
}
IShellFolder_Release(desktop_folder);
IShellFolder_Release(src_folder);
return hr;
}
@ -386,7 +375,7 @@ static HRESULT do_paste(ContextMenu *menu, HWND hwnd)
pidls = _ILCopyCidaToaPidl(&pidl, cida);
if (pidls)
{
hr = paste_pidls(menu, pidls, cida->cidl);
hr = paste_pidls(menu, pidl, pidls, cida->cidl);
_ILFreeaPidl(pidls, cida->cidl);
SHFree(pidl);
}

2
dlls/shell32/tests/shlfolder.c
View file

@ -5797,7 +5797,7 @@ static void test_copy_paste(void)
ok(ret != INVALID_FILE_ATTRIBUTES, "Got %#x.\n", ret);
ret = RemoveDirectoryW(L"testcopy_dst/testcopy_src");
todo_wine ok(ret, "Got error %lu.\n", GetLastError());
ok(ret, "Got error %lu.\n", GetLastError());
/* Paste into a selection comprising multiple directories. In this case the
* first directory is used, and the second is just ignored.