X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=2f1ceb02d91b775a6f4f6e355159eff3c0b570f2;hb=1c7716c9a9bf3e8dd844fd27d1351dab6ceaf510;hp=596aa7e4fcabfd902074ab0bd344675e323516d8;hpb=ee52ab253b65c52ff039d8058c66b1a63a656b01;p=nssm.git

diff --git a/service.cpp b/service.cpp
index 596aa7e..2f1ceb0 100644
--- a/service.cpp
+++ b/service.cpp
@@ -1,39 +1,31 @@
 #include "nssm.h"
 
+/* This is explicitly a wide string. */
+#define NSSM_LOGON_AS_SERVICE_RIGHT L"SeServiceLogonRight"
+
+extern const TCHAR *exit_action_strings[];
+
 bool is_admin;
-SERVICE_STATUS service_status;
-SERVICE_STATUS_HANDLE service_handle;
-HANDLE process_handle;
-HANDLE wait_handle;
-unsigned long pid;
-static char service_name[SERVICE_NAME_LENGTH];
-char exe[EXE_LENGTH];
-char flags[CMD_LENGTH];
-char dir[MAX_PATH];
-bool stopping;
-bool allow_restart;
-unsigned long throttle_delay;
-unsigned long stop_method;
-CRITICAL_SECTION throttle_section;
-CONDITION_VARIABLE throttle_condition;
-HANDLE throttle_timer;
-LARGE_INTEGER throttle_duetime;
 bool use_critical_section;
-FILETIME creation_time;
 
 extern imports_t imports;
 
-static enum { NSSM_EXIT_RESTART, NSSM_EXIT_IGNORE, NSSM_EXIT_REALLY, NSSM_EXIT_UNCLEAN } exit_actions;
-static const char *exit_action_strings[] = { "Restart", "Ignore", "Exit", "Suicide", 0 };
+const TCHAR *exit_action_strings[] = { _T("Restart"), _T("Ignore"), _T("Exit"), _T("Suicide"), 0 };
 
-static unsigned long throttle;
-
-static inline int throttle_milliseconds() {
+static inline int throttle_milliseconds(unsigned long throttle) {
   /* pow() operates on doubles. */
   int ret = 1; for (unsigned long i = 1; i < throttle; i++) ret *= 2;
   return ret * 1000;
 }
 
+/*
+  Wrapper to be called in a new thread so that we can acknowledge a STOP
+  control immediately.
+*/
+static unsigned long WINAPI shutdown_service(void *arg) {
+  return stop_service((nssm_service_t *) arg, 0, true, true);
+}
+
 /* Connect to the service manager */
 SC_HANDLE open_service_manager() {
   SC_HANDLE ret = OpenSCManager(0, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ALL_ACCESS);
@@ -45,112 +37,552 @@ SC_HANDLE open_service_manager() {
   return ret;
 }
 
+static int grant_logon_as_service(const TCHAR *username) {
+  if (str_equiv(username, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;
+
+  /* Open Policy object. */
+  LSA_OBJECT_ATTRIBUTES attributes;
+  ZeroMemory(&attributes, sizeof(attributes));
+
+  LSA_HANDLE policy;
+
+  NTSTATUS status = LsaOpenPolicy(0, &attributes, POLICY_ALL_ACCESS, &policy);
+  if (status) {
+    print_message(stderr, NSSM_MESSAGE_LSAOPENPOLICY_FAILED, error_string(LsaNtStatusToWinError(status)));
+    return 1;
+  }
+
+  /* Look up SID for the account. */
+  LSA_UNICODE_STRING lsa_username;
+#ifdef UNICODE
+  lsa_username.Buffer = (wchar_t *) username;
+  lsa_username.Length = (unsigned short) _tcslen(username) * sizeof(TCHAR);
+  lsa_username.MaximumLength = lsa_username.Length + sizeof(TCHAR);
+#else
+  size_t buflen;
+  mbstowcs_s(&buflen, NULL, 0, username, _TRUNCATE);
+  lsa_username.MaximumLength = buflen * sizeof(wchar_t);
+  lsa_username.Length = lsa_username.MaximumLength - sizeof(wchar_t);
+  lsa_username.Buffer = (wchar_t *) HeapAlloc(GetProcessHeap(), 0, lsa_username.MaximumLength);
+  if (lsa_username.Buffer) mbstowcs_s(&buflen, lsa_username.Buffer, lsa_username.MaximumLength, username, _TRUNCATE);
+  else {
+    LsaClose(policy);
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("LSA_UNICODE_STRING"), _T("grant_logon_as_service()"));
+    return 2;
+  }
+#endif
+
+  LSA_REFERENCED_DOMAIN_LIST *translated_domains;
+  LSA_TRANSLATED_SID *translated_sid;
+  status = LsaLookupNames(policy, 1, &lsa_username, &translated_domains, &translated_sid);
+#ifndef UNICODE
+  HeapFree(GetProcessHeap(), 0, lsa_username.Buffer);
+#endif
+  if (status) {
+    LsaFreeMemory(translated_domains);
+    LsaFreeMemory(translated_sid);
+    LsaClose(policy);
+    print_message(stderr, NSSM_MESSAGE_LSALOOKUPNAMES_FAILED, username, error_string(LsaNtStatusToWinError(status)));
+    return 3;
+  }
+
+  if (translated_sid->Use != SidTypeUser) {
+    LsaFreeMemory(translated_domains);
+    LsaFreeMemory(translated_sid);
+    LsaClose(policy);
+    print_message(stderr, NSSM_GUI_INVALID_USERNAME, username);
+    return 4;
+  }
+
+  LSA_TRUST_INFORMATION *trust = &translated_domains->Domains[translated_sid->DomainIndex];
+  if (! trust || ! IsValidSid(trust->Sid)) {
+    LsaFreeMemory(translated_domains);
+    LsaFreeMemory(translated_sid);
+    LsaClose(policy);
+    print_message(stderr, NSSM_GUI_INVALID_USERNAME, username);
+    return 4;
+  }
+
+  /* GetSidSubAuthority*() return pointers! */
+  unsigned char *n = GetSidSubAuthorityCount(trust->Sid);
+
+  /* Convert translated SID to SID. */
+  SID *sid = (SID *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, GetSidLengthRequired(*n + 1));
+  if (! sid) {
+    LsaFreeMemory(translated_domains);
+    LsaFreeMemory(translated_sid);
+    LsaClose(policy);
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SID"), _T("grant_logon_as_service"));
+    return 4;
+  }
+
+  unsigned long error;
+  if (! InitializeSid(sid, GetSidIdentifierAuthority(trust->Sid), *n + 1)) {
+    error = GetLastError();
+    HeapFree(GetProcessHeap(), 0, sid);
+    LsaFreeMemory(translated_domains);
+    LsaFreeMemory(translated_sid);
+    LsaClose(policy);
+    print_message(stderr, NSSM_MESSAGE_INITIALIZESID_FAILED, username, error_string(error));
+    return 5;
+  }
+
+  for (unsigned char i = 0; i <= *n; i++) {
+    unsigned long *sub = GetSidSubAuthority(sid, i);
+    if (i < *n) *sub = *GetSidSubAuthority(trust->Sid, i);
+    else *sub = translated_sid->RelativeId;
+  }
+
+  LsaFreeMemory(translated_domains);
+  LsaFreeMemory(translated_sid);
+
+  /* Check if the SID has the "Log on as a service" right. */
+  LSA_UNICODE_STRING lsa_right;
+  lsa_right.Buffer = NSSM_LOGON_AS_SERVICE_RIGHT;
+  lsa_right.Length = (unsigned short) wcslen(lsa_right.Buffer) * sizeof(wchar_t);
+  lsa_right.MaximumLength = lsa_right.Length + sizeof(wchar_t);
+
+  LSA_UNICODE_STRING *rights;
+  unsigned long count = ~0;
+  status = LsaEnumerateAccountRights(policy, sid, &rights, &count);
+  if (status) {
+    /*
+      If the account has no rights set LsaEnumerateAccountRights() will return
+      STATUS_OBJECT_NAME_NOT_FOUND and set count to 0.
+    */
+    error = LsaNtStatusToWinError(status);
+    if (error != ERROR_FILE_NOT_FOUND) {
+      HeapFree(GetProcessHeap(), 0, sid);
+      LsaClose(policy);
+      print_message(stderr, NSSM_MESSAGE_LSAENUMERATEACCOUNTRIGHTS_FAILED, username, error_string(error));
+      return 4;
+    }
+  }
+
+  for (unsigned long i = 0; i < count; i++) {
+    if (rights[i].Length != lsa_right.Length) continue;
+    if (_wcsnicmp(rights[i].Buffer, lsa_right.Buffer, lsa_right.MaximumLength)) continue;
+    /* The SID has the right. */
+    HeapFree(GetProcessHeap(), 0, sid);
+    LsaFreeMemory(rights);
+    LsaClose(policy);
+    return 0;
+  }
+  LsaFreeMemory(rights);
+
+  /* Add the right. */
+  status = LsaAddAccountRights(policy, sid, &lsa_right, 1);
+  HeapFree(GetProcessHeap(), 0, sid);
+  LsaClose(policy);
+  if (status) {
+    print_message(stderr, NSSM_MESSAGE_LSAADDACCOUNTRIGHTS_FAILED, error_string(LsaNtStatusToWinError(status)));
+    return 5;
+  }
+
+  print_message(stdout, NSSM_MESSAGE_GRANTED_LOGON_AS_SERVICE, username);
+  return 0;
+}
+
+/* Set default values which aren't zero. */
+void set_nssm_service_defaults(nssm_service_t *service) {
+  if (! service) return;
+
+  service->type = SERVICE_WIN32_OWN_PROCESS;
+  service->stdin_sharing = NSSM_STDIN_SHARING;
+  service->stdin_disposition = NSSM_STDIN_DISPOSITION;
+  service->stdin_flags = NSSM_STDIN_FLAGS;
+  service->stdout_sharing = NSSM_STDOUT_SHARING;
+  service->stdout_disposition = NSSM_STDOUT_DISPOSITION;
+  service->stdout_flags = NSSM_STDOUT_FLAGS;
+  service->stderr_sharing = NSSM_STDERR_SHARING;
+  service->stderr_disposition = NSSM_STDERR_DISPOSITION;
+  service->stderr_flags = NSSM_STDERR_FLAGS;
+  service->throttle_delay = NSSM_RESET_THROTTLE_RESTART;
+  service->stop_method = ~0;
+  service->kill_console_delay = NSSM_KILL_CONSOLE_GRACE_PERIOD;
+  service->kill_window_delay = NSSM_KILL_WINDOW_GRACE_PERIOD;
+  service->kill_threads_delay = NSSM_KILL_THREADS_GRACE_PERIOD;
+}
+
+/* Allocate and zero memory for a service. */
+nssm_service_t *alloc_nssm_service() {
+  nssm_service_t *service = (nssm_service_t *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(nssm_service_t));
+  if (! service) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("service"), _T("alloc_nssm_service()"), 0);
+  return service;
+}
+
+/* Free memory for a service. */
+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);
+    HeapFree(GetProcessHeap(), 0, service->password);
+  }
+  if (service->env) HeapFree(GetProcessHeap(), 0, service->env);
+  if (service->env_extra) HeapFree(GetProcessHeap(), 0, service->env_extra);
+  if (service->handle) CloseServiceHandle(service->handle);
+  if (service->process_handle) CloseHandle(service->process_handle);
+  if (service->wait_handle) UnregisterWait(service->process_handle);
+  if (service->throttle_section_initialised) DeleteCriticalSection(&service->throttle_section);
+  if (service->throttle_timer) CloseHandle(service->throttle_timer);
+  HeapFree(GetProcessHeap(), 0, service);
+}
+
 /* About to install the service */
