[EVENTLOG]

Remove the event log handle from the list *before* destroying it.
Fixes failure in advapi32:eventlog double close test.

svn path=/trunk/; revision=64034

diff --git a/reactos/base/services/eventlog/file.c b/reactos/base/services/eventlog/file.c
index 0a784cf..4781e82 100644 (file)
--- a/reactos/base/services/eventlog/file.c
+++ b/reactos/base/services/eventlog/file.c
@@ -1252,7 +1252,7 @@ LogfBackupFile(PLOGFILE LogFile,
                              NULL);
         if (!NT_SUCCESS(Status))
         {
-            DPRINT1("NtWriteFile() failed!\n");
+            DPRINT1("NtWriteFile() failed! (Status: 0x%08lx)\n", Status);
             goto Done;
         }
 
@@ -1311,7 +1311,7 @@ LogfBackupFile(PLOGFILE LogFile,
                          NULL);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("NtWriteFile() failed!\n");
+        DPRINT1("NtWriteFile() failed! (Status: 0x%08lx)\n", Status);
     }
 
 Done:

diff --git a/reactos/base/services/eventlog/rpc.c b/reactos/base/services/eventlog/rpc.c
index b33a119..1154f01 100644 (file)
--- a/reactos/base/services/eventlog/rpc.c
+++ b/reactos/base/services/eventlog/rpc.c
@@ -215,9 +215,9 @@ ElfDeleteEventLogHandle(IELF_HANDLE EventLogHandle)
     if (!ElfGetLogHandleEntryByHandle(lpLogHandle))
         return STATUS_INVALID_HANDLE;
 
+    RemoveEntryList(&lpLogHandle->LogHandleListEntry);
     LogfClose(lpLogHandle->LogFile, FALSE);
 
-    RemoveEntryList(&lpLogHandle->LogHandleListEntry);
     HeapFree(GetProcessHeap(),0,lpLogHandle);
 
     return STATUS_SUCCESS;
@@ -291,7 +291,7 @@ NTSTATUS ElfrNumberOfRecords(
     PLOGHANDLE lpLogHandle;
     PLOGFILE lpLogFile;
 
-    DPRINT("ElfrNumberOfRecords()");
+    DPRINT("ElfrNumberOfRecords()\n");
 
     lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle);
     if (!lpLogHandle)