Author: spetreolle Date: Wed Sep 3 23:07:47 2014 New Revision: 64034
URL: http://svn.reactos.org/svn/reactos?rev=64034&view=rev Log: [EVENTLOG] Remove the event log handle from the list *before* destroying it. Fixes failure in advapi32:eventlog double close test.
Modified: trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c
Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/file... ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed Sep 3 23:07:47 2014 @@ -1252,7 +1252,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteFile() failed!\n"); + DPRINT1("NtWriteFile() failed! (Status: 0x%08lx)\n", Status); goto Done; }
@@ -1311,7 +1311,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteFile() failed!\n"); + DPRINT1("NtWriteFile() failed! (Status: 0x%08lx)\n", Status); }
Done:
Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc.... ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Wed Sep 3 23:07:47 2014 @@ -215,9 +215,9 @@ 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 @@ PLOGHANDLE lpLogHandle; PLOGFILE lpLogFile;
- DPRINT("ElfrNumberOfRecords()"); + DPRINT("ElfrNumberOfRecords()\n");
lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); if (!lpLogHandle)