Dmitry Timoshkov : kernel32: Filter out console handles in GetFileSize.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c3ee3da58afe0cf7bb2c3abf55f4619a9bd6a7fb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c3ee3da58afe0cf7bb2c3abf55f4619a9bd6a7fb

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Mon Apr 14 15:28:32 2014 +0900

kernel32: Filter out console handles in GetFileSize.

---

 dlls/kernel32/file.c          |    6 ++++++
 dlls/kernel32/tests/console.c |   42 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 2f5dee2..9bcd9e9 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -983,6 +983,12 @@ BOOL WINAPI GetFileSizeEx( HANDLE hFile, PLARGE_INTEGER lpFileSize )
     IO_STATUS_BLOCK io;
     NTSTATUS status;
 
+    if (is_console_handle( hFile ))
+    {
+        SetLastError( ERROR_INVALID_HANDLE );
+        return FALSE;
+    }
+
     status = NtQueryInformationFile( hFile, &io, &info, sizeof(info), FileStandardInformation );
     if (status == STATUS_SUCCESS)
     {
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 18d3cf9..52dcaac 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -2553,6 +2553,47 @@ static void test_ReadConsoleOutputAttribute(HANDLE output_handle)
     ok(count == 1, "Expected count to be 1, got %u\n", count);
 }
 
+static void test_ReadConsole(void)
+{
+    HANDLE std_input;
+    DWORD ret, bytes;
+    char buf[1024];
+
+    std_input = GetStdHandle(STD_INPUT_HANDLE);
+
+    SetLastError(0xdeadbeef);
+    ret = GetFileSize(std_input, NULL);
+    ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret);
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
+
+if (0) /* FIXME: uncomment once Wine doesn't hang forever */
+{
+    bytes = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    ret = ReadFile(std_input, buf, -128, &bytes, NULL);
+    ok(!ret, "expected 0, got %u\n", ret);
+    ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError());
+    ok(!bytes, "expected 0, got %u\n", bytes);
+
+    bytes = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    ret = ReadConsoleA(std_input, buf, -128, &bytes, NULL);
+    ok(!ret, "expected 0, got %u\n", ret);
+    ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError());
+    ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, %#x\n", bytes);
+}
+
+if (0) /* FIXME: uncomment once Wine doesn't hang forever */
+{
+    bytes = 0xdeadbeef;
+    SetLastError(0xdeadbeef);
+    ret = ReadConsoleW(std_input, buf, -128, &bytes, NULL);
+    ok(!ret, "expected 0, got %u\n", ret);
+    ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError());
+    ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, %#x\n", bytes);
+}
+}
+
 START_TEST(console)
 {
     static const char font_name[] = "Lucida Console";
@@ -2646,6 +2687,7 @@ START_TEST(console)
     ok(sbi.dwSize.Y == size, "Unexpected buffer size: %d instead of %d\n", sbi.dwSize.Y, size);
     if (!ret) return;
 
+    test_ReadConsole();
     /* Non interactive tests */
     testCursor(hConOut, sbi.dwSize);
     /* test parameters (FIXME: test functionality) */