From 99a1e331b5244b43208ea32f60ddbfa1a37fdeb9 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Thu, 16 Jun 2016 13:29:37 -0700
Subject: [PATCH] dll: eventlog: move source under Application and other
 improvements

---
 src/dll/eventlog.c                     |  14 +++++++++-----
 src/dll/eventlog/eventlog.h            |   6 +++---
 src/dll/eventlog/eventlog.mc           |   6 +++---
 src/dll/eventlog/eventlog_MSG00001.bin | Bin 88 -> 112 bytes
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/dll/eventlog.c b/src/dll/eventlog.c
index 86da7323..29383350 100644
--- a/src/dll/eventlog.c
+++ b/src/dll/eventlog.c
@@ -28,6 +28,8 @@ static BOOL WINAPI FspEventLogInitialize(
     PINIT_ONCE InitOnce, PVOID Parameter, PVOID *Context)
 {
     FspEventLogHandle = RegisterEventSourceW(0, L"" FSP_EVENTLOG_NAME);
+    if (0 == FspEventLogHandle)
+        FspEventLogHandle = RegisterEventSourceW(0, FspDiagIdent());
     return TRUE;
 }
 
@@ -60,13 +62,15 @@ FSP_API VOID FspEventLogV(ULONG Type, PWSTR Format, va_list ap)
     if (0 == FspEventLogHandle)
         return;
 
-    WCHAR Buf[1024], *Strings[1];
+    WCHAR Buf[1024], *Strings[2];
         /* wvsprintfW is only safe with a 1024 WCHAR buffer */
     DWORD EventId;
 
+    Strings[0] = FspDiagIdent();
+
     wvsprintfW(Buf, Format, ap);
     Buf[(sizeof Buf / sizeof Buf[0]) - 1] = L'\0';
-    Strings[0] = Buf;
+    Strings[1] = Buf;
 
     switch (Type)
     {
@@ -83,7 +87,7 @@ FSP_API VOID FspEventLogV(ULONG Type, PWSTR Format, va_list ap)
         break;
     }
 
-    ReportEventW(FspEventLogHandle, (WORD)Type, 0, EventId, 0, 1, 0, Strings, 0);
+    ReportEventW(FspEventLogHandle, (WORD)Type, 0, EventId, 0, 2, 0, Strings, 0);
 }
 
 NTSTATUS FspEventLogRegister(VOID)
@@ -97,7 +101,7 @@ NTSTATUS FspEventLogRegister(VOID)
         return FspNtStatusFromWin32(GetLastError());
 
     RegResult = RegCreateKeyExW(
-        HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\System\\" FSP_EVENTLOG_NAME,
+        HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\" FSP_EVENTLOG_NAME,
         0, 0, 0, KEY_ALL_ACCESS, 0, &RegKey, 0);
     if (ERROR_SUCCESS != RegResult)
         return FspNtStatusFromWin32(RegResult);
@@ -127,7 +131,7 @@ NTSTATUS FspEventLogUnregister(VOID)
     DWORD RegResult;
 
     RegResult = RegDeleteTreeW(
-        HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\System\\" FSP_EVENTLOG_NAME);
+        HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\" FSP_EVENTLOG_NAME);
     if (ERROR_SUCCESS != RegResult && ERROR_FILE_NOT_FOUND != RegResult)
         return FspNtStatusFromWin32(RegResult);
 
diff --git a/src/dll/eventlog/eventlog.h b/src/dll/eventlog/eventlog.h
index 30650ada..2e44422d 100644
--- a/src/dll/eventlog/eventlog.h
+++ b/src/dll/eventlog/eventlog.h
@@ -39,7 +39,7 @@
 //
 // MessageText:
 //
-// %1
+// %1: %2
 //
 #define FSP_EVENTLOG_INFORMATION         0x60000001L
 
@@ -48,7 +48,7 @@
 //
 // MessageText:
 //
-// %1
+// %1: %2
 //
 #define FSP_EVENTLOG_WARNING             0xA0000001L
 
@@ -57,7 +57,7 @@
 //
 // MessageText:
 //
-// %1
+// %1: %2
 //
 #define FSP_EVENTLOG_ERROR               0xE0000001L
 
diff --git a/src/dll/eventlog/eventlog.mc b/src/dll/eventlog/eventlog.mc
index c61c9576..146c9a98 100644
--- a/src/dll/eventlog/eventlog.mc
+++ b/src/dll/eventlog/eventlog.mc
@@ -2,19 +2,19 @@ MessageId=1
 Severity=Informational
 SymbolicName=FSP_EVENTLOG_INFORMATION
 Language=English
-%1
+%1: %2
 .
 
 MessageId=1
 Severity=Warning
 SymbolicName=FSP_EVENTLOG_WARNING
 Language=English
-%1
+%1: %2
 .
 
 MessageId=1
 Severity=Error
 SymbolicName=FSP_EVENTLOG_ERROR
 Language=English
-%1
+%1: %2
 .
diff --git a/src/dll/eventlog/eventlog_MSG00001.bin b/src/dll/eventlog/eventlog_MSG00001.bin
index 7be1691dddf4a7d0cddd8ca69ebe209f3937d6c8..07f9deac0181cb36aec40e7ffcf1db28f999dee7 100644
GIT binary patch
literal 112
zcmZQ(U|?WmU`POA4G4PykiEbG!hQf`KZpRbC4j0_84MY$7!-iC5d$v+7f_URaR3{t
B2rmEt

literal 88
ucmZQ(U|?WmU`POA4G4PykiEbH!hQf`Kkxvu1%Rql84MYC8MuHv!h8Tidj;$O