mirror of
https://github.com/reactos/wine.git
synced 2025-02-21 05:11:57 +00:00
shell32: Don't add the directory name twice when recursing into subdirectories.
This commit is contained in:
parent
d1282dce88
commit
000eddbc8c
@ -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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user