Clean up Parameters properly.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index 00d6eaf..e499933 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -17,8 +17,7 @@ int create_messages() {
   }\r
 \r
   /* Get path of this program */\r
-  TCHAR path[PATH_LENGTH];\r
-  GetModuleFileName(0, path, _countof(path));\r
+  const TCHAR *path = nssm_imagepath();\r
 \r
   /* Try to register the module but don't worry so much on failure */\r
   RegSetValueEx(key, _T("EventMessageFile"), 0, REG_SZ, (const unsigned char *) path, (unsigned long) (_tcslen(path) +  1) * sizeof(TCHAR));\r
@@ -33,19 +32,23 @@ int create_parameters(nssm_service_t *service, bool editing) {
   HKEY key = open_registry(service->name, KEY_WRITE);\r
   if (! key) return 1;\r
 \r
+  /* Remember parameters in case we need to delete them. */\r
+  TCHAR registry[KEY_LENGTH];\r
+  int ret = service_registry_path(service->name, true, 0, registry, _countof(registry));\r
+\r
   /* Try to create the parameters */\r
   if (set_expand_string(key, NSSM_REG_EXE, service->exe)) {\r
-    RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);\r
+    if (ret > 0) RegDeleteKey(HKEY_LOCAL_MACHINE, registry);\r
     RegCloseKey(key);\r
     return 2;\r
   }\r
   if (set_expand_string(key, NSSM_REG_FLAGS, service->flags)) {\r
-    RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);\r
+    if (ret > 0) RegDeleteKey(HKEY_LOCAL_MACHINE, registry);\r
     RegCloseKey(key);\r
     return 3;\r
   }\r
   if (set_expand_string(key, NSSM_REG_DIR, service->dir)) {\r
-    RegDeleteKey(HKEY_LOCAL_MACHINE, NSSM_REGISTRY);\r
+    if (ret > 0) RegDeleteKey(HKEY_LOCAL_MACHINE, registry);\r
     RegCloseKey(key);\r
     return 4;\r
   }\r
@@ -457,18 +460,20 @@ void override_milliseconds(TCHAR *service_name, HKEY key, TCHAR *value, unsigned
   if (! ok) *buffer = default_value;\r
 }\r
 \r
-HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, bool must_exist) {\r
-  /* Get registry */\r
-  TCHAR registry[KEY_LENGTH];\r
-  HKEY key;\r
+static int service_registry_path(const TCHAR *service_name, bool parameters, const TCHAR *sub, TCHAR *buffer, unsigned long buflen) {\r
   int ret;\r
 \r
-  if (sub) ret = _sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY _T("\\%s"), service_name, sub);\r
-  else ret = _sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY, service_name);\r
-  if (ret < 0) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("NSSM_REGISTRY"), _T("open_registry()"), 0);\r
-    return 0;\r
+  if (parameters) {\r
+    if (sub) ret = _sntprintf_s(buffer, buflen, _TRUNCATE, NSSM_REGISTRY _T("\\") NSSM_REG_PARAMETERS _T("\\%s"), service_name, sub);\r
+    else ret = _sntprintf_s(buffer, buflen, _TRUNCATE, NSSM_REGISTRY _T("\\") NSSM_REG_PARAMETERS, service_name);\r
   }\r
+  else ret = _sntprintf_s(buffer, buflen, _TRUNCATE, NSSM_REGISTRY, service_name);\r
+\r
+  return ret;\r
+}\r
+\r
+static HKEY open_registry_key(const TCHAR *registry, REGSAM sam, bool must_exist) {\r
+  HKEY key;\r
 \r
   if (sam & KEY_SET_VALUE) {\r
     if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, sam, 0, &key, 0) != ERROR_SUCCESS) {\r
@@ -488,6 +493,28 @@ HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, bool
   return key;\r
 }\r
 \r
+HKEY open_service_registry(const TCHAR *service_name, REGSAM sam, bool must_exist) {\r
+  /* Get registry */\r
+  TCHAR registry[KEY_LENGTH];\r
+  if (service_registry_path(service_name, false, 0, registry, _countof(registry)) < 0) {\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, NSSM_REGISTRY, _T("open_service_registry()"), 0);\r
+    return 0;\r
+  }\r
+\r
+  return open_registry_key(registry, sam, must_exist);\r
+}\r
+\r
+HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, bool must_exist) {\r
+  /* Get registry */\r
+  TCHAR registry[KEY_LENGTH];\r
+  if (service_registry_path(service_name, true, sub, registry, _countof(registry)) < 0) {\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, NSSM_REGISTRY, _T("open_registry()"), 0);\r
+    return 0;\r
+  }\r
+\r
+  return open_registry_key(registry, sam, must_exist);\r
+}\r
+\r
 HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam) {\r
   return open_registry(service_name, sub, sam, true);\r
 }\r
@@ -531,6 +558,14 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   /* Don't expand parameters when retrieving for the GUI. */\r
   bool expand = si ? true : false;\r
 \r
+  /* Try to get environment variables - may fail */\r
+  get_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);\r
+  /* Environment variables to add to existing rather than replace - may fail. */\r
+  get_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);\r
+\r
+  /* Set environment if we are starting the service. */\r
+  if (si) set_service_environment(service);\r
+\r
   /* Try to get executable file - MUST succeed */\r
   if (get_string(key, NSSM_REG_EXE, service->exe, sizeof(service->exe), expand, false, true)) {\r
     RegCloseKey(key);\r
@@ -585,11 +620,6 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
     }\r
   }\r
 \r
-  /* Try to get environment variables - may fail */\r
-  get_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);\r
-  /* Environment variables to add to existing rather than replace - may fail. */\r
-  get_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);\r
-\r
   /* Try to get priority - may fail. */\r
   unsigned long priority;\r
   if (get_number(key, NSSM_REG_PRIORITY, &priority, false) == 1) {\r