Module: wine Branch: master Commit: a055f4128657f473e1ceec1aaa7cbbe61d3851b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a055f4128657f473e1ceec1aa...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Nov 20 15:40:04 2020 +0100
kernelbase: Use NtQueryInformationFile for consoles handles in GetFileSizeEx.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/tests/console.c | 2 -- dlls/kernelbase/file.c | 6 ------ 2 files changed, 8 deletions(-)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5943213fb17..1a86aedbc82 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3959,12 +3959,10 @@ static void test_file_info(HANDLE input, HANDLE output) ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtQueryInformationFile returned: %#x\n", status);
ret = GetFileSizeEx(input, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, "GetFileSizeEx returned %x(%u)\n", ret, GetLastError());
ret = GetFileSizeEx(output, &size); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_FUNCTION, "GetFileSizeEx returned %x(%u)\n", ret, GetLastError()); } diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index b265866ac54..bfa44b4da50 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3047,12 +3047,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileSizeEx( HANDLE file, PLARGE_INTEGER size ) FILE_STANDARD_INFORMATION info; IO_STATUS_BLOCK io;
- if (is_console_handle( file )) - { - SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; - } - if (!set_ntstatus( NtQueryInformationFile( file, &io, &info, sizeof(info), FileStandardInformation ))) return FALSE;