marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: MoveFile should make sure that it has the delete access to the source file. 

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Dmitry Timoshkov 2018-10-14 10:44:40 +03:00 committed by Alexandre Julliard
parent 7edfcd63ad
commit f184a396a8
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/kernel32/path.c
View File

@ -1310,7 +1310,8 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest,
attr.SecurityDescriptor = NULL;
attr.SecurityQualityOfService = NULL;
status = NtOpenFile( &source_handle, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT );
status = NtOpenFile( &source_handle, DELETE | SYNCHRONIZE, &attr, &io,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT );
if (status == STATUS_SUCCESS)
status = wine_nt_to_unix_file_name( &nt_name, &source_unix, FILE_OPEN, FALSE );
RtlFreeUnicodeString( &nt_name );
@ -1334,11 +1335,11 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest,
SetLastError( ERROR_PATH_NOT_FOUND );
goto error;
}
options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT;
if (flag & MOVEFILE_WRITE_THROUGH)
options |= FILE_WRITE_THROUGH;
status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, options );
status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options );
if (status == STATUS_SUCCESS) /* destination exists */
{
if (!(flag & MOVEFILE_REPLACE_EXISTING))

20
dlls/kernel32/tests/file.c
View File

@ -1914,12 +1914,10 @@ static void test_MoveFileA(void)
ok(hmapfile != NULL, "CreateFileMapping: error %d\n", GetLastError());
ret = MoveFileA(source, dest);
todo_wine {
ok(!ret, "MoveFileA: expected failure\n");
ok(GetLastError() == ERROR_SHARING_VIOLATION ||
broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */
"MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
}
ok(!ret, "MoveFileA: expected failure\n");
ok(GetLastError() == ERROR_SHARING_VIOLATION ||
broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */
"MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
CloseHandle(hmapfile);
CloseHandle(hfile);
@ -1934,12 +1932,10 @@ static void test_MoveFileA(void)
ok(hmapfile != NULL, "CreateFileMapping: error %d\n", GetLastError());
ret = MoveFileA(source, dest);
todo_wine {
ok(!ret, "MoveFileA: expected failure\n");
ok(GetLastError() == ERROR_SHARING_VIOLATION ||
broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */
"MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
}
ok(!ret, "MoveFileA: expected failure\n");
ok(GetLastError() == ERROR_SHARING_VIOLATION ||
broken(GetLastError() == ERROR_ACCESS_DENIED), /* Win9x and WinMe */
"MoveFileA: expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError());
CloseHandle(hmapfile);
CloseHandle(hfile);