Andrew Nguyen : kernel32: Fail with an invalid output parameter in GetNumberOfConsoleInputEvents.
Alexandre Julliard
julliard at winehq.org
Tue Jan 4 09:47:29 CST 2011
Module: wine
Branch: master
Commit: 3501b0a580185bf2c6f649efe35500fc3648e80a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3501b0a580185bf2c6f649efe35500fc3648e80a
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Mon Jan 3 21:27:40 2011 -0600
kernel32: Fail with an invalid output parameter in GetNumberOfConsoleInputEvents.
---
dlls/kernel32/console.c | 8 +++++-
dlls/kernel32/tests/console.c | 54 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 97eae17..a442657 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -992,7 +992,13 @@ BOOL WINAPI GetNumberOfConsoleInputEvents( HANDLE handle, LPDWORD nrofevents )
req->flush = FALSE;
if ((ret = !wine_server_call_err( req )))
{
- if (nrofevents) *nrofevents = reply->read;
+ if (nrofevents)
+ *nrofevents = reply->read;
+ else
+ {
+ SetLastError(ERROR_INVALID_ACCESS);
+ ret = FALSE;
+ }
}
}
SERVER_END_REQ;
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index da446a1..a1388ed 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -1168,6 +1168,59 @@ static void test_GetSetStdHandle(void)
ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error);
}
+static void test_GetNumberOfConsoleInputEvents(HANDLE input_handle)
+{
+ DWORD count;
+ BOOL ret;
+ int i;
+
+ const struct
+ {
+ HANDLE handle;
+ LPDWORD nrofevents;
+ DWORD last_error;
+ } invalid_table[] =
+ {
+ {NULL, NULL, ERROR_INVALID_HANDLE},
+ {NULL, &count, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, NULL, ERROR_INVALID_HANDLE},
+ {INVALID_HANDLE_VALUE, &count, ERROR_INVALID_HANDLE},
+ };
+
+ for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
+ {
+ SetLastError(0xdeadbeef);
+ if (invalid_table[i].nrofevents) count = 0xdeadbeef;
+ ret = GetNumberOfConsoleInputEvents(invalid_table[i].handle,
+ invalid_table[i].nrofevents);
+ ok(!ret, "[%d] Expected GetNumberOfConsoleInputEvents to return FALSE, got %d\n", i, ret);
+ if (invalid_table[i].nrofevents)
+ {
+ ok(count == 0xdeadbeef,
+ "[%d] Expected output count to be unmodified, got %u\n", i, count);
+ }
+ ok(GetLastError() == invalid_table[i].last_error,
+ "[%d] Expected last error to be %u, got %u\n",
+ i, invalid_table[i].last_error, GetLastError());
+ }
+
+ /* Test crashes on Windows 7. */
+ if (0)
+ {
+ SetLastError(0xdeadbeef);
+ ret = GetNumberOfConsoleInputEvents(input_handle, NULL);
+ ok(!ret, "Expected GetNumberOfConsoleInputEvents to return FALSE, got %d\n", ret);
+ ok(GetLastError() == ERROR_INVALID_ACCESS,
+ "Expected last error to be ERROR_INVALID_ACCESS, got %u\n",
+ GetLastError());
+ }
+
+ count = 0xdeadbeef;
+ ret = GetNumberOfConsoleInputEvents(input_handle, &count);
+ ok(ret == TRUE, "Expected GetNumberOfConsoleInputEvents to return TRUE, got %d\n", ret);
+ ok(count != 0xdeadbeef, "Expected output count to initialized\n");
+}
+
START_TEST(console)
{
HANDLE hConIn, hConOut;
@@ -1221,4 +1274,5 @@ START_TEST(console)
test_OpenConsoleW();
test_VerifyConsoleIoHandle(hConOut);
test_GetSetStdHandle();
+ test_GetNumberOfConsoleInputEvents(hConIn);
}
More information about the wine-cvs
mailing list