-int pre_install_service(int argc, char **argv) {
+int pre_install_service(int argc, TCHAR **argv) {
+  nssm_service_t *service = alloc_nssm_service();
+  set_nssm_service_defaults(service);
+  if (argc) _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), argv[0]);
+
   /* Show the dialogue box if we didn't give the service name and path */
-  if (argc < 2) return nssm_gui(IDD_INSTALL, argv[0]);
+  if (argc < 2) return nssm_gui(IDD_INSTALL, service);
+
+  if (! service) {
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("service"), _T("pre_install_service()"));
+    return 1;
+  }
+  _sntprintf_s(service->exe, _countof(service->exe), _TRUNCATE, _T("%s"), argv[1]);
 
   /* Arguments are optional */
-  char *flags;
   size_t flagslen = 0;
   size_t s = 0;
   int i;
-  for (i = 2; i < argc; i++) flagslen += strlen(argv[i]) + 1;
+  for (i = 2; i < argc; i++) flagslen += _tcslen(argv[i]) + 1;
   if (! flagslen) flagslen = 1;
-
-  flags = (char *) HeapAlloc(GetProcessHeap(), 0, flagslen);
-  if (! flags) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "flags", "pre_install_service()", 0);
+  if (flagslen > _countof(service->flags)) {
+    print_message(stderr, NSSM_MESSAGE_FLAGS_TOO_LONG);
     return 2;
   }
-  ZeroMemory(flags, flagslen);
 
-  /*
-    This probably isn't UTF8-safe and should use std::string or something
-    but it's been broken for the best part of a decade and due for a rewrite
-    anyway so it'll do as a quick-'n'-dirty fix.  Note that we don't free
-    the flags buffer but as the program exits that isn't a big problem.
-  */
   for (i = 2; i < argc; i++) {
-    size_t len = strlen(argv[i]);
-    memmove(flags + s, argv[i], len);
+    size_t len = _tcslen(argv[i]);
+    memmove(service->flags + s, argv[i], len * sizeof(TCHAR));
     s += len;
-    if (i < argc - 1) flags[s++] = ' ';
+    if (i < argc - 1) service->flags[s++] = _T(' ');
   }
 
