Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 12:56:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EVENTLOG]

Browse source 
- Read MaxSize and Retention from the Registry when a new log file is created.
- Use ntdll file functions instead of their kernel32 counterparts.

svn path=/trunk/; revision=64159
This commit is contained in:
Eric Kohl 2014-09-15 12:16:46 +00:00
parent a28f3fc476
commit 23a11c7198
4 changed files with 85 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

25
reactos/base/services/eventlog/eventlog.c
View file

@ -106,7 +106,7 @@ ServiceControlHandler(DWORD dwControl,
UpdateServiceStatus(SERVICE_STOPPED); UpdateServiceStatus(SERVICE_STOPPED);
return ERROR_SUCCESS; return ERROR_SUCCESS;
default : default:
DPRINT1(" Control %lu received\n", dwControl); DPRINT1(" Control %lu received\n", dwControl);
return ERROR_CALL_NOT_IMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED;
} }
@ -275,6 +275,7 @@ PLOGFILE LoadLogFile(HKEY hKey, WCHAR * LogName)
LONG Result; LONG Result;
PLOGFILE pLogf = NULL; PLOGFILE pLogf = NULL;
UNICODE_STRING FileName; UNICODE_STRING FileName;
ULONG ulMaxSize, ulRetention;
NTSTATUS Status; NTSTATUS Status;
DPRINT("LoadLogFile: %S\n", LogName); DPRINT("LoadLogFile: %S\n", LogName);
@ -333,7 +334,27 @@ PLOGFILE LoadLogFile(HKEY hKey, WCHAR * LogName)
DPRINT("%S -> %S\n", Buf, Expanded); DPRINT("%S -> %S\n", Buf, Expanded);
Status = LogfCreate(&pLogf, LogName, &FileName, TRUE, FALSE); ValueLen = sizeof(ULONG);
Result = RegQueryValueEx(hKey,
L"MaxSize",
NULL,
&Type,
(LPBYTE)&ulMaxSize,
&ValueLen);
if (Result != ERROR_SUCCESS)
ulMaxSize = 512 * 1024; /* 512 kBytes */
ValueLen = sizeof(ULONG);
Result = RegQueryValueEx(hKey,
L"Retention",
NULL,
&Type,
(LPBYTE)&ulRetention,
&ValueLen);
if (Result != ERROR_SUCCESS)
ulRetention = 0;
Status = LogfCreate(&pLogf, LogName, &FileName, ulMaxSize, ulRetention, TRUE, FALSE);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("Failed to create %S! (Status %08lx)\n", Expanded, Status); DPRINT1("Failed to create %S! (Status %08lx)\n", Expanded, Status);

2
reactos/base/services/eventlog/eventlog.h
View file

@ -156,6 +156,8 @@ NTSTATUS
LogfCreate(PLOGFILE *Logfile, LogfCreate(PLOGFILE *Logfile,
WCHAR * LogName, WCHAR * LogName,
PUNICODE_STRING FileName, PUNICODE_STRING FileName,
ULONG ulMaxSize,
ULONG ulRetention,
BOOL Permanent, BOOL Permanent,
BOOL Backup); BOOL Backup);

99
reactos/base/services/eventlog/file.c
View file

