Paul Vriens : advapi32: Add some input parameter checks to GetNumberOfEventLogRecords.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: de72f40580f35eed0abf8ee081bc8b833d0fbe0f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=de72f40580f35eed0abf8ee081...

Author: Paul Vriens 
Date:   Wed Oct 28 19:37:06 2009 +0100

advapi32: Add some input parameter checks to GetNumberOfEventLogRecords.

---

dlls/advapi32/eventlog.c       |   13 ++++++++++++-
 dlls/advapi32/tests/eventlog.c |    5 -----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index e5c7bd7..6812cdd 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -265,7 +265,18 @@ BOOL WINAPI GetNumberOfEventLogRecords( HANDLE hEventLog, PDWORD NumberOfRecords
 {
     FIXME("(%p,%p) stub\n", hEventLog, NumberOfRecords);

-    if (!NumberOfRecords) return FALSE;
+    if (!NumberOfRecords)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    if (!hEventLog)
+    {
+        SetLastError(ERROR_INVALID_HANDLE);
+        return FALSE;
+    }
+
     *NumberOfRecords = 0;

return TRUE;
diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c
index 4840ec5..d394012 100644
--- a/dlls/advapi32/tests/eventlog.c
+++ b/dlls/advapi32/tests/eventlog.c
@@ -158,25 +158,20 @@ static void test_count(void)
     SetLastError(0xdeadbeef);
     ret = GetNumberOfEventLogRecords(NULL, NULL);
     ok(!ret, "Expected failure\n");
-    todo_wine
     ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

SetLastError(0xdeadbeef);
     count = 0xdeadbeef;
     ret = GetNumberOfEventLogRecords(NULL, &count);
-    todo_wine
-    {
     ok(!ret, "Expected failure\n");
     ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
     ok(count == 0xdeadbeef, "Expected count to stay unchanged\n");
-    }

handle = OpenEventLogA(NULL, "Application");

SetLastError(0xdeadbeef);
     ret = GetNumberOfEventLogRecords(handle, NULL);
     ok(!ret, "Expected failure\n");
-    todo_wine
     ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

count = 0xdeadbeef;