-  return install_service(argv[0], argv[1], flags);
+  /* Work out directory name */
+  _sntprintf_s(service->dir, _countof(service->dir), _TRUNCATE, _T("%s"), service->exe);
+  strip_basename(service->dir);
+
+  int ret = install_service(service);
+  cleanup_nssm_service(service);
+  return ret;
+}
+
+/* About to edit the service. */
+int pre_edit_service(int argc, TCHAR **argv) {
+  /* Require service name. */
+  if (argc < 1) return usage(1);
+
+  nssm_service_t *service = alloc_nssm_service();
+  _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), argv[0]);
+
+  /* Open service manager */
+  SC_HANDLE services = open_service_manager();
+  if (! services) {
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
+    return 2;
+  }
+
+  /* Try to open the service */
+  service->handle = OpenService(services, service->name, SC_MANAGER_ALL_ACCESS);
+  if (! service->handle) {
+    CloseServiceHandle(services);
+    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED);
+    return 3;
+  }
+
+  /* Get system details. */
+  unsigned long bufsize;
+  unsigned long error;
+  QUERY_SERVICE_CONFIG *qsc;
+
+  QueryServiceConfig(service->handle, 0, 0, &bufsize);
+  error = GetLastError();
+  if (error == ERROR_INSUFFICIENT_BUFFER) {
+    qsc = (QUERY_SERVICE_CONFIG *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufsize);
+    if (! qsc) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("QUERY_SERVICE_CONFIG"), _T("pre_edit_service()"), 0);
+      return 4;
+    }
+  }
+  else {
+    CloseHandle(service->handle);
+    CloseServiceHandle(services);
+    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG_FAILED, service->name, error_string(error), 0);
+    return 4;
+  }
+
+  if (! QueryServiceConfig(service->handle, qsc, bufsize, &bufsize)) {
+    HeapFree(GetProcessHeap(), 0, qsc);
+    CloseHandle(service->handle);
+    CloseServiceHandle(services);
+    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG_FAILED, service->name, error_string(GetLastError()), 0);
+    return 4;
+  }
+
+  service->type = qsc->dwServiceType;
+  if (! (service->type & SERVICE_WIN32_OWN_PROCESS)) {
+    HeapFree(GetProcessHeap(), 0, qsc);
+    CloseHandle(service->handle);
+    CloseServiceHandle(services);
+    print_message(stderr, NSSM_MESSAGE_CANNOT_EDIT, service->name, _T("SERVICE_WIN32_OWN_PROCESS"), 0);
+    return 3;
+  }
+
+  switch (qsc->dwStartType) {
+    case SERVICE_DEMAND_START: service->startup = NSSM_STARTUP_MANUAL; break;
+    case SERVICE_DISABLED: service->startup = NSSM_STARTUP_DISABLED; break;
+    default: service->startup = NSSM_STARTUP_AUTOMATIC;
+  }
+  if (! str_equiv(qsc->lpServiceStartName, NSSM_LOCALSYSTEM_ACCOUNT)) {
+    size_t len = _tcslen(qsc->lpServiceStartName);
+    service->username = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(TCHAR));
+    if (service->username) {
+      memmove(service->username, qsc->lpServiceStartName, (len + 1) * sizeof(TCHAR));
+      service->usernamelen = (unsigned long) len;
+    }
+    else {
+      HeapFree(GetProcessHeap(), 0, qsc);
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("username"), _T("pre_edit_service()"));
+      return 4;
+    }
+  }
+  _sntprintf_s(service->displayname, _countof(service->displayname), _TRUNCATE, _T("%s"), qsc->lpDisplayName);
+
+  /* Get the canonical service name. We open it case insensitively. */
+  bufsize = _countof(service->name);
+  GetServiceKeyName(services, service->displayname, service->name, &bufsize);
+
+  /* Remember the executable in case it isn't NSSM. */
+  _sntprintf_s(service->image, _countof(service->image), _TRUNCATE, _T("%s"), qsc->lpBinaryPathName);
+  HeapFree(GetProcessHeap(), 0, qsc);
+
+  /* Get extended system details. */
+  if (service->startup == NSSM_STARTUP_AUTOMATIC) {
+    QueryServiceConfig2(service->handle, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, 0, 0, &bufsize);
+    error = GetLastError();
+    if (error == ERROR_INSUFFICIENT_BUFFER) {
+      SERVICE_DELAYED_AUTO_START_INFO *info = (SERVICE_DELAYED_AUTO_START_INFO *) HeapAlloc(GetProcessHeap(), 0, bufsize);
+      if (! info) {
+        CloseHandle(service->handle);
+        CloseServiceHandle(services);
+        print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SERVICE_DELAYED_AUTO_START_INFO"), _T("pre_edit_service()"));
+        return 5;
+      }
+
+      if (QueryServiceConfig2(service->handle, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, (unsigned char *) info, bufsize, &bufsize)) {
+        if (info->fDelayedAutostart) service->startup = NSSM_STARTUP_DELAYED;
+      }
+      else {
+        error = GetLastError();
+        if (error != ERROR_INVALID_LEVEL) {
+          CloseHandle(service->handle);
+          CloseServiceHandle(services);
+          print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_CONFIG_DELAYED_AUTO_START_INFO"), error_string(error));
+          return 5;
+        }
+      }
+    }
+    else if (error != ERROR_INVALID_LEVEL) {
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_DELAYED_AUTO_START_INFO"), error_string(error));
+      return 5;
+    }
+  }
+
+  QueryServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, 0, 0, &bufsize);
+  error = GetLastError();
+  if (error == ERROR_INSUFFICIENT_BUFFER) {
+    SERVICE_DESCRIPTION *description = (SERVICE_DESCRIPTION *) HeapAlloc(GetProcessHeap(), 0, bufsize);
+    if (! description) {
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("SERVICE_CONFIG_DESCRIPTION"), _T("pre_edit_service()"));
+      return 6;
+    }
+
+    if (QueryServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, (unsigned char *) description, bufsize, &bufsize)) {
+     if (description->lpDescription) _sntprintf_s(service->description, _countof(service->description), _TRUNCATE, _T("%s"), description->lpDescription);
+      HeapFree(GetProcessHeap(), 0, description);
+    }
+    else {
+      HeapFree(GetProcessHeap(), 0, description);
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_CONFIG_DELAYED_AUTO_START_INFO"), error_string(error));
+      return 6;
+    }
+  }
+  else {
+    CloseHandle(service->handle);
+    CloseServiceHandle(services);
+    print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service->name, _T("SERVICE_CONFIG_DELAYED_AUTO_START_INFO"), error_string(error));
+    return 6;
+  }
+
+  /* Get NSSM details. */
+  get_parameters(service, 0);
+
+  CloseServiceHandle(services);
+
+  if (! service->exe[0]) {
+    print_message(stderr, NSSM_MESSAGE_INVALID_SERVICE, service->name, NSSM, service->image);
+    service->native = true;
+  }
+
+  nssm_gui(IDD_EDIT, service);
+
+  return 0;
 }
 
 /* About to remove the service */
-int pre_remove_service(int argc, char **argv) {
+int pre_remove_service(int argc, TCHAR **argv) {
+  nssm_service_t *service = alloc_nssm_service();
+  set_nssm_service_defaults(service);
+  if (argc) _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), argv[0]);
+
   /* Show dialogue box if we didn't pass service name and "confirm" */
-  if (argc < 2) return nssm_gui(IDD_REMOVE, argv[0]);
-  if (str_equiv(argv[1], "confirm")) return remove_service(argv[0]);
+  if (argc < 2) return nssm_gui(IDD_REMOVE, service);
+  if (str_equiv(argv[1], _T("confirm"))) {
+    int ret = remove_service(service);
+    cleanup_nssm_service(service);
+    return ret;
+  }
   print_message(stderr, NSSM_MESSAGE_PRE_REMOVE_SERVICE);
   return 100;
 }
 
 /* Install the service */
