Allow setting application priority.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index 766f73b..c93d3ae 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -51,6 +51,8 @@ int create_parameters(nssm_service_t *service, bool editing) {
   }\r
 \r
   /* Other non-default parameters. May fail. */\r
+  if (service->priority != NORMAL_PRIORITY_CLASS) set_number(key, NSSM_REG_PRIORITY, service->priority);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_PRIORITY);\r
   unsigned long stop_method_skip = ~service->stop_method;\r
   if (stop_method_skip) set_number(key, NSSM_REG_STOP_METHOD_SKIP, stop_method_skip);\r
   else if (editing) RegDeleteValue(key, NSSM_REG_STOP_METHOD_SKIP);\r
@@ -204,6 +206,65 @@ int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un
   return 0;\r
 }\r
 \r
+/* Replace NULL with CRLF. Leave NULL NULL as the end marker. */\r
+int format_environment(TCHAR *env, unsigned long envlen, TCHAR **formatted, unsigned long *newlen) {\r
+  unsigned long i, j;\r
+  *newlen = envlen;\r
+\r
+  if (! *newlen) {\r
+    *formatted = 0;\r
+    return 0;\r
+  }\r
+\r
+  for (i = 0; i < envlen; i++) if (! env[i] && env[i + 1]) ++*newlen;\r
+\r
+  *formatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));\r
+  if (! *formatted) {\r
+    *newlen = 0;\r
+    return 1;\r
+  }\r
+\r
+  for (i = 0, j = 0; i < envlen; i++) {\r
+    (*formatted)[j] = env[i];\r
+    if (! env[i]) {\r
+      if (env[i + 1]) {\r
+        (*formatted)[j] = _T('\r');\r
+        (*formatted)[++j] = _T('\n');\r
+      }\r
+    }\r
+    j++;\r
+  }\r
+\r
+  return 0;\r
+}\r
+\r
+/* Strip CR and replace LF with NULL. */\r
+int unformat_environment(TCHAR *env, unsigned long envlen, TCHAR **unformatted, unsigned long *newlen) {\r
+  unsigned long i, j;\r
+  *newlen = 0;\r
+\r
+  if (! envlen) {\r
+    *unformatted = 0;\r
+    return 0;\r
+  }\r
+\r
+  for (i = 0; i < envlen; i++) if (env[i] != _T('\r')) ++*newlen;\r
+  /* Must end with two NULLs. */\r
+  *newlen += 2;\r
+\r
+  *unformatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));\r
+  if (! *unformatted) return 1;\r
+\r
+  for (i = 0, j = 0; i < envlen; i++) {\r
+    if (env[i] == _T('\r')) continue;\r
+    if (env[i] == _T('\n')) (*unformatted)[j] = _T('\0');\r
+    else (*unformatted)[j] = env[i];\r
+    j++;\r
+  }\r
+\r
+  return 0;\r
+}\r
+\r
 int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {\r
   TCHAR *buffer = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, datalen);\r
   if (! buffer) {\r
@@ -433,6 +494,13 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
     }\r
   }\r
 \r
+  /* Try to get priority - may fail. */\r
+  unsigned long priority;\r
+  if (get_number(key, NSSM_REG_PRIORITY, &priority) == 1) {\r
+    if (priority == (priority & priority_mask())) service->priority = priority;\r
+    else log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_PRIORITY, service->name, NSSM_REG_PRIORITY, 0);\r
+  }\r
+\r
   /* Try to get file rotation settings - may fail. */\r
   unsigned long rotate_files;\r
   if (get_number(key, NSSM_REG_ROTATE, &rotate_files, false) == 1) {\r