From: Michael Stopa michael.stopa@tensorworks.com.au
FileRenameInfoEx is already handled by NtSetInformationFile, SetFileInformationByHandle need only pass it through. --- dlls/kernelbase/file.c | 4 +++- dlls/kernelbase/tests/file.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 7d8b6844456..042179a8378 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3658,6 +3658,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO status = NtSetInformationFile( file, &io, info, size, FileIoPriorityHintInformation ); break; case FileRenameInfo: + case FileRenameInfoEx: { FILE_RENAME_INFORMATION *rename_info; UNICODE_STRING nt_name; @@ -3673,7 +3674,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO memcpy( rename_info, info, sizeof(*rename_info) ); memcpy( rename_info->FileName, nt_name.Buffer, nt_name.Length + sizeof(WCHAR) ); rename_info->FileNameLength = nt_name.Length; - status = NtSetInformationFile( file, &io, rename_info, size, FileRenameInformation ); + status = NtSetInformationFile( file, &io, rename_info, size, + class == FileRenameInfo ? FileRenameInformation : FileRenameInformationEx ); HeapFree( GetProcessHeap(), 0, rename_info ); } RtlFreeUnicodeString( &nt_name ); diff --git a/dlls/kernelbase/tests/file.c b/dlls/kernelbase/tests/file.c index d95902638de..b567b5d40c2 100644 --- a/dlls/kernelbase/tests/file.c +++ b/dlls/kernelbase/tests/file.c @@ -88,7 +88,7 @@ static void test_SetFileInformationByHandle(void) renameinfoex->FileNameLength = lstrlenW(filename3); memcpy(renameinfoex->FileName, filename3, sizeof(filename3)); success = SetFileInformationByHandle(handle, FileRenameInfoEx, renameinfoex, renameinfoex_sz); - todo_wine ok(success, "SetFileInformationByHandle failed to change filename, error: %lu\n", GetLastError()); + ok(success, "SetFileInformationByHandle failed to change filename, error: %lu\n", GetLastError());
free(renameinfo); free(renameinfoex);