-int install_service(char *name, char *exe, char *flags) {
+int install_service(nssm_service_t *service) {
+  if (! service) return 1;
+
   /* Open service manager */
   SC_HANDLE services = open_service_manager();
   if (! services) {
     print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
+    cleanup_nssm_service(service);
     return 2;
   }
 
   /* Get path of this program */
-  char path[MAX_PATH];
-  GetModuleFileName(0, path, MAX_PATH);
-
-  /* Construct command */
-  char command[CMD_LENGTH];
-  size_t pathlen = strlen(path);
-  if (pathlen + 1 >= VALUE_LENGTH) {
-    print_message(stderr, NSSM_MESSAGE_PATH_TOO_LONG, NSSM);
-    return 3;
-  }
-  if (_snprintf_s(command, sizeof(command), _TRUNCATE, "\"%s\"", path) < 0) {
-    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY_FOR_IMAGEPATH);
-    return 4;
-  }
+  GetModuleFileName(0, service->image, _countof(service->image));
 
-  /* Work out directory name */
-  size_t len = strlen(exe);
-  size_t i;
-  for (i = len; i && exe[i] != '\\' && exe[i] != '/'; i--);
-  char dir[MAX_PATH];
-  memmove(dir, exe, i);
-  dir[i] = '\0';
-
-  /* Create the service */
-  SC_HANDLE service = CreateService(services, name, name, SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, command, 0, 0, 0, 0, 0);
-  if (! service) {
+  /* Create the service - settings will be changed in edit_service() */
+  service->handle = CreateService(services, service->name, service->name, SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, service->image, 0, 0, 0, 0, 0);
+  if (! service->handle) {
     print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED);
     CloseServiceHandle(services);
     return 5;
   }
 
-  /* Now we need to put the parameters into the registry */
-  if (create_parameters(name, exe, flags, dir)) {
-    print_message(stderr, NSSM_MESSAGE_CREATE_PARAMETERS_FAILED);
-    DeleteService(service);
+  if (edit_service(service, false)) {
+    DeleteService(service->handle);
     CloseServiceHandle(services);
     return 6;
   }
 
-  set_service_recovery(service, name);
+  print_message(stdout, NSSM_MESSAGE_SERVICE_INSTALLED, service->name);
 
   /* Cleanup */
-  CloseServiceHandle(service);
   CloseServiceHandle(services);
 
-  print_message(stdout, NSSM_MESSAGE_SERVICE_INSTALLED, name);
+  return 0;
+}
+
+/* Edit the service. */
+int edit_service(nssm_service_t *service, bool editing) {
+  if (! service) return 1;
+
+  /*
+    The only two valid flags for service type are SERVICE_WIN32_OWN_PROCESS
+    and SERVICE_INTERACTIVE_PROCESS.
+  */
+  service->type &= SERVICE_INTERACTIVE_PROCESS;
+  service->type |= SERVICE_WIN32_OWN_PROCESS;
+
+  /* Startup type. */
+  unsigned long startup;
+  switch (service->startup) {
+    case NSSM_STARTUP_MANUAL: startup = SERVICE_DEMAND_START; break;
+    case NSSM_STARTUP_DISABLED: startup = SERVICE_DISABLED; break;
+    default: startup = SERVICE_AUTO_START;
+  }
+
+  /* Display name. */
+  if (! service->displayname[0]) _sntprintf_s(service->displayname, _countof(service->displayname), _TRUNCATE, _T("%s"), service->name);
+
+  /*
+    Username must be NULL if we aren't changing or an account name.
+    We must explicitly user LOCALSYSTEM to change it when we are editing.
+    Password must be NULL if we aren't changing, a password or "".
+    Empty passwords are valid but we won't allow them in the GUI.
+  */
+  TCHAR *username = 0;
+  TCHAR *password = 0;
+  if (service->usernamelen) {
+    username = service->username;
+    if (service->passwordlen) password = service->password;
+    else password = _T("");
+  }
+  else if (editing) username = NSSM_LOCALSYSTEM_ACCOUNT;
+
+  if (grant_logon_as_service(username)) {
+    print_message(stderr, NSSM_MESSAGE_GRANT_LOGON_AS_SERVICE_FAILED, username);
+    return 5;
+  }
+
+  if (! ChangeServiceConfig(service->handle, service->type, startup, SERVICE_NO_CHANGE, 0, 0, 0, 0, username, password, service->displayname)) {
+    print_message(stderr, NSSM_MESSAGE_CHANGESERVICECONFIG_FAILED, error_string(GetLastError()));
+    return 5;
+  }
+
+  if (service->description[0] || editing) {
+    SERVICE_DESCRIPTION description;
+    ZeroMemory(&description, sizeof(description));
+    if (service->description[0]) description.lpDescription = service->description;
+    else description.lpDescription = 0;
+    if (! ChangeServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, &description)) {
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_DESCRIPTION_FAILED, service->name, error_string(GetLastError()), 0);
+    }
+  }
+
+  SERVICE_DELAYED_AUTO_START_INFO delayed;
+  ZeroMemory(&delayed, sizeof(delayed));
+  if (service->startup == NSSM_STARTUP_DELAYED) delayed.fDelayedAutostart = 1;
+  else delayed.fDelayedAutostart = 0;
+  /* Delayed startup isn't supported until Vista. */
+  if (! ChangeServiceConfig2(service->handle, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, &delayed)) {
+    unsigned long error = GetLastError();
+    /* Pre-Vista we expect to fail with ERROR_INVALID_LEVEL */
+    if (error != ERROR_INVALID_LEVEL) {
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_DELAYED_AUTO_START_INFO_FAILED, service->name, error_string(error), 0);
+    }
+  }
+
+  /* Don't mess with parameters which aren't ours. */
+  if (! service->native) {
+    /* Now we need to put the parameters into the registry */
+    if (create_parameters(service, editing)) {
+      print_message(stderr, NSSM_MESSAGE_CREATE_PARAMETERS_FAILED);
+      return 6;
+    }
+
+    set_service_recovery(service);
+  }
+
   return 0;
 }
 
 /* Remove the service */
