X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=event.cpp;h=4af50a86a925399aa93c8d4835742406c6f7ad84;hb=dd0e555ba889a74ae14487ca0b4a5c62cfa4d873;hp=baec6be25ec715199c0c120fc1bc0af8b3a74b96;hpb=f2ec1c0c55a6b3e8ca02b3d66b78c87fe0ac1f47;p=nssm.git

diff --git a/event.cpp b/event.cpp
index baec6be..4af50a8 100644
--- a/event.cpp
+++ b/event.cpp
@@ -1,30 +1,35 @@
 #include "nssm.h"
 
 #define NSSM_ERROR_BUFSIZE 65535
+#define NSSM_NUM_EVENT_STRINGS 16
 unsigned long tls_index;
 
 /* Convert error code to error string - must call LocalFree() on return value */
-char *error_string(unsigned long error) {
+TCHAR *error_string(unsigned long error) {
   /* Thread-safe buffer */
-  char *error_message = (char *) TlsGetValue(tls_index);
+  TCHAR *error_message = (TCHAR *) TlsGetValue(tls_index);
   if (! error_message) {
-    error_message = (char *) LocalAlloc(LPTR, NSSM_ERROR_BUFSIZE);
-    if (! error_message) return "<out of memory for error message>";
+    error_message = (TCHAR *) LocalAlloc(LPTR, NSSM_ERROR_BUFSIZE);
+    if (! error_message) return _T("<out of memory for error message>");
     TlsSetValue(tls_index, (void *) error_message);
   }
 
-  if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char *) error_message, NSSM_ERROR_BUFSIZE, 0)) {
-    if (_snprintf(error_message, NSSM_ERROR_BUFSIZE, "system error %lu", error) < 0) return 0;
+  if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, GetUserDefaultLangID(), (TCHAR *) error_message, NSSM_ERROR_BUFSIZE, 0)) {
+    if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, 0, (TCHAR *) error_message, NSSM_ERROR_BUFSIZE, 0)) {
+      if (_sntprintf_s(error_message, NSSM_ERROR_BUFSIZE, _TRUNCATE, _T("system error %lu"), error) < 0) return 0;
+    }
   }
   return error_message;
 }
 
 /* Convert message code to format string */
-char *message_string(unsigned long error) {
-  char *ret;
-  if (! FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR) &ret, NSSM_ERROR_BUFSIZE, 0)) {
-    ret = (char *) HeapAlloc(GetProcessHeap(), 0, 32);
-    if (_snprintf(ret, NSSM_ERROR_BUFSIZE, "system error %lu", error) < 0) return 0;
+TCHAR *message_string(unsigned long error) {
+  TCHAR *ret;
+  if (! FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, GetUserDefaultLangID(), (LPTSTR) &ret, NSSM_ERROR_BUFSIZE, 0)) {
+    if (! FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, 0, (LPTSTR) &ret, NSSM_ERROR_BUFSIZE, 0)) {
+      ret = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, 32 * sizeof(TCHAR));
+      if (_sntprintf_s(ret, NSSM_ERROR_BUFSIZE, _TRUNCATE, _T("system error %lu"), error) < 0) return 0;
+    }
   }
   return ret;
 }
@@ -33,19 +38,20 @@ char *message_string(unsigned long error) {
 void log_event(unsigned short type, unsigned long id, ...) {
   va_list arg;
   int count;
-  char *s;
-  char *strings[6];
+  TCHAR *s;
+  TCHAR *strings[NSSM_NUM_EVENT_STRINGS];
 
   /* Open event log */
-  HANDLE handle = RegisterEventSource(0, TEXT(NSSM));
+  HANDLE handle = RegisterEventSource(0, NSSM);
   if (! handle) return;
 
   /* Log it */
   count = 0;
   va_start(arg, id);
-  while ((s = va_arg(arg, char *))) strings[count++] = s;
+  while ((s = va_arg(arg, TCHAR *)) && count < NSSM_NUM_EVENT_STRINGS - 1) strings[count++] = s;
+  strings[count] = 0;
   va_end(arg);
-  ReportEvent(handle, type, 0, id, 0, count, 0, (const char **) strings, 0);
+  ReportEvent(handle, type, 0, id, 0, count, 0, (const TCHAR **) strings, 0);
 
   /* Close event log */
   DeregisterEventSource(handle);
@@ -55,11 +61,11 @@ void log_event(unsigned short type, unsigned long id, ...) {
 void print_message(FILE *file, unsigned long id, ...) {
   va_list arg;
 
-  char *format = message_string(id);
+  TCHAR *format = message_string(id);
   if (! format) return;
 
   va_start(arg, id);
-  vfprintf(file, format, arg);
+  _vftprintf(file, format, arg);
   va_end(arg);
 
   LocalFree(format);
@@ -69,17 +75,17 @@ void print_message(FILE *file, unsigned long id, ...) {
 int popup_message(unsigned int type, unsigned long id, ...) {
   va_list arg;
 
-  char *format = message_string(id);
+  TCHAR *format = message_string(id);
   if (! format) {
-    return MessageBox(0, "Message %lu was supposed to go here!", NSSM, MB_OK | MB_ICONEXCLAMATION);
+    return MessageBox(0, _T("The message which was supposed to go here is missing!"), NSSM, MB_OK | MB_ICONEXCLAMATION);
   }
 
-  char blurb[256];
+  TCHAR blurb[1024];
   va_start(arg, id);
-  if (vsnprintf(blurb, sizeof(blurb), format, arg) < 0) {
+  if (_vsntprintf_s(blurb, _countof(blurb), _TRUNCATE, format, arg) < 0) {
     va_end(arg);
     LocalFree(format);
-    return MessageBox(0, "Message %lu was supposed to go here!", NSSM, MB_OK | MB_ICONEXCLAMATION);
+    return MessageBox(0, _T("The message which was supposed to go here is too big!"), NSSM, MB_OK | MB_ICONEXCLAMATION);
   }
   va_end(arg);