From 8402a337005b688331b3e3ed65d2bdb73fc2b0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 12 Aug 2016 14:24:55 +0000 Subject: [PATCH] [SDK]: Move some event log flags to the correct header (from winbase.h to winnt.h). CORE-11839 svn path=/trunk/; revision=72210 --- reactos/sdk/include/psdk/winbase.h | 11 +--------- reactos/sdk/include/xdk/winnt_old.h | 33 +++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/reactos/sdk/include/psdk/winbase.h b/reactos/sdk/include/psdk/winbase.h index c6b2df2871a..68dc7b56da3 100644 --- a/reactos/sdk/include/psdk/winbase.h +++ b/reactos/sdk/include/psdk/winbase.h @@ -387,16 +387,7 @@ extern "C" { #define PURGE_RXABORT 2 #define PURGE_TXCLEAR 4 #define PURGE_RXCLEAR 8 -#define EVENTLOG_SUCCESS 0 -#define EVENTLOG_FORWARDS_READ 4 -#define EVENTLOG_BACKWARDS_READ 8 -#define EVENTLOG_SEEK_READ 2 -#define EVENTLOG_SEQUENTIAL_READ 1 -#define EVENTLOG_ERROR_TYPE 1 -#define EVENTLOG_WARNING_TYPE 2 -#define EVENTLOG_INFORMATION_TYPE 4 -#define EVENTLOG_AUDIT_SUCCESS 8 -#define EVENTLOG_AUDIT_FAILURE 16 + #define FORMAT_MESSAGE_ALLOCATE_BUFFER 256 #define FORMAT_MESSAGE_IGNORE_INSERTS 512 #define FORMAT_MESSAGE_FROM_STRING 1024 diff --git a/reactos/sdk/include/xdk/winnt_old.h b/reactos/sdk/include/xdk/winnt_old.h index 7bc989037bc..3bb7ed3823e 100644 --- a/reactos/sdk/include/xdk/winnt_old.h +++ b/reactos/sdk/include/xdk/winnt_old.h @@ -2543,25 +2543,50 @@ typedef LONG struct _EXCEPTION_POINTERS *ExceptionInfo ); + +#define EVENTLOG_SEQUENTIAL_READ 1 +#define EVENTLOG_SEEK_READ 2 +#define EVENTLOG_FORWARDS_READ 4 +#define EVENTLOG_BACKWARDS_READ 8 + +#define EVENTLOG_SUCCESS 0 +#define EVENTLOG_ERROR_TYPE 1 +#define EVENTLOG_WARNING_TYPE 2 +#define EVENTLOG_INFORMATION_TYPE 4 +#define EVENTLOG_AUDIT_SUCCESS 8 +#define EVENTLOG_AUDIT_FAILURE 16 + typedef struct _EVENTLOGRECORD { - DWORD Length; + DWORD Length; /* Length of full record, including the data portion */ DWORD Reserved; DWORD RecordNumber; DWORD TimeGenerated; DWORD TimeWritten; DWORD EventID; WORD EventType; - WORD NumStrings; + WORD NumStrings; /* Number of strings in the 'Strings' array */ WORD EventCategory; WORD ReservedFlags; DWORD ClosingRecordNumber; DWORD StringOffset; DWORD UserSidLength; DWORD UserSidOffset; - DWORD DataLength; - DWORD DataOffset; + DWORD DataLength; /* Length of the data portion */ + DWORD DataOffset; /* Offset from beginning of record */ +/* + * Length-varying data: + * + * WCHAR SourceName[]; + * WCHAR ComputerName[]; + * SID UserSid; // Must be aligned on a DWORD boundary + * WCHAR Strings[]; + * BYTE Data[]; + * CHAR Pad[]; // Padding for DWORD boundary + * DWORD Length; // Same as the first 'Length' member at the beginning + */ } EVENTLOGRECORD, *PEVENTLOGRECORD; + typedef struct _OSVERSIONINFOA { DWORD dwOSVersionInfoSize; DWORD dwMajorVersion;