-int remove_service(char *name) {
+int remove_service(nssm_service_t *service) {
+  if (! service) return 1;
+
   /* Open service manager */
   SC_HANDLE services = open_service_manager();
   if (! services) {
@@ -159,33 +591,40 @@ int remove_service(char *name) {
   }
 
   /* Try to open the service */
-  SC_HANDLE service = OpenService(services, name, SC_MANAGER_ALL_ACCESS);
-  if (! service) {
+  service->handle = OpenService(services, service->name, SC_MANAGER_ALL_ACCESS);
+  if (! service->handle) {
     print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED);
     CloseServiceHandle(services);
     return 3;
   }
 
+  /* Get the canonical service name. We open it case insensitively. */
+  unsigned long bufsize = _countof(service->displayname);
+  GetServiceDisplayName(services, service->name, service->displayname, &bufsize);
+  bufsize = _countof(service->name);
+  GetServiceKeyName(services, service->displayname, service->name, &bufsize);
+
   /* Try to delete the service */
-  if (! DeleteService(service)) {
+  if (! DeleteService(service->handle)) {
     print_message(stderr, NSSM_MESSAGE_DELETESERVICE_FAILED);
-    CloseServiceHandle(service);
     CloseServiceHandle(services);
     return 4;
   }
 
   /* Cleanup */
-  CloseServiceHandle(service);
   CloseServiceHandle(services);
 
-  print_message(stdout, NSSM_MESSAGE_SERVICE_REMOVED, name);
+  print_message(stdout, NSSM_MESSAGE_SERVICE_REMOVED, service->name);
   return 0;
 }
 
 /* Service initialisation */
-void WINAPI service_main(unsigned long argc, char **argv) {
-  if (_snprintf_s(service_name, sizeof(service_name), _TRUNCATE, "%s", argv[0]) < 0) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "service_name", "service_main()", 0);
+void WINAPI service_main(unsigned long argc, TCHAR **argv) {
+  nssm_service_t *service = alloc_nssm_service();
+  if (! service) return;
+
+  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;
   }
 
@@ -194,126 +633,119 @@ void WINAPI service_main(unsigned long argc, char **argv) {
   else use_critical_section = false;
 
   /* Initialise status */
-  ZeroMemory(&service_status, sizeof(service_status));
-  service_status.dwServiceType = SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS;
-  service_status.dwControlsAccepted = SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_PAUSE_CONTINUE;
-  service_status.dwWin32ExitCode = NO_ERROR;
-  service_status.dwServiceSpecificExitCode = 0;
-  service_status.dwCheckPoint = 0;
-  service_status.dwWaitHint = NSSM_WAITHINT_MARGIN;
+  ZeroMemory(&service->status, sizeof(service->status));
+  service->status.dwServiceType = SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS;
+  service->status.dwControlsAccepted = SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_PAUSE_CONTINUE;
+  service->status.dwWin32ExitCode = NO_ERROR;
+  service->status.dwServiceSpecificExitCode = 0;
+  service->status.dwCheckPoint = 0;
+  service->status.dwWaitHint = NSSM_WAITHINT_MARGIN;
 
   /* Signal we AREN'T running the server */
-  process_handle = 0;
-  pid = 0;
+  service->process_handle = 0;
+  service->pid = 0;
 
   /* Register control handler */
-  service_handle = RegisterServiceCtrlHandlerEx(NSSM, service_control_handler, 0);
-  if (! service_handle) {
+  service->status_handle = RegisterServiceCtrlHandlerEx(NSSM, service_control_handler, (void *) service);
+  if (! service->status_handle) {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_REGISTERSERVICECTRLHANDER_FAILED, error_string(GetLastError()), 0);
     return;
   }
 
-  log_service_control(service_name, 0, true);
+  log_service_control(service->name, 0, true);
 
-  service_status.dwCurrentState = SERVICE_START_PENDING;
-  service_status.dwWaitHint = throttle_delay + NSSM_WAITHINT_MARGIN;
-  SetServiceStatus(service_handle, &service_status);
+  service->status.dwCurrentState = SERVICE_START_PENDING;
+  service->status.dwWaitHint = service->throttle_delay + NSSM_WAITHINT_MARGIN;
+  SetServiceStatus(service->status_handle, &service->status);
 
   if (is_admin) {
     /* Try to create the exit action parameters; we don't care if it fails */
-    create_exit_action(argv[0], exit_action_strings[0]);
+    create_exit_action(service->name, exit_action_strings[0], false);
 
-    set_service_recovery(0, service_name);
+    SC_HANDLE services = open_service_manager();
+    if (services) {
+      service->handle = OpenService(services, service->name, SC_MANAGER_ALL_ACCESS);
+      set_service_recovery(service);
+      CloseServiceHandle(services);
+    }
   }
 
   /* Used for signalling a resume if the service pauses when throttled. */
-  if (use_critical_section) InitializeCriticalSection(&throttle_section);
+  if (use_critical_section) {
+    InitializeCriticalSection(&service->throttle_section);
+    service->throttle_section_initialised = true;
+  }
   else {
-    throttle_timer = CreateWaitableTimer(0, 1, 0);
-    if (! throttle_timer) {
-      log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_CREATEWAITABLETIMER_FAILED, service_name, error_string(GetLastError()), 0);
+    service->throttle_timer = CreateWaitableTimer(0, 1, 0);
+    if (! service->throttle_timer) {
+      log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_CREATEWAITABLETIMER_FAILED, service->name, error_string(GetLastError()), 0);
     }
   }
 
-  monitor_service();
+  monitor_service(service);
 }
 
 /* Make sure service recovery actions are taken where necessary */
-void set_service_recovery(SC_HANDLE service, char *service_name) {
-  SC_HANDLE services = 0;
-
-  if (! service) {
-    services = open_service_manager();
-    if (! services) return;
-
-    service = OpenService(services, service_name, SC_MANAGER_ALL_ACCESS);
-    if (! service) return;
-  }
-
+void set_service_recovery(nssm_service_t *service) {
   SERVICE_FAILURE_ACTIONS_FLAG flag;
   ZeroMemory(&flag, sizeof(flag));
   flag.fFailureActionsOnNonCrashFailures = true;
 
   /* This functionality was added in Vista so the call may fail */
-  if (! ChangeServiceConfig2(service, SERVICE_CONFIG_FAILURE_ACTIONS_FLAG, &flag)) {
+  if (! ChangeServiceConfig2(service->handle, SERVICE_CONFIG_FAILURE_ACTIONS_FLAG, &flag)) {
     unsigned long error = GetLastError();
     /* Pre-Vista we expect to fail with ERROR_INVALID_LEVEL */
     if (error != ERROR_INVALID_LEVEL) {
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CHANGESERVICECONFIG2_FAILED, service_name, error_string(error), 0);
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_FAILURE_ACTIONS_FAILED, service->name, error_string(error), 0);
     }
   }
-
-  if (services) {
-    CloseServiceHandle(service);
-    CloseServiceHandle(services);
-  }
 }
 
-int monitor_service() {
+int monitor_service(nssm_service_t *service) {
   /* Set service status to started */
-  int ret = start_service();
+  int ret = start_service(service);
   if (ret) {
-    char code[16];
-    _snprintf_s(code, sizeof(code), _TRUNCATE, "%d", ret);
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, exe, service_name, ret, 0);
+    TCHAR code[16];
+    _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%d"), ret);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, service->exe, service->name, ret, 0);
     return ret;
   }
-  log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_STARTED_SERVICE, exe, flags, service_name, dir, 0);
+  log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_STARTED_SERVICE, service->exe, service->flags, service->name, service->dir, 0);
 
   /* Monitor service */
-  if (! RegisterWaitForSingleObject(&wait_handle, process_handle, end_service, (void *) pid, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTELONGFUNCTION)) {
-    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_REGISTERWAITFORSINGLEOBJECT_FAILED, service_name, exe, error_string(GetLastError()), 0);
+  if (! RegisterWaitForSingleObject(&service->wait_handle, service->process_handle, end_service, (void *) service, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTELONGFUNCTION)) {
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_REGISTERWAITFORSINGLEOBJECT_FAILED, service->name, service->exe, error_string(GetLastError()), 0);
   }
 
   return 0;
 }
 