@ -24,62 +24,78 @@ static CRITICAL_SECTION LogFileListCs;
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
static NTSTATUS static NTSTATUS
LogfInitializeNew(PLOGFILE LogFile) LogfInitializeNew(PLOGFILE LogFile,
ULONG ulMaxSize,
ULONG ulRetention)
{ {
DWORD dwWritten; IO_STATUS_BLOCK IoStatusBlock;
EVENTLOGEOF EofRec; EVENTLOGEOF EofRec;
NTSTATUS Status;
ZeroMemory(&LogFile->Header, sizeof(EVENTLOGHEADER)); ZeroMemory(&LogFile->Header, sizeof(EVENTLOGHEADER));
SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN); SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN);
SetEndOfFile(LogFile->hFile); SetEndOfFile(LogFile->hFile);
LogFile->Header.HeaderSize = sizeof(EVENTLOGHEADER); LogFile->Header.HeaderSize = sizeof(EVENTLOGHEADER);
LogFile->Header.EndHeaderSize = sizeof(EVENTLOGHEADER); LogFile->Header.Signature = LOGFILE_SIGNATURE;
LogFile->Header.StartOffset = sizeof(EVENTLOGHEADER);
LogFile->Header.EndOffset = sizeof(EVENTLOGHEADER);
LogFile->Header.MajorVersion = MAJORVER; LogFile->Header.MajorVersion = MAJORVER;
LogFile->Header.MinorVersion = MINORVER; LogFile->Header.MinorVersion = MINORVER;
LogFile->Header.StartOffset = sizeof(EVENTLOGHEADER);
LogFile->Header.EndOffset = sizeof(EVENTLOGHEADER);
LogFile->Header.CurrentRecordNumber = 1; LogFile->Header.CurrentRecordNumber = 1;
LogFile->Header.OldestRecordNumber = 1; LogFile->Header.OldestRecordNumber = 1;
/* FIXME: Read MaxSize from registry for this LogFile. LogFile->Header.MaxSize = ulMaxSize;
But for now limit EventLog size to just under 5K. */ LogFile->Header.Flags = 0;
LogFile->Header.MaxSize = 5000; LogFile->Header.Retention = ulRetention;
LogFile->Header.Signature = LOGFILE_SIGNATURE; LogFile->Header.EndHeaderSize = sizeof(EVENTLOGHEADER);
if (!WriteFile(LogFile->hFile,
&LogFile->Header, Status = NtWriteFile(LogFile->hFile,
sizeof(EVENTLOGHEADER), NULL,
&dwWritten, NULL,
NULL)) NULL,
&IoStatusBlock,
&LogFile->Header,
sizeof(EVENTLOGHEADER),
NULL,
NULL);
if (!NT_SUCCESS(Status))
{ {
DPRINT1("WriteFile failed:%d!\n", GetLastError()); DPRINT1("NtWriteFile failed (Status 0x%08lx)\n", Status);
return STATUS_UNSUCCESSFUL; return Status;
} }
EofRec.RecordSizeBeginning = sizeof(EVENTLOGEOF);
EofRec.Ones = 0x11111111; EofRec.Ones = 0x11111111;
EofRec.Twos = 0x22222222; EofRec.Twos = 0x22222222;
EofRec.Threes = 0x33333333; EofRec.Threes = 0x33333333;
EofRec.Fours = 0x44444444; EofRec.Fours = 0x44444444;
EofRec.RecordSizeBeginning = sizeof(EVENTLOGEOF);
EofRec.RecordSizeEnd = sizeof(EVENTLOGEOF);
EofRec.CurrentRecordNumber = LogFile->Header.CurrentRecordNumber;
EofRec.OldestRecordNumber = LogFile->Header.OldestRecordNumber;
EofRec.BeginRecord = LogFile->Header.StartOffset; EofRec.BeginRecord = LogFile->Header.StartOffset;
EofRec.EndRecord = LogFile->Header.EndOffset; EofRec.EndRecord = LogFile->Header.EndOffset;
EofRec.CurrentRecordNumber = LogFile->Header.CurrentRecordNumber;
EofRec.OldestRecordNumber = LogFile->Header.OldestRecordNumber;
EofRec.RecordSizeEnd = sizeof(EVENTLOGEOF);
if (!WriteFile(LogFile->hFile, Status = NtWriteFile(LogFile->hFile,
&EofRec, NULL,
sizeof(EVENTLOGEOF), NULL,
&dwWritten, NULL,
NULL)) &IoStatusBlock,
&EofRec,
sizeof(EVENTLOGEOF),
NULL,
NULL);
if (!NT_SUCCESS(Status))
{ {
DPRINT1("WriteFile failed:%d!\n", GetLastError()); DPRINT1("NtWriteFile failed (Status 0x%08lx)\n", Status);
return STATUS_UNSUCCESSFUL; return Status;
} }
if (!FlushFileBuffers(LogFile->hFile)) Status = NtFlushBuffersFile(LogFile->hFile,
&IoStatusBlock);
if (!NT_SUCCESS(Status))
{ {
DPRINT1("FlushFileBuffers failed:%d!\n", GetLastError()); DPRINT1("NtFlushBuffersFile failed (Status 0x%08lx)\n", Status);
return STATUS_UNSUCCESSFUL; return Status;
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;
@ -87,7 +103,8 @@ LogfInitializeNew(PLOGFILE LogFile)
static NTSTATUS static NTSTATUS
LogfInitializeExisting(PLOGFILE LogFile, BOOL Backup) LogfInitializeExisting(PLOGFILE LogFile,
BOOL Backup)
{ {
DWORD dwRead; DWORD dwRead;
DWORD dwRecordsNumber = 0; DWORD dwRecordsNumber = 0;
@ -265,10 +282,6 @@ LogfInitializeExisting(PLOGFILE LogFile, BOOL Backup)
if (LogFile->Header.CurrentRecordNumber == 0) if (LogFile->Header.CurrentRecordNumber == 0)
LogFile->Header.CurrentRecordNumber = 1; LogFile->Header.CurrentRecordNumber = 1;
/* FIXME: Read MaxSize from registry for this LogFile.
But for now limit EventLog size to just under 5K. */
LogFile->Header.MaxSize = 5000;
if (!Backup) if (!Backup)
{ {
if (SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) == if (SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) ==
@ -301,8 +314,10 @@ LogfInitializeExisting(PLOGFILE LogFile, BOOL Backup)
NTSTATUS NTSTATUS
LogfCreate(PLOGFILE *LogFile, LogfCreate(PLOGFILE *LogFile,
WCHAR * LogName, WCHAR *LogName,
PUNICODE_STRING FileName, PUNICODE_STRING FileName,
ULONG ulMaxSize,
ULONG ulRetention,
BOOL Permanent, BOOL Permanent,
BOOL Backup) BOOL Backup)
{ {
@ -355,7 +370,7 @@ LogfCreate(PLOGFILE *LogFile,
goto fail; goto fail;
} }
if(LogName) if (LogName)
StringCchCopy(pLogFile->LogName,lstrlenW(LogName) + 1, LogName); StringCchCopy(pLogFile->LogName,lstrlenW(LogName) + 1, LogName);
pLogFile->FileName = pLogFile->FileName =
@ -387,7 +402,7 @@ LogfCreate(PLOGFILE *LogFile,
pLogFile->Permanent = Permanent; pLogFile->Permanent = Permanent;
if (bCreateNew) if (bCreateNew)
Status = LogfInitializeNew(pLogFile); Status = LogfInitializeNew(pLogFile, ulMaxSize, ulRetention);
else else
Status = LogfInitializeExisting(pLogFile, Backup); Status = LogfInitializeExisting(pLogFile, Backup);
@ -1117,7 +1132,9 @@ LogfClearFile(PLOGFILE LogFile,
} }
} }
Status = LogfInitializeNew(LogFile); Status = LogfInitializeNew(LogFile,
LogFile->Header.MaxSize,
LogFile->Header.Retention);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("LogfInitializeNew failed (Status: 0x%08lx)\n", Status); DPRINT1("LogfInitializeNew failed (Status: 0x%08lx)\n", Status);
@ -1145,7 +1162,7 @@ LogfBackupFile(PLOGFILE LogFile,
DWORD dwOffset, dwRead, dwRecSize; DWORD dwOffset, dwRead, dwRecSize;
DPRINT("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName); DPRINT1("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName);
/* Lock the log file shared */ /* Lock the log file shared */
RtlAcquireResourceShared(&LogFile->Lock, TRUE); RtlAcquireResourceShared(&LogFile->Lock, TRUE);
@ -1182,7 +1199,7 @@ LogfBackupFile(PLOGFILE LogFile,
Header.EndOffset = sizeof(EVENTLOGHEADER); Header.EndOffset = sizeof(EVENTLOGHEADER);
Header.CurrentRecordNumber = 1; Header.CurrentRecordNumber = 1;
Header.OldestRecordNumber = 1; Header.OldestRecordNumber = 1;
Header.MaxSize = 0; Header.MaxSize = LogFile->Header.MaxSize;
Header.Flags = ELF_LOGFILE_HEADER_DIRTY; Header.Flags = ELF_LOGFILE_HEADER_DIRTY;
Header.Retention = LogFile->Header.Retention; Header.Retention = LogFile->Header.Retention;
Header.EndHeaderSize = sizeof(EVENTLOGHEADER); Header.EndHeaderSize = sizeof(EVENTLOGHEADER);

2
reactos/base/services/eventlog/rpc.c
View file

@ -162,6 +162,8 @@ ElfCreateBackupLogHandle(PLOGHANDLE *LogHandle,
Status = LogfCreate(&lpLogHandle->LogFile, Status = LogfCreate(&lpLogHandle->LogFile,
NULL, NULL,
FileName, FileName,
0,
0,
FALSE, FALSE,
TRUE); TRUE);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))