[PATCH] advapi32/test: Stop crash when ReadEventLog returns an unexpected error
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Tue Nov 8 20:00:40 CST 2016
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
dlls/advapi32/tests/eventlog.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c
index 3ca59c3..5743942 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,9 +925,10 @@ 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)
+ 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");
@@ -1010,6 +1012,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);
--
2.10.2
More information about the wine-patches
mailing list