X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=event.cpp;fp=event.cpp;h=2a9bbf242d313f564abcd216b7f698860d5284c8;hb=06a62a665e152850d082607eced4fa4654f1bf70;hp=7f2b9f4f3363f2ae1feab6c3ee3b96099dcd94d6;hpb=0ac37dac5807d10287e6f2ff78aa3c9c20e24114;p=nssm.git

diff --git a/event.cpp b/event.cpp
index 7f2b9f4..2a9bbf2 100644
--- a/event.cpp
+++ b/event.cpp
@@ -2,13 +2,13 @@
 
 /* Convert error code to error string - must call LocalFree() on return value */
 char *error_string(unsigned long error) {
-  char *message;
-  if (! FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char *) &message, 0, 0)) return 0;
+  static char message[65535];
+  if (! FormatMessage(FORMAT_MESSAGE_FROM_HMODULE, 0, NSSM_MESSAGE_DEFAULT, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), message, sizeof(message), 0)) return 0;
   return message;
 }
 
 /* Log a message to the Event Log */
-void eventprintf(unsigned short type, char *format, ...) {
+void eventprintf(unsigned short type, unsigned long id, char *format, ...) {
   char message[4096];
   char *strings[2];
   int n, size;
@@ -32,7 +32,7 @@ void eventprintf(unsigned short type, char *format, ...) {
   if (! handle) return;
 
   /* Log it */
-  if (! ReportEvent(handle, type, 0, 0, 0, 1, 0, (const char **) strings, 0)) {
+  if (! ReportEvent(handle, type, 0, id, 0, 1, 0, (const char **) strings, 0)) {
     printf("ReportEvent(): %s\n", error_string(GetLastError()));
   }