ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Fail with an invalid output parameter in GetNumberOfConsoleInputEvents.

This commit is contained in:
Andrew Nguyen 2011-01-03 21:27:40 -06:00 committed by Alexandre Julliard
parent 858ccfff8b
commit 3501b0a580
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/kernel32/console.c
View File

@ -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;

54
dlls/kernel32/tests/console.c
View File

@ -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);
}