-char *service_control_text(unsigned long control) {
+TCHAR *service_control_text(unsigned long control) {
   switch (control) {
     /* HACK: there is no SERVICE_CONTROL_START constant */
-    case 0: return "START";
-    case SERVICE_CONTROL_STOP: return "STOP";
-    case SERVICE_CONTROL_SHUTDOWN: return "SHUTDOWN";
-    case SERVICE_CONTROL_PAUSE: return "PAUSE";
-    case SERVICE_CONTROL_CONTINUE: return "CONTINUE";
-    case SERVICE_CONTROL_INTERROGATE: return "INTERROGATE";
+    case 0: return _T("START");
+    case SERVICE_CONTROL_STOP: return _T("STOP");
+    case SERVICE_CONTROL_SHUTDOWN: return _T("SHUTDOWN");
+    case SERVICE_CONTROL_PAUSE: return _T("PAUSE");
+    case SERVICE_CONTROL_CONTINUE: return _T("CONTINUE");
+    case SERVICE_CONTROL_INTERROGATE: return _T("INTERROGATE");
     default: return 0;
   }
 }
 
-void log_service_control(char *service_name, unsigned long control, bool handled) {
-  char *text = service_control_text(control);
+void log_service_control(TCHAR *service_name, unsigned long control, bool handled) {
+  TCHAR *text = service_control_text(control);
   unsigned long event;
 
   if (! text) {
     /* "0x" + 8 x hex + NULL */
-    text = (char *) HeapAlloc(GetProcessHeap(), 0, 11);
+    text = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, 11 * sizeof(TCHAR));
     if (! text) {
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control()", 0);
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("control code"), _T("log_service_control()"), 0);
       return;
     }
-    if (_snprintf_s(text, 11, _TRUNCATE, "0x%08x", control) < 0) {
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control()", 0);
+    if (_sntprintf_s(text, 11, _TRUNCATE, _T("0x%08x"), control) < 0) {
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("control code"), _T("log_service_control()"), 0);
       HeapFree(GetProcessHeap(), 0, text);
       return;
     }
@@ -332,6 +764,8 @@ void log_service_control(char *service_name, unsigned long control, bool handled
 
 /* Service control handler */
 unsigned long WINAPI service_control_handler(unsigned long control, unsigned long event, void *data, void *context) {
+  nssm_service_t *service = (nssm_service_t *) context;
+
   switch (control) {
     case SERVICE_CONTROL_INTERROGATE:
       /* We always keep the service status up-to-date so this is a no-op. */
@@ -339,23 +773,40 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
 
     case SERVICE_CONTROL_SHUTDOWN:
     case SERVICE_CONTROL_STOP:
-      log_service_control(service_name, control, true);
-      stop_service(0, true, true);
+      log_service_control(service->name, control, true);
+      /*
+        We MUST acknowledge the stop request promptly but we're committed to
+        waiting for the application to exit.  Spawn a new thread to wait
+        while we acknowledge the request.
+      */
+      if (! CreateThread(NULL, 0, shutdown_service, context, 0, NULL)) {
+        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATETHREAD_FAILED, error_string(GetLastError()), 0);
+
+        /*
+          We couldn't create a thread to tidy up so we'll have to force the tidyup
+          to complete in time in this thread.
+        */
+        service->kill_console_delay = NSSM_KILL_CONSOLE_GRACE_PERIOD;
+        service->kill_window_delay = NSSM_KILL_WINDOW_GRACE_PERIOD;
+        service->kill_threads_delay = NSSM_KILL_THREADS_GRACE_PERIOD;
+
+        stop_service(service, 0, true, true);
+      }
       return NO_ERROR;
 
     case SERVICE_CONTROL_CONTINUE:
-      log_service_control(service_name, control, true);
-      throttle = 0;
-      if (use_critical_section) imports.WakeConditionVariable(&throttle_condition);
+      log_service_control(service->name, control, true);
+      service->throttle = 0;
+      if (use_critical_section) imports.WakeConditionVariable(&service->throttle_condition);
       else {
-        if (! throttle_timer) return ERROR_CALL_NOT_IMPLEMENTED;
-        ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));
-        SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);
+        if (! service->throttle_timer) return ERROR_CALL_NOT_IMPLEMENTED;
+        ZeroMemory(&service->throttle_duetime, sizeof(service->throttle_duetime));
+        SetWaitableTimer(service->throttle_timer, &service->throttle_duetime, 0, 0, 0, 0);
       }
-      service_status.dwCurrentState = SERVICE_CONTINUE_PENDING;
-      service_status.dwWaitHint = throttle_milliseconds() + NSSM_WAITHINT_MARGIN;
-      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_RESET_THROTTLE, service_name, 0);
-      SetServiceStatus(service_handle, &service_status);
+      service->status.dwCurrentState = SERVICE_CONTINUE_PENDING;
+      service->status.dwWaitHint = throttle_milliseconds(service->throttle) + NSSM_WAITHINT_MARGIN;
+      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_RESET_THROTTLE, service->name, 0);
+      SetServiceStatus(service->status_handle, &service->status);
       return NO_ERROR;
 
     case SERVICE_CONTROL_PAUSE:
@@ -363,21 +814,21 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
         We don't accept pause messages but it isn't possible to register
         only for continue messages so we have to handle this case.
       */
-      log_service_control(service_name, control, false);
+      log_service_control(service->name, control, false);
       return ERROR_CALL_NOT_IMPLEMENTED;
   }
 
   /* Unknown control */
-  log_service_control(service_name, control, false);
+  log_service_control(service->name, control, false);
   return ERROR_CALL_NOT_IMPLEMENTED;
 }
 
 /* Start the service */
-int start_service() {
-  stopping = false;
-  allow_restart = true;
+int start_service(nssm_service_t *service) {
+  service->stopping = false;
+  service->allow_restart = true;
 
-  if (process_handle) return 0;
+  if (service->process_handle) return 0;
 
   /* Allocate a STARTUPINFO structure for a new process */
   STARTUPINFO si;
@@ -389,91 +840,119 @@ int start_service() {
   ZeroMemory(&pi, sizeof(pi));
 
   /* Get startup parameters */
-  char *env = 0;
-  int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay, &stop_method, &si);
+  int ret = get_parameters(service, &si);
   if (ret) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, service_name, 0);
-    return stop_service(2, true, true);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, service->name, 0);
+    return stop_service(service, 2, true, true);
   }
 
   /* Launch executable with arguments */
-  char cmd[CMD_LENGTH];
-  if (_snprintf_s(cmd, sizeof(cmd), _TRUNCATE, "\"%s\" %s", exe, flags) < 0) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "command line", "start_service", 0);
+  TCHAR cmd[CMD_LENGTH];
+  if (_sntprintf_s(cmd, _countof(cmd), _TRUNCATE, _T("\"%s\" %s"), service->exe, service->flags) < 0) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("command line"), _T("start_service"), 0);
     close_output_handles(&si);
-    return stop_service(2, true, true);
+    return stop_service(service, 2, true, true);
   }
 
-  throttle_restart();
+  throttle_restart(service);
 
   bool inherit_handles = false;
   if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;
-  if (! CreateProcess(0, cmd, 0, 0, inherit_handles, 0, env, dir, &si, &pi)) {
+  unsigned long flags = 0;
+#ifdef UNICODE
+  flags |= CREATE_UNICODE_ENVIRONMENT;
+#endif
+  if (! CreateProcess(0, cmd, 0, 0, inherit_handles, flags, service->env, service->dir, &si, &pi)) {
+    unsigned long exitcode = 3;
     unsigned long error = GetLastError();
-    if (error == ERROR_INVALID_PARAMETER && env) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service_name, exe, NSSM_REG_ENV, 0);
-    else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, error_string(error), 0);
+    if (error == ERROR_INVALID_PARAMETER && service->env) {
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service->name, service->exe, NSSM_REG_ENV, 0);
+      if (test_environment(service->env)) exitcode = 4;
+    }
+    else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service->name, service->exe, error_string(error), 0);
     close_output_handles(&si);
-    return stop_service(3, true, true);
+    return stop_service(service, exitcode, true, true);
   }
-  process_handle = pi.hProcess;
-  pid = pi.dwProcessId;
+  service->process_handle = pi.hProcess;
+  service->pid = pi.dwProcessId;
 
-  if (get_process_creation_time(process_handle, &creation_time)) ZeroMemory(&creation_time, sizeof(creation_time));
+  if (get_process_creation_time(service->process_handle, &service->creation_time)) ZeroMemory(&service->creation_time, sizeof(service->creation_time));
 
   close_output_handles(&si);
 
-  /* Wait for a clean startup. */
-  if (WaitForSingleObject(process_handle, throttle_delay) == WAIT_TIMEOUT) throttle = 0;
+  /*
+    Wait for a clean startup before changing the service status to RUNNING
+    but be mindful of the fact that we are blocking the service control manager
+    so abandon the wait before too much time has elapsed.
+  */
+  unsigned long delay = service->throttle_delay;
+  if (delay > NSSM_SERVICE_STATUS_DEADLINE) {
+    TCHAR delay_milliseconds[16];
+    _sntprintf_s(delay_milliseconds, _countof(delay_milliseconds), _TRUNCATE, _T("%lu"), delay);
+    TCHAR deadline_milliseconds[16];
+    _sntprintf_s(deadline_milliseconds, _countof(deadline_milliseconds), _TRUNCATE, _T("%lu"), NSSM_SERVICE_STATUS_DEADLINE);
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_STARTUP_DELAY_TOO_LONG, service->name, delay_milliseconds, NSSM, deadline_milliseconds, 0);
+    delay = NSSM_SERVICE_STATUS_DEADLINE;
+  }
+  unsigned long deadline = WaitForSingleObject(service->process_handle, delay);
 
   /* Signal successful start */
