Module: wine Branch: master Commit: d0350eef1eda55f6326f09dfabf88196fc724a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0350eef1eda55f6326f09dfab...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Wed Nov 9 02:00:40 2016 +0000
advapi32/test: Stop crash when ReadEventLog returns an unexpected error.
Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/advapi32/tests/eventlog.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 3ca59c3..7daaeaf 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -909,6 +909,7 @@ static void test_readwrite(void)
/* Read all events from our created eventlog, one by one */ handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "Failed to open Event Log, got %d\n", GetLastError()); i = 0; for (;;) { @@ -924,14 +925,13 @@ static void test_readwrite(void) SetLastError(0xdeadbeef); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); - if (!ret && GetLastError() == ERROR_HANDLE_EOF) + ok(!ret, "Expected failure\n"); + if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { HeapFree(GetProcessHeap(), 0, buf); + ok(GetLastError() == ERROR_HANDLE_EOF, "record %d, got %d\n", i, GetLastError()); break; } - ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INVALID_PARAMETER, got %d\n",GetLastError());
buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, @@ -1010,6 +1010,7 @@ static void test_readwrite(void)
/* Test clearing a real eventlog */ handle = OpenEventLogA(NULL, eventlogname); + ok(handle != NULL, "Failed to open Event Log, got %d\n", GetLastError());
SetLastError(0xdeadbeef); ret = ClearEventLogA(handle, NULL);