[SHELL32]

- Fix copy/paste in shell views when multiple files are selected. Patch by Huw Campbell
CORE-4771

svn path=/trunk/; revision=60805
This commit is contained in:
Thomas Faber 2013-10-31 16:46:14 +00:00
parent 1cbc964e3f
commit da2aa16556
2 changed files with 6 additions and 2 deletions

View file

@ -1283,14 +1283,16 @@ HRESULT WINAPI CDesktopFolder::CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCIT
}
op.pTo = szTargetPath;
op.fFlags = 0;
}
else
{
op.pTo = pszTargetList;
op.fFlags = FOF_MULTIDESTFILES;
}
op.hwnd = GetActiveWindow();
op.wFunc = FO_COPY;
op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR;
op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR;
res = SHFileOperationW(&op);

View file

@ -1124,14 +1124,16 @@ HRESULT WINAPI CFSFolder::CopyItems(IShellFolder * pSFFrom, UINT cidl,
}
op.pTo = szTargetPath;
op.fFlags = 0;
}
else
{
op.pTo = pszTargetList;
op.fFlags = FOF_MULTIDESTFILES;
}
op.hwnd = GetActiveWindow();
op.wFunc = FO_COPY;
op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR;
op.fFlags |= FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR;
res = SHFileOperationW(&op);