Handle well-known account names.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index 3410e4a..220e060 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -402,6 +402,31 @@ HKEY open_registry(const TCHAR *service_name, REGSAM sam) {
   return open_registry(service_name, 0, sam);\r
 }\r
 \r
+int get_io_parameters(nssm_service_t *service, HKEY key) {\r
+  /* stdin */\r
+  if (get_createfile_parameters(key, NSSM_REG_STDIN, service->stdin_path, &service->stdin_sharing, NSSM_STDIN_SHARING, &service->stdin_disposition, NSSM_STDIN_DISPOSITION, &service->stdin_flags, NSSM_STDIN_FLAGS)) {\r
+    service->stdin_sharing = service->stdin_disposition = service->stdin_flags = 0;\r
+    ZeroMemory(service->stdin_path, _countof(service->stdin_path) * sizeof(TCHAR));\r
+    return 1;\r
+  }\r
+\r
+  /* stdout */\r
+  if (get_createfile_parameters(key, NSSM_REG_STDOUT, service->stdout_path, &service->stdout_sharing, NSSM_STDOUT_SHARING, &service->stdout_disposition, NSSM_STDOUT_DISPOSITION, &service->stdout_flags, NSSM_STDOUT_FLAGS)) {\r
+    service->stdout_sharing = service->stdout_disposition = service->stdout_flags = 0;\r
+    ZeroMemory(service->stdout_path, _countof(service->stdout_path) * sizeof(TCHAR));\r
+    return 2;\r
+  }\r
+\r
+  /* stderr */\r
+  if (get_createfile_parameters(key, NSSM_REG_STDERR, service->stderr_path, &service->stderr_sharing, NSSM_STDERR_SHARING, &service->stderr_disposition, NSSM_STDERR_DISPOSITION, &service->stderr_flags, NSSM_STDERR_FLAGS)) {\r
+    service->stderr_sharing = service->stderr_disposition = service->stderr_flags = 0;\r
+    ZeroMemory(service->stderr_path, _countof(service->stderr_path) * sizeof(TCHAR));\r
+    return 3;\r
+  }\r
+\r
+  return 0;\r
+}\r
+\r
 int get_parameters(nssm_service_t *service, STARTUPINFO *si) {\r
   unsigned long ret;\r
 \r
@@ -409,20 +434,23 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   HKEY key = open_registry(service->name, KEY_READ);\r
   if (! key) return 1;\r
 \r
+  /* Don't expand parameters when retrieving for the GUI. */\r
+  bool expand = si ? true : false;\r
+\r
   /* Try to get executable file - MUST succeed */\r
-  if (expand_parameter(key, NSSM_REG_EXE, service->exe, sizeof(service->exe), false)) {\r
+  if (get_string(key, NSSM_REG_EXE, service->exe, sizeof(service->exe), expand, false, true)) {\r
     RegCloseKey(key);\r
     return 3;\r
   }\r
 \r
   /* Try to get flags - may fail and we don't care */\r
-  if (expand_parameter(key, NSSM_REG_FLAGS, service->flags, sizeof(service->flags), false)) {\r
+  if (get_string(key, NSSM_REG_FLAGS, service->flags, sizeof(service->flags), expand, false, true)) {\r
     log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_FLAGS, NSSM_REG_FLAGS, service->name, service->exe, 0);\r
     ZeroMemory(service->flags, sizeof(service->flags));\r
   }\r
 \r
   /* Try to get startup directory - may fail and we fall back to a default */\r
-  if (expand_parameter(key, NSSM_REG_DIR, service->dir, sizeof(service->dir), true) || ! service->dir[0]) {\r
+  if (get_string(key, NSSM_REG_DIR, service->dir, sizeof(service->dir), expand, true, true) || ! service->dir[0]) {\r
     _sntprintf_s(service->dir, _countof(service->dir), _TRUNCATE, _T("%s"), service->exe);\r
     strip_basename(service->dir);\r
     if (service->dir[0] == _T('\0')) {\r
@@ -439,7 +467,7 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
 \r
   /* Try to get processor affinity - may fail. */\r
   TCHAR buffer[512];\r
-  if (expand_parameter(key, NSSM_REG_AFFINITY, buffer, sizeof(buffer), false, false) || ! buffer[0]) service->affinity = 0LL;\r
+  if (get_string(key, NSSM_REG_AFFINITY, buffer, sizeof(buffer), false, false, false) || ! buffer[0]) service->affinity = 0LL;\r
   else if (affinity_string_to_mask(buffer, &service->affinity)) {\r
     log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_AFFINITY_MASK, service->name, buffer);\r
     service->affinity = 0LL;\r
@@ -500,7 +528,7 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   SetCurrentDirectory(service->dir);\r
 \r
   /* Try to get stdout and stderr */\r
-  if (get_output_handles(service, key, si)) {\r
+  if (get_io_parameters(service, key)) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_OUTPUT_HANDLES_FAILED, service->name, 0);\r
     RegCloseKey(key);\r
     SetCurrentDirectory(cwd);\r