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
6971fd2d
Commit
6971fd2d
authored
Mar 10, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Mar 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Allow renaming a file to the same name.
Signed-off-by:
Zebediah Figura
<
zfigura@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ee136f98
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
9 deletions
+20
-9
file.c
dlls/ntdll/tests/file.c
+4
-4
fd.c
server/fd.c
+16
-5
No files found.
dlls/ntdll/tests/file.c
View file @
6971fd2d
...
...
@@ -2123,8 +2123,8 @@ static void test_file_rename_information(void)
U
(
io
).
Status
=
0xdeadbeef
;
res
=
pNtSetInformationFile
(
handle
,
&
io
,
fri
,
sizeof
(
FILE_RENAME_INFORMATION
)
+
fri
->
FileNameLength
,
FileRenameInformation
);
todo_wine
ok
(
U
(
io
).
Status
==
STATUS_SUCCESS
,
"got io status %#x
\n
"
,
U
(
io
).
Status
);
todo_wine
ok
(
res
==
STATUS_SUCCESS
,
"got status %x
\n
"
,
res
);
ok
(
U
(
io
).
Status
==
STATUS_SUCCESS
,
"got io status %#x
\n
"
,
U
(
io
).
Status
);
ok
(
res
==
STATUS_SUCCESS
,
"got status %x
\n
"
,
res
);
ok
(
GetFileAttributesW
(
oldpath
)
!=
INVALID_FILE_ATTRIBUTES
,
"file should exist
\n
"
);
CloseHandle
(
handle
);
...
...
@@ -2782,8 +2782,8 @@ static void test_file_link_information(void)
fli
->
ReplaceIfExists
=
TRUE
;
U
(
io
).
Status
=
0xdeadbeef
;
res
=
pNtSetInformationFile
(
handle
,
&
io
,
fli
,
sizeof
(
FILE_LINK_INFORMATION
)
+
fli
->
FileNameLength
,
FileLinkInformation
);
todo_wine
ok
(
U
(
io
).
Status
==
STATUS_SUCCESS
,
"got io status %#x
\n
"
,
U
(
io
).
Status
);
todo_wine
ok
(
res
==
STATUS_SUCCESS
,
"got status %x
\n
"
,
res
);
ok
(
U
(
io
).
Status
==
STATUS_SUCCESS
,
"got io status %#x
\n
"
,
U
(
io
).
Status
);
ok
(
res
==
STATUS_SUCCESS
,
"got status %x
\n
"
,
res
);
ok
(
GetFileAttributesW
(
oldpath
)
!=
INVALID_FILE_ATTRIBUTES
,
"file should exist
\n
"
);
CloseHandle
(
handle
);
...
...
server/fd.c
View file @
6971fd2d
...
...
@@ -2328,7 +2328,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr,
data_size_t
len
,
int
create_link
,
int
replace
)
{
struct
inode
*
inode
;
struct
stat
st
;
struct
stat
st
,
st2
;
char
*
name
;
if
(
!
fd
->
inode
||
!
fd
->
unix_name
)
...
...
@@ -2336,6 +2336,12 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr,
set_error
(
STATUS_OBJECT_TYPE_MISMATCH
);
return
;
}
if
(
fd
->
unix_fd
==
-
1
)
{
set_error
(
fd
->
no_fd_status
);
return
;
}
if
(
!
len
||
((
nameptr
[
0
]
==
'/'
)
^
!
root
))
{
set_error
(
STATUS_OBJECT_PATH_SYNTAX_BAD
);
...
...
@@ -2358,8 +2364,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr,
}
/* when creating a hard link, source cannot be a dir */
if
(
create_link
&&
fd
->
unix_fd
!=
-
1
&&
!
fstat
(
fd
->
unix_fd
,
&
st
)
&&
S_ISDIR
(
st
.
st_mode
))
if
(
create_link
&&
!
fstat
(
fd
->
unix_fd
,
&
st
)
&&
S_ISDIR
(
st
.
st_mode
))
{
set_error
(
STATUS_FILE_IS_A_DIRECTORY
);
goto
failed
;
...
...
@@ -2367,6 +2372,13 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr,
if
(
!
stat
(
name
,
&
st
))
{
if
(
!
fstat
(
fd
->
unix_fd
,
&
st2
)
&&
st
.
st_ino
==
st2
.
st_ino
&&
st
.
st_dev
==
st2
.
st_dev
)
{
if
(
create_link
&&
!
replace
)
set_error
(
STATUS_OBJECT_NAME_COLLISION
);
free
(
name
);
return
;
}
if
(
!
replace
)
{
set_error
(
STATUS_OBJECT_NAME_COLLISION
);
...
...
@@ -2394,8 +2406,7 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr,
/* link() expects that the target doesn't exist */
/* rename() cannot replace files with directories */
if
(
create_link
||
(
fd
->
unix_fd
!=
-
1
&&
!
fstat
(
fd
->
unix_fd
,
&
st
)
&&
S_ISDIR
(
st
.
st_mode
)))
if
(
create_link
||
S_ISDIR
(
st2
.
st_mode
))
{
if
(
unlink
(
name
))
{
...
...
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