reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 12:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kernel32: Improve parameter validation for FillConsoleOutputAttribute.

Browse Source
This commit is contained in:
Andrew Nguyen 2011-01-03 21:25:47 -06:00 committed by Alexandre Julliard
parent 50ee017f34
commit 51d05e241a
2 changed files with 81 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/kernel32/console.c
View File

@ -802,6 +802,14 @@ BOOL WINAPI FillConsoleOutputAttribute( HANDLE hConsoleOutput, WORD attr, DWORD
TRACE("(%p,%d,%d,(%dx%d),%p)\n",
hConsoleOutput, attr, length, coord.X, coord.Y, lpNumAttrsWritten);
if (!lpNumAttrsWritten)
{
SetLastError(ERROR_INVALID_ACCESS);
return FALSE;
}
*lpNumAttrsWritten = 0;
SERVER_START_REQ( fill_console_output )
{
req->handle = console_handle_unmap(hConsoleOutput);
@ -812,9 +820,7 @@ BOOL WINAPI FillConsoleOutputAttribute( HANDLE hConsoleOutput, WORD attr, DWORD
req->data.attr = attr;
req->count = length;
if ((ret = !wine_server_call_err( req )))
{
if (lpNumAttrsWritten) *lpNumAttrsWritten = reply->written;
}
*lpNumAttrsWritten = reply->written;
}
SERVER_END_REQ;
return ret;

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

@ -1784,6 +1784,77 @@ static void test_FillConsoleOutputCharacterW(HANDLE output_handle)
ok(count == 1, "Expected count to be 1, got %u\n", count);
}
static void test_FillConsoleOutputAttribute(HANDLE output_handle)
{
COORD origin = {0, 0};
DWORD count;
BOOL ret;
int i;
const struct
{
HANDLE hConsoleOutput;
WORD attr;
DWORD length;
COORD coord;
LPDWORD lpNumAttrsWritten;
DWORD expected_count;
DWORD last_error;
int win7_crash;
} invalid_table[] =
{
{NULL, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{NULL, FOREGROUND_BLUE, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
{NULL, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{NULL, FOREGROUND_BLUE, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
{INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, origin, &count, 0, ERROR_INVALID_HANDLE},
{INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, origin, &count, 0, ERROR_INVALID_HANDLE},
{output_handle, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
{output_handle, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1},
};
for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++)
{
if (invalid_table[i].win7_crash)
continue;
SetLastError(0xdeadbeef);
if (invalid_table[i].lpNumAttrsWritten) count = 0xdeadbeef;
ret = FillConsoleOutputAttribute(invalid_table[i].hConsoleOutput,
invalid_table[i].attr,
invalid_table[i].length,
invalid_table[i].coord,
invalid_table[i].lpNumAttrsWritten);
ok(!ret, "[%d] Expected FillConsoleOutputAttribute to return FALSE, got %d\n", i, ret);
if (invalid_table[i].lpNumAttrsWritten)
{
ok(count == invalid_table[i].expected_count,
"[%d] Expected count to be %u, got %u\n",
i, invalid_table[i].expected_count, 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());
}
count = 0xdeadbeef;
ret = FillConsoleOutputAttribute(output_handle, FOREGROUND_BLUE, 0, origin, &count);
ok(ret == TRUE, "Expected FillConsoleOutputAttribute to return TRUE, got %d\n", ret);
ok(count == 0, "Expected count to be 0, got %u\n", count);
count = 0xdeadbeef;
ret = FillConsoleOutputAttribute(output_handle, FOREGROUND_BLUE, 1, origin, &count);
ok(ret == TRUE, "Expected FillConsoleOutputAttribute to return TRUE, got %d\n", ret);
ok(count == 1, "Expected count to be 1, got %u\n", count);
count = 0xdeadbeef;
ret = FillConsoleOutputAttribute(output_handle, ~0, 1, origin, &count);
ok(ret == TRUE, "Expected FillConsoleOutputAttribute to return TRUE, got %d\n", ret);
ok(count == 1, "Expected count to be 1, got %u\n", count);
}
START_TEST(console)
{
HANDLE hConIn, hConOut;
@ -1845,4 +1916,5 @@ START_TEST(console)
test_WriteConsoleOutputAttribute(hConOut);
test_FillConsoleOutputCharacterA(hConOut);
test_FillConsoleOutputCharacterW(hConOut);
test_FillConsoleOutputAttribute(hConOut);
}