-  service_status.dwCurrentState = SERVICE_RUNNING;
-  SetServiceStatus(service_handle, &service_status);
+  service->status.dwCurrentState = SERVICE_RUNNING;
+  SetServiceStatus(service->status_handle, &service->status);
+
+  /* Continue waiting for a clean startup. */
+  if (deadline == WAIT_TIMEOUT) {
+    if (service->throttle_delay > delay) {
+      if (WaitForSingleObject(service->process_handle, service->throttle_delay - delay) == WAIT_TIMEOUT) service->throttle = 0;
+    }
+    else service->throttle = 0;
+  }
 
   return 0;
 }
 
 /* Stop the service */
-int stop_service(unsigned long exitcode, bool graceful, bool default_action) {
-  allow_restart = false;
-  if (wait_handle) UnregisterWait(wait_handle);
+int stop_service(nssm_service_t *service, unsigned long exitcode, bool graceful, bool default_action) {
+  service->allow_restart = false;
+  if (service->wait_handle) {
+    UnregisterWait(service->wait_handle);
+    service->wait_handle = 0;
+  }
 
   if (default_action && ! exitcode && ! graceful) {
-    log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_GRACEFUL_SUICIDE, service_name, exe, exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_REALLY] ,0);
+    log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_GRACEFUL_SUICIDE, service->name, service->exe, exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_REALLY], 0);
     graceful = true;
   }
 
   /* Signal we are stopping */
   if (graceful) {
-    service_status.dwCurrentState = SERVICE_STOP_PENDING;
-    service_status.dwWaitHint = NSSM_WAITHINT_MARGIN;
-    if (stop_method & NSSM_STOP_METHOD_CONSOLE && imports.AttachConsole) service_status.dwWaitHint += NSSM_KILL_CONSOLE_GRACE_PERIOD;
-    if (stop_method & NSSM_STOP_METHOD_WINDOW) service_status.dwWaitHint += NSSM_KILL_WINDOW_GRACE_PERIOD;
-    if (stop_method & NSSM_STOP_METHOD_THREADS) service_status.dwWaitHint += NSSM_KILL_THREADS_GRACE_PERIOD;
-    SetServiceStatus(service_handle, &service_status);
+    service->status.dwCurrentState = SERVICE_STOP_PENDING;
+    service->status.dwWaitHint = NSSM_WAITHINT_MARGIN;
+    SetServiceStatus(service->status_handle, &service->status);
   }
 
   /* Nothing to do if service isn't running */
-  if (pid) {
+  if (service->pid) {
     /* Shut down service */
-    log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_TERMINATEPROCESS, service_name, exe, 0);
-    kill_process(service_name, stop_method, process_handle, pid, 0);
+    log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_TERMINATEPROCESS, service->name, service->exe, 0);
+    kill_process(service, service->process_handle, service->pid, 0);
   }
-  else log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_PROCESS_ALREADY_STOPPED, service_name, exe, 0);
+  else log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_PROCESS_ALREADY_STOPPED, service->name, service->exe, 0);
 
-  end_service((void *) pid, true);
+  end_service((void *) service, true);
 
   /* Signal we stopped */
   if (graceful) {
-    service_status.dwCurrentState = SERVICE_STOPPED;
+    service->status.dwCurrentState = SERVICE_STOPPED;
     if (exitcode) {
-      service_status.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR;
-      service_status.dwServiceSpecificExitCode = exitcode;
+      service->status.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR;
+      service->status.dwServiceSpecificExitCode = exitcode;
     }
     else {
-      service_status.dwWin32ExitCode = NO_ERROR;
-      service_status.dwServiceSpecificExitCode = 0;
+      service->status.dwWin32ExitCode = NO_ERROR;
+      service->status.dwServiceSpecificExitCode = 0;
     }
-    SetServiceStatus(service_handle, &service_status);
+    SetServiceStatus(service->status_handle, &service->status);
   }
 
   return exitcode;
@@ -481,32 +960,37 @@ int stop_service(unsigned long exitcode, bool graceful, bool default_action) {
 
 /* Callback function triggered when the server exits */
 void CALLBACK end_service(void *arg, unsigned char why) {
-  if (stopping) return;
+  nssm_service_t *service = (nssm_service_t *) arg;
 
-  stopping = true;
+  if (service->stopping) return;
 
-  pid = (unsigned long) arg;
+  service->stopping = true;
 
   /* Check exit code */
   unsigned long exitcode = 0;
-  char code[16];
-  FILETIME exit_time;
-  GetExitCodeProcess(process_handle, &exitcode);
-  if (exitcode == STILL_ACTIVE || get_process_exit_time(process_handle, &exit_time)) GetSystemTimeAsFileTime(&exit_time);
-  CloseHandle(process_handle);
+  TCHAR code[16];
+  if (service->process_handle) {
+    GetExitCodeProcess(service->process_handle, &exitcode);
+    if (exitcode == STILL_ACTIVE || get_process_exit_time(service->process_handle, &service->exit_time)) GetSystemTimeAsFileTime(&service->exit_time);
+    CloseHandle(service->process_handle);
+  }
+  else GetSystemTimeAsFileTime(&service->exit_time);
+
+  service->process_handle = 0;
 
   /*
     Log that the service ended BEFORE logging about killing the process
     tree.  See below for the possible values of the why argument.
   */
   if (! why) {
-    _snprintf_s(code, sizeof(code), _TRUNCATE, "%lu", exitcode);
-    log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ENDED_SERVICE, exe, service_name, code, 0);
+    _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%lu"), exitcode);
+    log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ENDED_SERVICE, service->exe, service->name, code, 0);
   }
 
   /* Clean up. */
   if (exitcode == STILL_ACTIVE) exitcode = 0;
-  kill_process_tree(service_name, stop_method, pid, exitcode, pid, &creation_time, &exit_time);
+  if (service->pid) kill_process_tree(service, service->pid, exitcode, service->pid);
+  service->pid = 0;
 
   /*
     The why argument is true if our wait timed out or false otherwise.
@@ -515,84 +999,169 @@ void CALLBACK end_service(void *arg, unsigned char why) {
     this is a controlled shutdown, and don't take any restart action.
   */
   if (why) return;
-  if (! allow_restart) return;
+  if (! service->allow_restart) return;
 
   /* What action should we take? */
   int action = NSSM_EXIT_RESTART;
-  unsigned char action_string[ACTION_LEN];
+  TCHAR action_string[ACTION_LEN];
   bool default_action;
-  if (! get_exit_action(service_name, &exitcode, action_string, &default_action)) {
+  if (! get_exit_action(service->name, &exitcode, action_string, &default_action)) {
     for (int i = 0; exit_action_strings[i]; i++) {
-      if (! _strnicmp((const char *) action_string, exit_action_strings[i], ACTION_LEN)) {
+      if (! _tcsnicmp((const TCHAR *) action_string, exit_action_strings[i], ACTION_LEN)) {
         action = i;
         break;
       }
     }
   }
 
-  process_handle = 0;
-  pid = 0;
   switch (action) {
     /* Try to restart the service or return failure code to service manager */
     case NSSM_EXIT_RESTART:
-      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_RESTART, service_name, code, exit_action_strings[action], exe, 0);
-      while (monitor_service()) {
-        log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_RESTART_SERVICE_FAILED, exe, service_name, 0);
+      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_RESTART, service->name, code, exit_action_strings[action], service->exe, 0);
+      while (monitor_service(service)) {
+        log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_RESTART_SERVICE_FAILED, service->exe, service->name, 0);
         Sleep(30000);
       }
     break;
 
     /* Do nothing, just like srvany would */
     case NSSM_EXIT_IGNORE:
