X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=dbac12b9b3580094c8b3588107e5307672cde0fb;hb=62f28c55d444d846579159133dbe091809a2c08b;hp=617cad12dea70ee44df9c6096deee37764e30166;hpb=f124b07b52a569dd9e332d0940af592d0e8e201d;p=nssm.git

diff --git a/service.cpp b/service.cpp
index 617cad1..dbac12b 100644
--- a/service.cpp
+++ b/service.cpp
@@ -83,10 +83,11 @@ static inline int service_control_response(unsigned long control, unsigned long
   return 0;
 }
 
-static inline int await_service_control_response(unsigned long control, SC_HANDLE service_handle, SERVICE_STATUS *service_status, unsigned long initial_status) {
+static inline int await_service_control_response(unsigned long control, SC_HANDLE service_handle, SERVICE_STATUS *service_status, unsigned long initial_status, unsigned long cutoff) {
   int tries = 0;
   unsigned long checkpoint = 0;
   unsigned long waithint = 0;
+  unsigned long waited = 0;
   while (QueryServiceStatus(service_handle, service_status)) {
     int response = service_control_response(control, service_status->dwCurrentState);
     /* Alas we can't WaitForSingleObject() on an SC_HANDLE. */
@@ -96,13 +97,22 @@ static inline int await_service_control_response(unsigned long control, SC_HANDL
       checkpoint = service_status->dwCheckPoint;
       waithint = service_status->dwWaitHint;
       if (++tries > 10) tries = 10;
-      Sleep(50 * tries);
+      unsigned long wait = 50 * tries;
+      if (cutoff) {
+        if (waited > cutoff) return response;
+        waited += wait;
+      }
+      Sleep(wait);
     }
     else return response;
   }
   return -1;
 }
 
+static inline int await_service_control_response(unsigned long control, SC_HANDLE service_handle, SERVICE_STATUS *service_status, unsigned long initial_status) {
+  return await_service_control_response(control, service_handle, service_status, initial_status, 0);
+}
+
 static inline void wait_for_hooks(nssm_service_t *service, bool notify) {
   SERVICE_STATUS_HANDLE status_handle;
   SERVICE_STATUS *status;
@@ -240,7 +250,7 @@ int affinity_string_to_mask(TCHAR *string, __int64 *mask) {
   return 0;
 }
 
-inline unsigned long priority_mask() {
+unsigned long priority_mask() {
  return REALTIME_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | ABOVE_NORMAL_PRIORITY_CLASS | NORMAL_PRIORITY_CLASS | BELOW_NORMAL_PRIORITY_CLASS | IDLE_PRIORITY_CLASS;
 }
 
@@ -429,6 +439,56 @@ QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE
   return qsc;
 }
 
+/* WILL NOT allocate a new string if the identifier is already present. */
+int prepend_service_group_identifier(TCHAR *group, TCHAR **canon) {
+  if (! group || ! group[0] || group[0] == SC_GROUP_IDENTIFIER) {
+    *canon = group;
+    return 0;
+  }
+
+  size_t len = _tcslen(group) + 1;
+  *canon = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));
+  if (! *canon) {
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canon"), _T("prepend_service_group_identifier()"));
+    return 1;
+  }
+
+  TCHAR *s = *canon;
+  *s++ = SC_GROUP_IDENTIFIER;
+  memmove(s, group, len * sizeof(TCHAR));
+  (*canon)[len] = _T('\0');
+
+  return 0;
+}
+
+int append_to_dependencies(TCHAR *dependencies, unsigned long dependencieslen, TCHAR *string, TCHAR **newdependencies, unsigned long *newlen, int type) {
+  *newlen = 0;
+
+  TCHAR *canon = 0;
+  if (type == DEPENDENCY_GROUPS) {
+    if (prepend_service_group_identifier(string, &canon)) return 1;
+  }
+  else canon = string;
+  int ret = append_to_double_null(dependencies, dependencieslen, newdependencies, newlen, canon, 0, false);
+  if (canon && canon != string) HeapFree(GetProcessHeap(), 0, canon);
+
+  return ret;
+}
+
+int remove_from_dependencies(TCHAR *dependencies, unsigned long dependencieslen, TCHAR *string, TCHAR **newdependencies, unsigned long *newlen, int type) {
+  *newlen = 0;
+
+  TCHAR *canon = 0;
+  if (type == DEPENDENCY_GROUPS) {
+    if (prepend_service_group_identifier(string, &canon)) return 1;
+  }
+  else canon = string;
+  int ret = remove_from_double_null(dependencies, dependencieslen, newdependencies, newlen, canon, 0, false);
+  if (canon && canon != string) HeapFree(GetProcessHeap(), 0, canon);
+
+  return ret;
+}
+
 int set_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR *buffer) {
   TCHAR *dependencies = _T("");
   unsigned long num_dependencies = 0;
@@ -562,8 +622,10 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
   QUERY_SERVICE_CONFIG *qsc = query_service_config(service_name, service_handle);
   if (! qsc) return 3;
 
-  if (! qsc->lpDependencies) return 0;
-  if (! qsc->lpDependencies[0]) return 0;
+  if (! qsc->lpDependencies || ! qsc->lpDependencies[0]) {
+    HeapFree(GetProcessHeap(), 0, qsc);
+    return 0;
+  }
 
   /* lpDependencies is doubly NULL terminated. */
   while (qsc->lpDependencies[*bufsize]) {
@@ -577,6 +639,7 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
   if (! *buffer) {
     *bufsize = 0;
     print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("lpDependencies"), _T("get_service_dependencies()"));
+    HeapFree(GetProcessHeap(), 0, qsc);
     return 4;
   }
 
@@ -601,6 +664,12 @@ int get_service_dependencies(const TCHAR *service_name, SC_HANDLE service_handle
 
   HeapFree(GetProcessHeap(), 0, qsc);
 
+  if (! *buffer[0]) {
+    HeapFree(GetProcessHeap(), 0, *buffer);
+    *buffer = 0;
+    *bufsize = 0;
+  }
+
   return 0;
 }
 
@@ -653,8 +722,6 @@ int get_service_description(const TCHAR *service_name, SC_HANDLE service_handle,
     print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DESCRIPTION"), error_string(error));
     return 4;
   }
-
-  return 0;
 }
 
 int get_service_startup(const TCHAR *service_name, SC_HANDLE service_handle, const QUERY_SERVICE_CONFIG *qsc, unsigned long *startup) {
@@ -762,7 +829,7 @@ void cleanup_nssm_service(nssm_service_t *service) {
   if (! service) return;
   if (service->username) HeapFree(GetProcessHeap(), 0, service->username);
   if (service->password) {
-    SecureZeroMemory(service->password, service->passwordlen);
+    SecureZeroMemory(service->password, service->passwordlen * sizeof(TCHAR));
     HeapFree(GetProcessHeap(), 0, service->password);
   }
   if (service->dependencies) HeapFree(GetProcessHeap(), 0, service->dependencies);
@@ -774,7 +841,7 @@ void cleanup_nssm_service(nssm_service_t *service) {
   if (service->throttle_section_initialised) DeleteCriticalSection(&service->throttle_section);
   if (service->throttle_timer) CloseHandle(service->throttle_timer);
   if (service->hook_section_initialised) DeleteCriticalSection(&service->hook_section);
-  if (service->initial_env) FreeEnvironmentStrings(service->initial_env);
+  if (service->initial_env) HeapFree(GetProcessHeap(), 0, service->initial_env);
   HeapFree(GetProcessHeap(), 0, service);
 }
 
@@ -826,7 +893,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   if (argc < 2) return usage(1);
 
   /* Are we editing on the command line? */
-  enum { MODE_EDITING, MODE_GETTING, MODE_SETTING, MODE_RESETTING } mode = MODE_EDITING;
+  enum { MODE_EDITING, MODE_GETTING, MODE_SETTING, MODE_RESETTING, MODE_DUMPING } mode = MODE_EDITING;
   const TCHAR *verb = argv[0];
   const TCHAR *service_name = argv[1];
   bool getting = false;
@@ -849,6 +916,11 @@ int pre_edit_service(int argc, TCHAR **argv) {
     mandatory = 3;
     mode = MODE_RESETTING;
   }
+  else if (str_equiv(verb, _T("dump"))) {
+    mandatory = 1;
+    remainder = 2;
+    mode = MODE_DUMPING;
+  }
   if (argc < mandatory) return usage(1);
 
   const TCHAR *parameter = 0;
@@ -923,7 +995,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
 
   service->type = qsc->dwServiceType;
   if (! (service->type & SERVICE_WIN32_OWN_PROCESS)) {
-    if (mode != MODE_GETTING) {
+    if (mode != MODE_GETTING && mode != MODE_DUMPING) {
       HeapFree(GetProcessHeap(), 0, qsc);
       CloseServiceHandle(service->handle);
       CloseServiceHandle(services);
@@ -933,7 +1005,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }
 
   if (get_service_startup(service->name, service->handle, qsc, &service->startup)) {
-    if (mode != MODE_GETTING) {
+    if (mode != MODE_GETTING && mode != MODE_DUMPING) {
       HeapFree(GetProcessHeap(), 0, qsc);
       CloseServiceHandle(service->handle);
       CloseServiceHandle(services);
@@ -942,7 +1014,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }
 
   if (get_service_username(service->name, qsc, &service->username, &service->usernamelen)) {
-    if (mode != MODE_GETTING) {
+    if (mode != MODE_GETTING && mode != MODE_DUMPING) {
       HeapFree(GetProcessHeap(), 0, qsc);
       CloseServiceHandle(service->handle);
       CloseServiceHandle(services);
@@ -962,7 +1034,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
 
   /* Get extended system details. */
   if (get_service_description(service->name, service->handle, _countof(service->description), service->description)) {
-    if (mode != MODE_GETTING) {
+    if (mode != MODE_GETTING && mode != MODE_DUMPING) {
       CloseServiceHandle(service->handle);
       CloseServiceHandle(services);
       return 6;
@@ -970,7 +1042,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }
 
   if (get_service_dependencies(service->name, service->handle, &service->dependencies, &service->dependencieslen)) {
-    if (mode != MODE_GETTING) {
+    if (mode != MODE_GETTING && mode != MODE_DUMPING) {
       CloseServiceHandle(service->handle);
       CloseServiceHandle(services);
       return 7;
@@ -984,7 +1056,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
 
   if (! service->exe[0]) {
     service->native = true;
-    if (mode != MODE_GETTING) print_message(stderr, NSSM_MESSAGE_INVALID_SERVICE, service->name, NSSM, service->image);
+    if (mode != MODE_GETTING && mode != MODE_DUMPING) print_message(stderr, NSSM_MESSAGE_INVALID_SERVICE, service->name, NSSM, service->image);
   }
 
   /* Editing with the GUI. */
@@ -993,6 +1065,41 @@ int pre_edit_service(int argc, TCHAR **argv) {
     return 0;
   }
 
+  HKEY key;
+  value_t value;
+  int ret;
+
+  if (mode == MODE_DUMPING) {
+    TCHAR *service_name = service->name;
+    if (argc > remainder) service_name = argv[remainder];
+    if (service->native) key = 0;
+    else {
+      key = open_registry(service->name, KEY_READ);
+      if (! key) return 4;
+    }
+
+    TCHAR quoted_service_name[SERVICE_NAME_LENGTH * 2];
+    TCHAR quoted_exe[EXE_LENGTH * 2];
+    TCHAR quoted_nssm[EXE_LENGTH * 2];
+    if (quote(service_name, quoted_service_name, _countof(quoted_service_name))) return 5;
+    if (quote(service->exe, quoted_exe, _countof(quoted_exe))) return 6;
+    if (quote(nssm_exe(), quoted_nssm, _countof(quoted_nssm))) return 6;
+    _tprintf(_T("%s install %s %s\n"), quoted_nssm, quoted_service_name, quoted_exe);
+
+    ret = 0;
+    for (i = 0; settings[i].name; i++) {
+      setting = &settings[i];
+      if (! setting->native && service->native) continue;
+      if (dump_setting(service_name, key, service->handle, setting)) ret++;
+    }
+
+    if (! service->native) RegCloseKey(key);
+    CloseServiceHandle(service->handle);
+
+    if (ret) return 1;
+    return 0;
+  }
+
   /* Trying to manage App* parameters for a non-NSSM service. */
   if (! setting->native && service->native) {
     CloseServiceHandle(service->handle);
@@ -1000,10 +1107,6 @@ int pre_edit_service(int argc, TCHAR **argv) {
     return 1;
   }
 
-  HKEY key;
-  value_t value;
-  int ret;
-
   if (mode == MODE_GETTING) {
     if (! service->native) {
       key = open_registry(service->name, KEY_READ);
@@ -1026,7 +1129,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
         break;
 
       case REG_DWORD:
-        _tprintf(_T("%u\n"), value.numeric);
+        _tprintf(_T("%lu\n"), value.numeric);
         break;
     }
 
@@ -1074,7 +1177,7 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }
 
   if (! service->native) {
-    key = open_registry(service->name, KEY_WRITE);
+    key = open_registry(service->name, KEY_READ | KEY_WRITE);
     if (! key) {
       if (value.string) HeapFree(GetProcessHeap(), 0, value.string);
       return 4;
@@ -1126,7 +1229,7 @@ int install_service(nssm_service_t *service) {
   }
 
   /* Get path of this program */
-  GetModuleFileName(0, service->image, _countof(service->image));
+  _sntprintf_s(service->image, _countof(service->image), _TRUNCATE, _T("%s"), nssm_imagepath());
 
   /* Create the service - settings will be changed in edit_service() */
   service->handle = CreateService(services, service->name, service->name, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, service->image, 0, 0, 0, 0, 0);
@@ -1181,19 +1284,33 @@ int edit_service(nssm_service_t *service, bool editing) {
   TCHAR *username = 0;
   TCHAR *canon = 0;
   TCHAR *password = 0;
+  boolean virtual_account = false;
   if (service->usernamelen) {
     username = service->username;
-    if (canonicalise_username(username, &canon)) return 5;
-    if (service->passwordlen) password = service->password;
+    if (is_virtual_account(service->name, username)) {
+      virtual_account = true;
+      canon = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (service->usernamelen + 1) * sizeof(TCHAR));
+      if (! canon) {
+        print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canon"), _T("edit_service()"));
+        return 5;
+      }
+      memmove(canon, username, (service->usernamelen + 1) * sizeof(TCHAR));
+    }
+    else {
+      if (canonicalise_username(username, &canon)) return 5;
+      if (service->passwordlen) password = service->password;
+    }
   }
   else if (editing) username = canon = NSSM_LOCALSYSTEM_ACCOUNT;
 
-  if (well_known_username(canon)) password = _T("");
-  else {
-    if (grant_logon_as_service(canon)) {
-      if (canon != username) HeapFree(GetProcessHeap(), 0, canon);
-      print_message(stderr, NSSM_MESSAGE_GRANT_LOGON_AS_SERVICE_FAILED, username);
-      return 5;
+  if (! virtual_account) {
+    if (well_known_username(canon)) password = _T("");
+    else {
+      if (grant_logon_as_service(canon)) {
+        if (canon != username) HeapFree(GetProcessHeap(), 0, canon);
+        print_message(stderr, NSSM_MESSAGE_GRANT_LOGON_AS_SERVICE_FAILED, username);
+        return 5;
+      }
     }
   }
 
@@ -1243,7 +1360,7 @@ int edit_service(nssm_service_t *service, bool editing) {
 }
 
 /* Control a service. */
-int control_service(unsigned long control, int argc, TCHAR **argv) {
+int control_service(unsigned long control, int argc, TCHAR **argv, bool return_status) {
   if (argc < 1) return usage(1);
   TCHAR *service_name = argv[0];
   TCHAR canonical_name[SERVICE_NAME_LENGTH];
@@ -1251,6 +1368,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
   SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE);
   if (! services) {
     print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
+    if (return_status) return 0;
     return 2;
   }
 
@@ -1277,6 +1395,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
   SC_HANDLE service_handle = open_service(services, service_name, access, canonical_name, _countof(canonical_name));
   if (! service_handle) {
     CloseServiceHandle(services);
+    if (return_status) return 0;
     return 3;
   }
 
@@ -1300,11 +1419,21 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
     }
 
     if (ret) {
-      int response = await_service_control_response(control, service_handle, &service_status, initial_status);
+      unsigned long cutoff = 0;
+
+      /* If we manage the service, respect the throttle time. */
+      HKEY key = open_registry(service_name, 0, KEY_READ, false);
+      if (key) {
+        if (get_number(key, NSSM_REG_THROTTLE, &cutoff, false) != 1) cutoff = NSSM_RESET_THROTTLE_RESTART;
+        RegCloseKey(key);
+      }
+
+      int response = await_service_control_response(control, service_handle, &service_status, initial_status, cutoff);
       CloseServiceHandle(service_handle);
 
       if (response) {
         print_message(stderr, NSSM_MESSAGE_BAD_CONTROL_RESPONSE, canonical_name, service_status_text(service_status.dwCurrentState), service_control_text(control));
+        if (return_status) return 0;
         return 1;
       }
       else _tprintf(_T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));
@@ -1313,6 +1442,7 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
     else {
       CloseServiceHandle(service_handle);
       _ftprintf(stderr, _T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));
+      if (return_status) return 0;
       return 1;
     }
   }
@@ -1327,10 +1457,12 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
 
     if (ret) {
       _tprintf(_T("%s\n"), service_status_text(service_status.dwCurrentState));
+      if (return_status) return service_status.dwCurrentState;
       return 0;
     }
     else {
       _ftprintf(stderr, _T("%s: %s\n"), canonical_name, error_string(error));
+      if (return_status) return 0;
       return 1;
     }
   }
@@ -1351,22 +1483,32 @@ int control_service(unsigned long control, int argc, TCHAR **argv) {
 
       if (response) {
         print_message(stderr, NSSM_MESSAGE_BAD_CONTROL_RESPONSE, canonical_name, service_status_text(service_status.dwCurrentState), service_control_text(control));
+        if (return_status) return 0;
         return 1;
       }
       else _tprintf(_T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));
+      if (return_status) return service_status.dwCurrentState;
       return 0;
     }
     else {
       CloseServiceHandle(service_handle);
       _ftprintf(stderr, _T("%s: %s: %s"), canonical_name, service_control_text(control), error_string(error));
       if (error == ERROR_SERVICE_NOT_ACTIVE) {
-        if (control == SERVICE_CONTROL_SHUTDOWN || control == SERVICE_CONTROL_STOP) return 0;
+        if (control == SERVICE_CONTROL_SHUTDOWN || control == SERVICE_CONTROL_STOP) {
+          if (return_status) return SERVICE_STOPPED;
+          return 0;
+        }
       }
+      if (return_status) return 0;
       return 1;
     }
   }
 }
 
+int control_service(unsigned long control, int argc, TCHAR **argv) {
+  return control_service(control, argc, argv, false);
+}
+
 /* Remove the service */
 int remove_service(nssm_service_t *service) {
   if (! service) return 1;
@@ -1410,6 +1552,9 @@ void WINAPI service_main(unsigned long argc, TCHAR **argv) {
   nssm_service_t *service = alloc_nssm_service();
   if (! service) return;
 
+  static volatile bool await_debugger = (argc > 1 && str_equiv(argv[1], _T("debug")));
+  while (await_debugger) Sleep(1000);
+
   if (_sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), argv[0]) < 0) {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("service->name"), _T("service_main()"), 0);
     return;
@@ -1479,7 +1624,7 @@ void WINAPI service_main(unsigned long argc, TCHAR **argv) {
   service->hook_section_initialised = true;
 
   /* Remember our initial environment. */
-  service->initial_env = GetEnvironmentStrings();
+  service->initial_env = copy_environment();
 
   /* Remember our creation time. */
   if (get_process_creation_time(GetCurrentProcess(), &service->nssm_creation_time)) ZeroMemory(&service->nssm_creation_time, sizeof(service->nssm_creation_time));
@@ -1723,15 +1868,7 @@ int start_service(nssm_service_t *service) {
   service->status.dwControlsAccepted = SERVICE_ACCEPT_POWEREVENT | SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_STOP;
   SetServiceStatus(service->status_handle, &service->status);
 
-  /* Pre-start hook. */
   unsigned long control = NSSM_SERVICE_CONTROL_START;
-  if (nssm_hook(&hook_threads, service, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, &control, NSSM_SERVICE_STATUS_DEADLINE, false) == NSSM_HOOK_STATUS_ABORT) {
-    TCHAR code[16];
-    _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%lu"), NSSM_HOOK_STATUS_ABORT);
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_PRESTART_HOOK_ABORT, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, service->name, code, 0);
-    unset_service_environment(service);
-    return stop_service(service, 5, true, true);
-  }
 
   /* Did another thread receive a stop control? */
   if (service->allow_restart) {
@@ -1744,6 +1881,15 @@ int start_service(nssm_service_t *service) {
       return stop_service(service, 4, true, true);
     }
 
+    /* Pre-start hook. May need I/O to have been redirected already. */
+    if (nssm_hook(&hook_threads, service, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, &control, NSSM_SERVICE_STATUS_DEADLINE, false) == NSSM_HOOK_STATUS_ABORT) {
+      TCHAR code[16];
+      _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%lu"), NSSM_HOOK_STATUS_ABORT);
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_PRESTART_HOOK_ABORT, NSSM_HOOK_EVENT_START, NSSM_HOOK_ACTION_PRE, service->name, code, 0);
+      unset_service_environment(service);
+      return stop_service(service, 5, true, true);
+    }
+
     /* The pre-start hook will have cleaned the environment. */
     set_service_environment(service);
 
@@ -1930,6 +2076,9 @@ void CALLBACK end_service(void *arg, unsigned char why) {
   service->exit_count++;
   (void) nssm_hook(&hook_threads, service, NSSM_HOOK_EVENT_EXIT, NSSM_HOOK_ACTION_POST, NULL, NSSM_HOOK_DEADLINE, true);
 
+  /* Exit logging threads. */
+  cleanup_loggers(service);
+
   /*
     The why argument is true if our wait timed out or false otherwise.
     Our wait is infinite so why will never be true when called by the system.
@@ -1980,9 +2129,7 @@ void CALLBACK end_service(void *arg, unsigned char why) {
       log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_UNCLEAN, service->name, code, exit_action_strings[action], 0);
       stop_service(service, exitcode, false, default_action);
       wait_for_hooks(service, false);
-      free_imports();
-      exit(exitcode);
-    break;
+      nssm_exit(exitcode);
   }
 }
 
@@ -2115,3 +2262,138 @@ awaited:
 
   return ret;
 }
+
+int list_nssm_services(int argc, TCHAR **argv) {
+  bool including_native = (argc > 0 && str_equiv(argv[0], _T("all")));
+
+  /* Open service manager. */
+  SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT | SC_MANAGER_ENUMERATE_SERVICE);
+  if (! services) {
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
+    return 1;
+  }
+
+  unsigned long bufsize, required, count, i;
+  unsigned long resume = 0;
+  EnumServicesStatus(services, SERVICE_WIN32, SERVICE_STATE_ALL, 0, 0, &required, &count, &resume);
+  unsigned long error = GetLastError();
+  if (error != ERROR_MORE_DATA) {
+    print_message(stderr, NSSM_MESSAGE_ENUMSERVICESSTATUS_FAILED, error_string(GetLastError()));
+    return 2;
+  }
+
+  ENUM_SERVICE_STATUS *status = (ENUM_SERVICE_STATUS *) HeapAlloc(GetProcessHeap(), 0, required);
+  if (! status) {
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("ENUM_SERVICE_STATUS"), _T("list_nssm_services()"));
+    return 3;
+  }
+
+  bufsize = required;
+  while (true) {
+    int ret = EnumServicesStatus(services, SERVICE_WIN32, SERVICE_STATE_ALL, status, bufsize, &required, &count, &resume);
+    if (! ret) {
+      error = GetLastError();
+      if (error != ERROR_MORE_DATA) {
+        HeapFree(GetProcessHeap(), 0, status);
+        print_message(stderr, NSSM_MESSAGE_ENUMSERVICESSTATUS_FAILED, error_string(GetLastError()));
+        return 4;
+      }
+    }
+
+    for (i = 0; i < count; i++) {
+      /* Try to get the service parameters. */
+      nssm_service_t *service = alloc_nssm_service();
+      if (! service) {
+        HeapFree(GetProcessHeap(), 0, status);
+        print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("nssm_service_t"), _T("list_nssm_services()"));
+        return 5;
+      }
+      _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), status[i].lpServiceName);
+
+      get_parameters(service, 0);
+      /* We manage the service if we have an Application. */
+      if (including_native || service->exe[0]) _tprintf(_T("%s\n"), service->name);
+
+      cleanup_nssm_service(service);
+    }
+
+    if (ret) break;
+  }
+
+  HeapFree(GetProcessHeap(), 0, status);
+  return 0;
+}
+
+int service_process_tree(int argc, TCHAR **argv) {
+  int errors = 0;
+  if (argc < 1) return usage(1);
+
+  SC_HANDLE services = open_service_manager(SC_MANAGER_CONNECT);
+  if (! services) {
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
+    return 1;
+  }
+
+  /*
+    We need SeDebugPrivilege to read the process tree.
+    We ignore failure here so that an error will be printed later when we
+    try to open a process handle.
+  */
+  HANDLE token = get_debug_token();
+
+  TCHAR canonical_name[SERVICE_NAME_LENGTH];
+  SERVICE_STATUS_PROCESS service_status;
+  nssm_service_t *service;
+  kill_t k;
+
+  int i;
+  for (i = 0; i < argc; i++) {
+    TCHAR *service_name = argv[i];
+    SC_HANDLE service_handle = open_service(services, service_name, SERVICE_QUERY_STATUS, canonical_name, _countof(canonical_name));
+    if (! service_handle) {
+      errors++;
+      continue;
+    }
+
+    unsigned long size;
+    int ret = QueryServiceStatusEx(service_handle, SC_STATUS_PROCESS_INFO, (LPBYTE) &service_status, sizeof(service_status), &size);
+    long error = GetLastError();
+    CloseServiceHandle(service_handle);
+    if (! ret) {
+      _ftprintf(stderr, _T("%s: %s\n"), canonical_name, error_string(error));
+      errors++;
+      continue;
+    }
+
+    ZeroMemory(&k, sizeof(k));
+    k.pid = service_status.dwProcessId;
+    if (! k.pid) continue;
+
+    k.process_handle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, false, k.pid);
+    if (! k.process_handle) {
+      _ftprintf(stderr, _T("%s: %lu: %s\n"), canonical_name, k.pid, error_string(GetLastError()));
+      continue;
+    }
+
+    if (get_process_creation_time(k.process_handle, &k.creation_time)) continue;
+    /* Dummy exit time so we can check processes' parents. */
+    GetSystemTimeAsFileTime(&k.exit_time);
+
+    service = alloc_nssm_service();
+    if (! service) {
+      errors++;
+      continue;
+    }
+
+    _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), canonical_name);
+    k.name = service->name;
+    walk_process_tree(service, print_process, &k, k.pid);
+
+    cleanup_nssm_service(service);
+  }
+
+  CloseServiceHandle(services);
+  if (token != INVALID_HANDLE_VALUE) CloseHandle(token);
+
+  return errors;
+}