Added set_expand_string() and set_number().

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index a1332b2..f54ed03 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -192,6 +192,28 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
 }\r
 \r
 /*\r
+  Sets a string in the registry.\r
+  Returns: 0 if it was set.\r
+           1 on error.\r
+*/\r
+int set_expand_string(HKEY key, char *value, char *string) {\r
+  if (RegSetValueEx(key, value, 0, REG_EXPAND_SZ, (const unsigned char *) string, (unsigned long) strlen(string) + 1) == ERROR_SUCCESS) return 0;\r
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0);\r
+  return 1;\r
+}\r
+\r
+/*\r
+  Set an unsigned long in the registry.\r
+  Returns: 0 if it was set.\r
+           1 on error.\r
+*/\r
+int set_number(HKEY key, char *value, unsigned long number) {\r
+  if (RegSetValueEx(key, value, 0, REG_DWORD, (const unsigned char *) &number, sizeof(number)) == ERROR_SUCCESS) return 0;\r
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0);\r
+  return 1;\r
+}\r
+\r
+/*\r
   Query an unsigned long from the registry.\r
   Returns:  1 if a number was retrieved.\r
             0 if none was found and must_exist is false.\r
@@ -239,7 +261,7 @@ void override_milliseconds(char *service_name, HKEY key, char *value, unsigned l
   if (! ok) *buffer = default_value;\r
 }\r
 \r
-int get_parameters(char *service_name, char *exe, unsigned long exelen, char *flags, unsigned long flagslen, char *dir, unsigned long dirlen, char **env, unsigned long *throttle_delay, unsigned long *stop_method, STARTUPINFO *si) {\r
+int get_parameters(char *service_name, char *exe, unsigned long exelen, char *flags, unsigned long flagslen, char *dir, unsigned long dirlen, char **env, unsigned long *throttle_delay, unsigned long *stop_method, unsigned long *kill_console_delay, unsigned long *kill_window_delay, unsigned long *kill_threads_delay, STARTUPINFO *si) {\r
   unsigned long ret;\r
 \r
   /* Get registry */\r
@@ -300,28 +322,12 @@ int get_parameters(char *service_name, char *exe, unsigned long exelen, char *fl
   }\r
 \r
   /* Try to get throttle restart delay */\r
-  unsigned long type = REG_DWORD;\r
-  unsigned long buflen = sizeof(*throttle_delay);\r
-  bool throttle_ok = false;\r
-  ret = RegQueryValueEx(key, NSSM_REG_THROTTLE, 0, &type, (unsigned char *) throttle_delay, &buflen);\r
-  if (ret != ERROR_SUCCESS) {\r
-    if (ret != ERROR_FILE_NOT_FOUND) {\r
-      if (type != REG_DWORD) {\r
-        char milliseconds[16];\r
-        _snprintf_s(milliseconds, sizeof(milliseconds), _TRUNCATE, "%lu", NSSM_RESET_THROTTLE_RESTART);\r
-        log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_THROTTLE, service_name, NSSM_REG_THROTTLE, milliseconds, 0);\r
-      }\r
-      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_THROTTLE, error_string(GetLastError()), 0);\r
-    }\r
-  }\r
-  else throttle_ok = true;\r
-\r
-  if (! throttle_ok) *throttle_delay = NSSM_RESET_THROTTLE_RESTART;\r
+  override_milliseconds(service_name, key, NSSM_REG_THROTTLE, throttle_delay, NSSM_RESET_THROTTLE_RESTART, NSSM_EVENT_BOGUS_THROTTLE);\r
 \r
   /* Try to get service stop flags. */\r
-  type = REG_DWORD;\r
+  unsigned long type = REG_DWORD;\r
   unsigned long stop_method_skip;\r
-  buflen = sizeof(stop_method_skip);\r
+  unsigned long buflen = sizeof(stop_method_skip);\r
   bool stop_ok = false;\r
   ret = RegQueryValueEx(key, NSSM_REG_STOP_METHOD_SKIP, 0, &type, (unsigned char *) &stop_method_skip, &buflen);\r
   if (ret != ERROR_SUCCESS) {\r
@@ -338,6 +344,11 @@ int get_parameters(char *service_name, char *exe, unsigned long exelen, char *fl
   *stop_method = ~0;\r
   if (stop_ok) *stop_method &= ~stop_method_skip;\r
 \r
+  /* Try to get kill delays - may fail. */\r
+  override_milliseconds(service_name, key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD, kill_console_delay, NSSM_KILL_CONSOLE_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_CONSOLE_GRACE_PERIOD);\r
+  override_milliseconds(service_name, key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, kill_window_delay, NSSM_KILL_WINDOW_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_WINDOW_GRACE_PERIOD);\r
+  override_milliseconds(service_name, key, NSSM_REG_KILL_THREADS_GRACE_PERIOD, kill_threads_delay, NSSM_KILL_THREADS_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_THREADS_GRACE_PERIOD);\r
+\r
   /* Close registry */\r
   RegCloseKey(key);\r
 \r