-      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_IGNORE, service_name, code, exit_action_strings[action], exe, 0);
+      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_IGNORE, service->name, code, exit_action_strings[action], service->exe, 0);
       Sleep(INFINITE);
     break;
 
     /* Tell the service manager we are finished */
     case NSSM_EXIT_REALLY:
-      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_REALLY, service_name, code, exit_action_strings[action], 0);
-      stop_service(exitcode, true, default_action);
+      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_REALLY, service->name, code, exit_action_strings[action], 0);
+      stop_service(service, exitcode, true, default_action);
     break;
 
     /* Fake a crash so pre-Vista service managers will run recovery actions. */
     case NSSM_EXIT_UNCLEAN:
-      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_UNCLEAN, service_name, code, exit_action_strings[action], 0);
-      stop_service(exitcode, false, default_action);
+      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_UNCLEAN, service->name, code, exit_action_strings[action], 0);
+      stop_service(service, exitcode, false, default_action);
       free_imports();
       exit(exitcode);
     break;
   }
 }
 
-void throttle_restart() {
+void throttle_restart(nssm_service_t *service) {
   /* This can't be a restart if the service is already running. */
-  if (! throttle++) return;
+  if (! service->throttle++) return;
 
-  int ms = throttle_milliseconds();
+  int ms = throttle_milliseconds(service->throttle);
 
-  if (throttle > 7) throttle = 8;
+  if (service->throttle > 7) service->throttle = 8;
 
-  char threshold[8], milliseconds[8];
-  _snprintf_s(threshold, sizeof(threshold), _TRUNCATE, "%lu", throttle_delay);
-  _snprintf_s(milliseconds, sizeof(milliseconds), _TRUNCATE, "%lu", ms);
-  log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service_name, threshold, milliseconds, 0);
+  TCHAR threshold[8], milliseconds[8];
+  _sntprintf_s(threshold, _countof(threshold), _TRUNCATE, _T("%lu"), service->throttle_delay);
+  _sntprintf_s(milliseconds, _countof(milliseconds), _TRUNCATE, _T("%lu"), ms);
+  log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service->name, threshold, milliseconds, 0);
 
-  if (use_critical_section) EnterCriticalSection(&throttle_section);
-  else if (throttle_timer) {
-    ZeroMemory(&throttle_duetime, sizeof(throttle_duetime));
-    throttle_duetime.QuadPart = 0 - (ms * 10000LL);
-    SetWaitableTimer(throttle_timer, &throttle_duetime, 0, 0, 0, 0);
+  if (use_critical_section) EnterCriticalSection(&service->throttle_section);
+  else if (service->throttle_timer) {
+    ZeroMemory(&service->throttle_duetime, sizeof(service->throttle_duetime));
+    service->throttle_duetime.QuadPart = 0 - (ms * 10000LL);
+    SetWaitableTimer(service->throttle_timer, &service->throttle_duetime, 0, 0, 0, 0);
   }
 
-  service_status.dwCurrentState = SERVICE_PAUSED;
-  SetServiceStatus(service_handle, &service_status);
+  service->status.dwCurrentState = SERVICE_PAUSED;
+  SetServiceStatus(service->status_handle, &service->status);
 
   if (use_critical_section) {
-    imports.SleepConditionVariableCS(&throttle_condition, &throttle_section, ms);
-    LeaveCriticalSection(&throttle_section);
+    imports.SleepConditionVariableCS(&service->throttle_condition, &service->throttle_section, ms);
+    LeaveCriticalSection(&service->throttle_section);
   }
   else {
-    if (throttle_timer) WaitForSingleObject(throttle_timer, INFINITE);
+    if (service->throttle_timer) WaitForSingleObject(service->throttle_timer, INFINITE);
     else Sleep(ms);
   }
 }
+
+/*
+  When responding to a stop (or any other) request we need to set dwWaitHint to
+  the number of milliseconds we expect the operation to take, and optionally
+  increase dwCheckPoint.  If dwWaitHint milliseconds elapses without the
+  operation completing or dwCheckPoint increasing, the system will consider the
+  service to be hung.
+
+  However the system will consider the service to be hung after 30000
+  milliseconds regardless of the value of dwWaitHint if dwCheckPoint has not
+  changed.  Therefore if we want to wait longer than that we must periodically
+  increase dwCheckPoint.
+
+  Furthermore, it will consider the service to be hung after 60000 milliseconds
+  regardless of the value of dwCheckPoint unless dwWaitHint is increased every
+  time dwCheckPoint is also increased.
+
+  Our strategy then is to retrieve the initial dwWaitHint and wait for
+  NSSM_SERVICE_STATUS_DEADLINE milliseconds.  If the process is still running
+  and we haven't finished waiting we increment dwCheckPoint and add whichever is
+  smaller of NSSM_SERVICE_STATUS_DEADLINE or the remaining timeout to
+  dwWaitHint.
+
+  Only doing both these things will prevent the system from killing the service.
+
+  Returns: 1 if the wait timed out.
+           0 if the wait completed.
+          -1 on error.
+*/
+int await_shutdown(nssm_service_t *service, TCHAR *function_name, unsigned long timeout) {
+  unsigned long interval;
+  unsigned long waithint;
+  unsigned long ret;
+  unsigned long waited;
+  TCHAR interval_milliseconds[16];
+  TCHAR timeout_milliseconds[16];
+  TCHAR waited_milliseconds[16];
+  TCHAR *function = function_name;
+
+  /* Add brackets to function name. */
+  size_t funclen = _tcslen(function_name) + 3;
+  TCHAR *func = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, funclen * sizeof(TCHAR));
+  if (func) {
+    if (_sntprintf_s(func, funclen, _TRUNCATE, _T("%s()"), function_name) > -1) function = func;
+  }
+
+  _sntprintf_s(timeout_milliseconds, _countof(timeout_milliseconds), _TRUNCATE, _T("%lu"), timeout);
+
+  waithint = service->status.dwWaitHint;
+  waited = 0;
+  while (waited < timeout) {
+    interval = timeout - waited;
+    if (interval > NSSM_SERVICE_STATUS_DEADLINE) interval = NSSM_SERVICE_STATUS_DEADLINE;
+
+    service->status.dwCurrentState = SERVICE_STOP_PENDING;
+    service->status.dwWaitHint += interval;
+    service->status.dwCheckPoint++;
+    SetServiceStatus(service->status_handle, &service->status);
+
+    if (waited) {
+      _sntprintf_s(waited_milliseconds, _countof(waited_milliseconds), _TRUNCATE, _T("%lu"), waited);
+      _sntprintf_s(interval_milliseconds, _countof(interval_milliseconds), _TRUNCATE, _T("%lu"), interval);
+      log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_AWAITING_SHUTDOWN, function, service->name, waited_milliseconds, interval_milliseconds, timeout_milliseconds, 0);
+    }
+
+    switch (WaitForSingleObject(service->process_handle, interval)) {
+      case WAIT_OBJECT_0:
+        ret = 0;
+        goto awaited;
+
+      case WAIT_TIMEOUT:
+        ret = 1;
+      break;
+
+      default:
+        ret = -1;
+        goto awaited;
+    }
+
+    waited += interval;
+  }
+
+awaited:
+  if (func) HeapFree(GetProcessHeap(), 0, func);
+
+  return ret;
+}