Skip to content

W
wine-winehq
Commit 000eddbc authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

shell32: Don't add the directory name twice when recursing into subdirectories.

parent d1282dce
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
dlls/shell32/shlfileop.c
View file @ 000eddbc
...@@ -958,17 +958,18 @@ static void copy_dir_to_dir(LPSHFILEOPSTRUCTW lpFileOp, FILE_ENTRY *feFrom, LPWS ...@@ -958,17 +958,18 @@ static void copy_dir_to_dir(LPSHFILEOPSTRUCTW lpFileOp, FILE_ENTRY *feFrom, LPWS
/* copy a file or directory to another directory */ /* copy a file or directory to another directory */
static void copy_to_dir(LPSHFILEOPSTRUCTW lpFileOp, FILE_ENTRY *feFrom, FILE_ENTRY *feTo) static void copy_to_dir(LPSHFILEOPSTRUCTW lpFileOp, FILE_ENTRY *feFrom, FILE_ENTRY *feTo)
{ {
WCHAR szDestPath[MAX_PATH];
if (!PathFileExistsW(feTo->szFullPath)) if (!PathFileExistsW(feTo->szFullPath))
SHNotifyCreateDirectoryW(feTo->szFullPath, NULL); SHNotifyCreateDirectoryW(feTo->szFullPath, NULL);
PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename);
if (IsAttribFile(feFrom->attributes)) if (IsAttribFile(feFrom->attributes))
{
WCHAR szDestPath[MAX_PATH];
PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename);
SHNotifyCopyFileW(feFrom->szFullPath, szDestPath, FALSE); SHNotifyCopyFileW(feFrom->szFullPath, szDestPath, FALSE);
}
else if (!(lpFileOp->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) else if (!(lpFileOp->fFlags & FOF_FILESONLY && feFrom->bFromWildcard))
copy_dir_to_dir(lpFileOp, feFrom, szDestPath); copy_dir_to_dir(lpFileOp, feFrom, feTo->szFullPath);
} }
static void create_dest_dirs(LPWSTR szDestDir) static void create_dest_dirs(LPWSTR szDestDir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment