Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
9435f3ce
Commit
9435f3ce
authored
Jul 05, 2011
by
Mariusz Pluciński
Committed by
Alexandre Julliard
Jul 05, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Add support of KF_REDIRECT_DEL_SOURCE_CONTENTS flag to redirection.
parent
104bf57c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
shellpath.c
dlls/shell32/shellpath.c
+19
-1
shellpath.c
dlls/shell32/tests/shellpath.c
+0
-1
No files found.
dlls/shell32/shellpath.c
View file @
9435f3ce
...
...
@@ -3232,12 +3232,30 @@ static HRESULT redirect_known_folder(
lstrcpyW
(
dstPath
,
pszTargetPath
);
ZeroMemory
(
&
fileOp
,
sizeof
(
fileOp
));
fileOp
.
wFunc
=
FO_COPY
;
if
(
flags
&
KF_REDIRECT_DEL_SOURCE_CONTENTS
)
fileOp
.
wFunc
=
FO_MOVE
;
else
fileOp
.
wFunc
=
FO_COPY
;
fileOp
.
pFrom
=
srcPath
;
fileOp
.
pTo
=
dstPath
;
fileOp
.
fFlags
=
FOF_NO_UI
;
hr
=
(
SHFileOperationW
(
&
fileOp
)
==
0
?
S_OK
:
E_FAIL
);
if
(
flags
&
KF_REDIRECT_DEL_SOURCE_CONTENTS
)
{
ZeroMemory
(
srcPath
,
sizeof
(
srcPath
));
lstrcpyW
(
srcPath
,
lpSrcPath
);
ZeroMemory
(
&
fileOp
,
sizeof
(
fileOp
));
fileOp
.
wFunc
=
FO_DELETE
;
fileOp
.
pFrom
=
srcPath
;
fileOp
.
fFlags
=
FOF_NO_UI
;
hr
=
(
SHFileOperationW
(
&
fileOp
)
==
0
?
S_OK
:
E_FAIL
);
}
}
CoTaskMemFree
(
lpSrcPath
);
...
...
dlls/shell32/tests/shellpath.c
View file @
9435f3ce
...
...
@@ -1397,7 +1397,6 @@ static void test_knownFolders(void)
/* check if original directory was really removed */
dwAttributes
=
GetFileAttributesW
(
sExamplePath
);
todo_wine
ok
(
dwAttributes
==
INVALID_FILE_ATTRIBUTES
,
"directory should not exist, but has attributes: 0x%08x
\n
"
,
dwAttributes
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment