From 50bbe47f26f687a3594abd7bbca6d0919f5ddd6b Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 31 Dec 2011 15:23:59 +0000 Subject: [PATCH] [EVENTLOG] Fix the record number hacks in ElfrNumberOfRecords and LogfWriteData by initializing the oldest record number to 1. svn path=/trunk/; revision=54794 --- reactos/base/services/eventlog/file.c | 4 +--- reactos/base/services/eventlog/rpc.c | 9 +++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/reactos/base/services/eventlog/file.c b/reactos/base/services/eventlog/file.c index 8e5c2a1a366..7d27b950a8d 100644 --- a/reactos/base/services/eventlog/file.c +++ b/reactos/base/services/eventlog/file.c @@ -34,6 +34,7 @@ BOOL LogfInitializeNew(PLOGFILE LogFile) LogFile->Header.MajorVersion = MAJORVER; LogFile->Header.MinorVersion = MINORVER; LogFile->Header.CurrentRecordNumber = 1; + LogFile->Header.OldestRecordNumber = 1; /* FIXME: Read MaxSize from registry for this LogFile. But for now limit EventLog size to just under 5K. */ LogFile->Header.MaxSize = 5000; @@ -986,9 +987,6 @@ BOOL LogfWriteData(PLOGFILE LogFile, DWORD BufSize, PBYTE Buffer) LogFile->Header.CurrentRecordNumber++; - if (LogFile->Header.OldestRecordNumber == 0) - LogFile->Header.OldestRecordNumber = 1; - if (WriteOffSet == LogFile->Header.EndOffset) { LogFile->Header.EndOffset += dwWritten; diff --git a/reactos/base/services/eventlog/rpc.c b/reactos/base/services/eventlog/rpc.c index 8c7ec4e9de4..915e35d53b7 100644 --- a/reactos/base/services/eventlog/rpc.c +++ b/reactos/base/services/eventlog/rpc.c @@ -243,11 +243,8 @@ NTSTATUS ElfrNumberOfRecords( lpLogFile->Header.OldestRecordNumber, lpLogFile->Header.CurrentRecordNumber); - if (lpLogFile->Header.OldestRecordNumber == 0) - *NumberOfRecords = 0; - else - *NumberOfRecords = lpLogFile->Header.CurrentRecordNumber - - lpLogFile->Header.OldestRecordNumber; + *NumberOfRecords = lpLogFile->Header.CurrentRecordNumber - + lpLogFile->Header.OldestRecordNumber; return STATUS_SUCCESS; } @@ -271,8 +268,8 @@ NTSTATUS ElfrOldestRecord( return STATUS_INVALID_PARAMETER; } - *OldestRecordNumber = 0; *OldestRecordNumber = LogfGetOldestRecord(lpLogHandle->LogFile); + return STATUS_SUCCESS; } -- 2.17.1