Try to build PDB files even for releases.

[nssm.git] / event.cpp

diff --git a/event.cpp b/event.cpp
index 32e4acf..b44482c 100644 (file)
--- a/event.cpp
+++ b/event.cpp
@@ -1,31 +1,36 @@
 #include "nssm.h"\r
 \r
+#define NSSM_SOURCE _T("nssm")\r
 #define NSSM_ERROR_BUFSIZE 65535\r
 #define NSSM_NUM_EVENT_STRINGS 16\r
 unsigned long tls_index;\r
 \r
 /* Convert error code to error string - must call LocalFree() on return value */\r
-char *error_string(unsigned long error) {\r
+TCHAR *error_string(unsigned long error) {\r
   /* Thread-safe buffer */\r
-  char *error_message = (char *) TlsGetValue(tls_index);\r
+  TCHAR *error_message = (TCHAR *) TlsGetValue(tls_index);\r
   if (! error_message) {\r
-    error_message = (char *) LocalAlloc(LPTR, NSSM_ERROR_BUFSIZE);\r
-    if (! error_message) return "<out of memory for error message>";\r
+    error_message = (TCHAR *) LocalAlloc(LPTR, NSSM_ERROR_BUFSIZE);\r
+    if (! error_message) return _T("<out of memory for error message>");\r
     TlsSetValue(tls_index, (void *) error_message);\r
   }\r
 \r
-  if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (char *) error_message, NSSM_ERROR_BUFSIZE, 0)) {\r
-    if (_snprintf_s(error_message, NSSM_ERROR_BUFSIZE, _TRUNCATE, "system error %lu", error) < 0) return 0;\r
+  if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, GetUserDefaultLangID(), (TCHAR *) error_message, NSSM_ERROR_BUFSIZE, 0)) {\r
+    if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, 0, (TCHAR *) error_message, NSSM_ERROR_BUFSIZE, 0)) {\r
+      if (_sntprintf_s(error_message, NSSM_ERROR_BUFSIZE, _TRUNCATE, _T("system error %lu"), error) < 0) return 0;\r
+    }\r
   }\r
   return error_message;\r
 }\r
 \r
 /* Convert message code to format string */\r
-char *message_string(unsigned long error) {\r
-  char *ret;\r
-  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)) {\r
-    ret = (char *) HeapAlloc(GetProcessHeap(), 0, 32);\r
-    if (_snprintf_s(ret, NSSM_ERROR_BUFSIZE, _TRUNCATE, "system error %lu", error) < 0) return 0;\r
+TCHAR *message_string(unsigned long error) {\r
+  TCHAR *ret;\r
+  if (! FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, GetUserDefaultLangID(), (LPTSTR) &ret, NSSM_ERROR_BUFSIZE, 0)) {\r
+    if (! FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS, 0, error, 0, (LPTSTR) &ret, NSSM_ERROR_BUFSIZE, 0)) {\r
+      ret = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, 32 * sizeof(TCHAR));\r
+      if (_sntprintf_s(ret, NSSM_ERROR_BUFSIZE, _TRUNCATE, _T("system error %lu"), error) < 0) return 0;\r
+    }\r
   }\r
   return ret;\r
 }\r
@@ -34,20 +39,20 @@ char *message_string(unsigned long error) {
 void log_event(unsigned short type, unsigned long id, ...) {\r
   va_list arg;\r
   int count;\r
-  char *s;\r
-  char *strings[NSSM_NUM_EVENT_STRINGS];\r
+  TCHAR *s;\r
+  TCHAR *strings[NSSM_NUM_EVENT_STRINGS];\r
 \r
   /* Open event log */\r
-  HANDLE handle = RegisterEventSource(0, TEXT(NSSM));\r
+  HANDLE handle = RegisterEventSource(0, NSSM_SOURCE);\r
   if (! handle) return;\r
 \r
   /* Log it */\r
   count = 0;\r
   va_start(arg, id);\r
-  while ((s = va_arg(arg, char *)) && count < NSSM_NUM_EVENT_STRINGS - 1) strings[count++] = s;\r
+  while ((s = va_arg(arg, TCHAR *)) && count < NSSM_NUM_EVENT_STRINGS - 1) strings[count++] = s;\r
   strings[count] = 0;\r
   va_end(arg);\r
-  ReportEvent(handle, type, 0, id, 0, count, 0, (const char **) strings, 0);\r
+  ReportEvent(handle, type, 0, id, 0, count, 0, (const TCHAR **) strings, 0);\r
 \r
   /* Close event log */\r
   DeregisterEventSource(handle);\r
@@ -57,35 +62,48 @@ void log_event(unsigned short type, unsigned long id, ...) {
 void print_message(FILE *file, unsigned long id, ...) {\r
   va_list arg;\r
 \r
-  char *format = message_string(id);\r
+  TCHAR *format = message_string(id);\r
   if (! format) return;\r
 \r
   va_start(arg, id);\r
-  vfprintf(file, format, arg);\r
+  _vftprintf(file, format, arg);\r
   va_end(arg);\r
 \r
   LocalFree(format);\r
 }\r
 \r
 /* Show a GUI dialogue */\r
-int popup_message(unsigned int type, unsigned long id, ...) {\r
+int popup_message(HWND owner, unsigned int type, unsigned long id, ...) {\r
   va_list arg;\r
 \r
-  char *format = message_string(id);\r
+  TCHAR *format = message_string(id);\r
   if (! format) {\r
-    return MessageBox(0, "Message %lu was supposed to go here!", NSSM, MB_OK | MB_ICONEXCLAMATION);\r
+    return MessageBox(0, _T("The message which was supposed to go here is missing!"), NSSM, MB_OK | MB_ICONEXCLAMATION);\r
   }\r
 \r
-  char blurb[256];\r
+  TCHAR blurb[NSSM_ERROR_BUFSIZE];\r
   va_start(arg, id);\r
-  if (vsnprintf_s(blurb, sizeof(blurb), _TRUNCATE, format, arg) < 0) {\r
+  if (_vsntprintf_s(blurb, _countof(blurb), _TRUNCATE, format, arg) < 0) {\r
     va_end(arg);\r
     LocalFree(format);\r
-    return MessageBox(0, "Message %lu was supposed to go here!", NSSM, MB_OK | MB_ICONEXCLAMATION);\r
+    return MessageBox(0, _T("The message which was supposed to go here is too big!"), NSSM, MB_OK | MB_ICONEXCLAMATION);\r
   }\r
   va_end(arg);\r
 \r
-  int ret = MessageBox(0, blurb, NSSM, type);\r
+  MSGBOXPARAMS params;\r
+  ZeroMemory(&params, sizeof(params));\r
+  params.cbSize = sizeof(params);\r
+  params.hInstance = GetModuleHandle(0);\r
+  params.hwndOwner = owner;\r
+  params.lpszText = blurb;\r
+  params.lpszCaption = NSSM;\r
+  params.dwStyle = type;\r
+  if (type == MB_OK) {\r
+    params.dwStyle |= MB_USERICON;\r
+    params.lpszIcon = MAKEINTRESOURCE(IDI_NSSM);\r
+  }\r
+\r
+  int ret = MessageBoxIndirect(&params);\r
 \r
   LocalFree(format);\r
 \r