Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 19:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Copy-paste files/folders into current place.

Browse source 
Files are copied with trying to find new path by adding (%d) suffix before asking for overwrite existing item

CORE-13788
This commit is contained in:
Denis Malikov 2018-06-06 00:13:51 +07:00 • committed by Mark Jansen
parent e01f935f0e
commit 7916d0ae3e
1 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

54
dll/win32/shell32/shlfileop.cpp
View file

@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
#define FO_MASK 0xF #define FO_MASK 0xF
#define NEW_FILENAME_ON_COPY_TRIES 100
static const WCHAR wWildcardFile[] = {'*',0}; static const WCHAR wWildcardFile[] = {'*',0};
static const WCHAR wWildcardChars[] = {'*','?',0}; static const WCHAR wWildcardChars[] = {'*','?',0};
@ -1219,6 +1221,34 @@ static void destroy_file_list(FILE_LIST *flList)
HeapFree(GetProcessHeap(), 0, flList->feFiles); HeapFree(GetProcessHeap(), 0, flList->feFiles);
} }
static CStringW try_find_new_name(LPCWSTR szDestPath)
{
CStringW mask(szDestPath);
CStringW ext(PathFindExtensionW(szDestPath));
// cut off extension before inserting a "new file" mask
if (!ext.IsEmpty())
{
mask = mask.Left(mask.GetLength() - ext.GetLength());
}
mask += L" (%d)" + ext;
CStringW newName;
// trying to find new file name
for (int i = 1; i < NEW_FILENAME_ON_COPY_TRIES; i++)
{
newName.Format(mask, i);
if (!PathFileExistsW(newName))
{
return newName;
}
}
return CStringW();
}
static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWSTR szDestPath) static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWSTR szDestPath)
{ {
WCHAR szFrom[MAX_PATH], szTo[MAX_PATH]; WCHAR szFrom[MAX_PATH], szTo[MAX_PATH];
@ -1236,12 +1266,20 @@ static void copy_dir_to_dir(FILE_OPERATION *op, const FILE_ENTRY *feFrom, LPCWST
if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo))
{ {
if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FOLDER, feFrom->szFilename, op)) CStringW newPath;
if (lstrcmp(feFrom->szDirectory, szDestPath) == 0 && !(newPath = try_find_new_name(szTo)).IsEmpty())
{ {
/* Vista returns an ERROR_CANCELLED even if user pressed "No" */ StringCchCopyW(szTo, _countof(szTo), newPath);
if (!op->bManyItems) }
op->bCancelled = TRUE; else
return; {
if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FOLDER, feFrom->szFilename, op))
{
/* Vista returns an ERROR_CANCELLED even if user pressed "No" */
if (!op->bManyItems)
op->bCancelled = TRUE;
return;
}
} }
} }
@ -1266,6 +1304,12 @@ static BOOL copy_file_to_file(FILE_OPERATION *op, const WCHAR *szFrom, const WCH
{ {
if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo)) if (!(op->req->fFlags & FOF_NOCONFIRMATION) && PathFileExistsW(szTo))
{ {
CStringW newPath;
if (lstrcmp(szFrom, szTo) == 0 && !(newPath = try_find_new_name(szTo)).IsEmpty())
{
return SHNotifyCopyFileW(op, szFrom, newPath, FALSE) == 0;
}
if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op)) if (!SHELL_ConfirmDialogW(op->req->hwnd, ASK_OVERWRITE_FILE, PathFindFileNameW(szTo), op))
return FALSE; return FALSE;
} }