X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=b8c73ef435a15f606473dfc8979a74f8f34322f4;hb=2cd1c7c29ef4d2d3df3c5afd3ca6c788aede2bef;hp=cccfa2b55d161578d74dd117dd229447be78e88c;hpb=aa519d5f870a1069107c04fca707f84ea5d204a6;p=nssm.git

diff --git a/service.cpp b/service.cpp
index cccfa2b..b8c73ef 100644
--- a/service.cpp
+++ b/service.cpp
@@ -3,18 +3,168 @@
 /* This is explicitly a wide string. */
 #define NSSM_LOGON_AS_SERVICE_RIGHT L"SeServiceLogonRight"
 
-extern const TCHAR *exit_action_strings[];
-
 bool is_admin;
 bool use_critical_section;
 
 extern imports_t imports;
+extern settings_t settings[];
 
 const TCHAR *exit_action_strings[] = { _T("Restart"), _T("Ignore"), _T("Exit"), _T("Suicide"), 0 };
+const TCHAR *startup_strings[] = { _T("SERVICE_AUTO_START"), _T("SERVICE_DELAYED_AUTO_START"), _T("SERVICE_DEMAND_START"), _T("SERVICE_DISABLED"), 0 };
+const TCHAR *priority_strings[] = { _T("REALTIME_PRIORITY_CLASS"), _T("HIGH_PRIORITY_CLASS"), _T("ABOVE_NORMAL_PRIORITY_CLASS"), _T("NORMAL_PRIORITY_CLASS"), _T("BELOW_NORMAL_PRIORITY_CLASS"), _T("IDLE_PRIORITY_CLASS"), 0 };
+
+typedef struct {
+  int first;
+  int last;
+} list_t;
+
+int affinity_mask_to_string(__int64 mask, TCHAR **string) {
+  if (! string) return 1;
+  if (! mask) {
+    *string = 0;
+    return 0;
+  }
+
+  __int64 i, n;
+
+  /* SetProcessAffinityMask() accepts a mask of up to 64 processors. */
+  list_t set[64];
+  for (n = 0; n < _countof(set); n++) set[n].first = set[n].last = -1;
+
+  for (i = 0, n = 0; i < _countof(set); i++) {
+    if (mask & (1LL << i)) {
+      if (set[n].first == -1) set[n].first = set[n].last = (int) i;
+      else if (set[n].last == (int) i - 1) set[n].last = (int) i;
+      else {
+        n++;
+        set[n].first = set[n].last = (int) i;
+      }
+    }
+  }
+
+  /* Worst case is 2x2 characters for first and last CPU plus - and/or , */
+  size_t len = (size_t) (n + 1) * 6;
+  *string = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(TCHAR));
+  if (! string) return 2;
+
+  size_t s = 0;
+  int ret;
+  for (i = 0; i <= n; i++) {
+    if (i) (*string)[s++] = _T(',');
+    ret = _sntprintf_s(*string + s, 3, _TRUNCATE, _T("%u"), set[i].first);
+    if (ret < 0) {
+      HeapFree(GetProcessHeap(), 0, *string);
+      *string = 0;
+      return 3;
+    }
+    else s += ret;
+    if (set[i].last != set[i].first) {
+      ret =_sntprintf_s(*string + s, 4, _TRUNCATE, _T("%c%u"), (set[i].last == set[i].first + 1) ? _T(',') : _T('-'), set[i].last);
+      if (ret < 0) {
+        HeapFree(GetProcessHeap(), 0, *string);
+        *string = 0;
+        return 4;
+      }
+      else s += ret;
+    }
+  }
+
+  return 0;
+}
+
+int affinity_string_to_mask(TCHAR *string, __int64 *mask) {
+  if (! mask) return 1;
+
+  *mask = 0LL;
+  if (! string) return 0;
+
+  list_t set[64];
+
+  TCHAR *s = string;
+  TCHAR *end;
+  int ret;
+  int i;
+  int n = 0;
+  unsigned long number;
+
+  for (n = 0; n < _countof(set); n++) set[n].first = set[n].last = -1;
+  n = 0;
+
+  while (*s) {
+    ret = str_number(s, &number, &end);
+    s = end;
+    if (ret == 0 || ret == 2) {
+      if (number >= _countof(set)) return 2;
+      set[n].first = set[n].last = (int) number;
+
+      switch (*s) {
+        case 0:
+          break;
+
+        case _T(','):
+          n++;
+          s++;
+          break;
+
+        case _T('-'):
+          if (! *(++s)) return 3;
+          ret = str_number(s, &number, &end);
+          if (ret == 0 || ret == 2) {
+            s = end;
+            if (! *s || *s == _T(',')) {
+              set[n].last = (int) number;
+              if (! *s) break;
+              n++;
+              s++;
+            }
+            else return 3;
+          }
+          else return 3;
+          break;
+
+        default:
+          return 3;
+      }
+    }
+    else return 4;
+  }
 
-static inline int throttle_milliseconds(unsigned long throttle) {
+  for (i = 0; i <= n; i++) {
+    for (int j = set[i].first; j <= set[i].last; j++) (__int64) *mask |= (1LL << (__int64) j);
+  }
+
+  return 0;
+}
+
+inline 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;
+}
+
+int priority_constant_to_index(unsigned long constant) {
+  switch (constant & priority_mask()) {
+    case REALTIME_PRIORITY_CLASS: return NSSM_REALTIME_PRIORITY;
+    case HIGH_PRIORITY_CLASS: return NSSM_HIGH_PRIORITY;
+    case ABOVE_NORMAL_PRIORITY_CLASS: return NSSM_ABOVE_NORMAL_PRIORITY;
+    case BELOW_NORMAL_PRIORITY_CLASS: return NSSM_BELOW_NORMAL_PRIORITY;
+    case IDLE_PRIORITY_CLASS: return NSSM_IDLE_PRIORITY;
+  }
+  return NSSM_NORMAL_PRIORITY;
+}
+
+unsigned long priority_index_to_constant(int index) {
+  switch (index) {
+    case NSSM_REALTIME_PRIORITY: return REALTIME_PRIORITY_CLASS;
+    case NSSM_HIGH_PRIORITY: return HIGH_PRIORITY_CLASS;
+    case NSSM_ABOVE_NORMAL_PRIORITY: return ABOVE_NORMAL_PRIORITY_CLASS;
+    case NSSM_BELOW_NORMAL_PRIORITY: return BELOW_NORMAL_PRIORITY_CLASS;
+    case NSSM_IDLE_PRIORITY: return IDLE_PRIORITY_CLASS;
+  }
+  return NORMAL_PRIORITY_CLASS;
+}
+
+static inline unsigned long throttle_milliseconds(unsigned long throttle) {
   /* pow() operates on doubles. */
-  int ret = 1; for (unsigned long i = 1; i < throttle; i++) ret *= 2;
+  unsigned long ret = 1; for (unsigned long i = 1; i < throttle; i++) ret *= 2;
   return ret * 1000;
 }
 
@@ -37,6 +187,85 @@ SC_HANDLE open_service_manager() {
   return ret;
 }
 
+/* Open a service by name or display name. */
+SC_HANDLE open_service(SC_HANDLE services, TCHAR *service_name, TCHAR *canonical_name, unsigned long canonical_namelen) {
+  SC_HANDLE service_handle = OpenService(services, service_name, SERVICE_ALL_ACCESS);
+  if (service_handle) {
+    if (canonical_name && canonical_name != service_name) {
+      if (_sntprintf_s(canonical_name, canonical_namelen, _TRUNCATE, _T("%s"), service_name) < 0) {
+        print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canonical_name"), _T("open_service()"));
+        return 0;
+      }
+    }
+    return service_handle;
+  }
+
+  unsigned long error = GetLastError();
+  if (error != ERROR_SERVICE_DOES_NOT_EXIST) {
+    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED, error_string(GetLastError()));
+    return 0;
+  }
+
+  /* We can't look for a display name because there's no buffer to store it. */
+  if (! canonical_name) {
+    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED, error_string(GetLastError()));
+    return 0;
+  }
+
+  unsigned long bufsize, required, count, i;
+  unsigned long resume = 0;
+  EnumServicesStatus(services, SERVICE_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_KERNEL_DRIVER | SERVICE_WIN32, SERVICE_STATE_ALL, 0, 0, &required, &count, &resume);
+  error = GetLastError();
+  if (error != ERROR_MORE_DATA) {
+    print_message(stderr, NSSM_MESSAGE_ENUMSERVICESSTATUS_FAILED, error_string(GetLastError()));
+    return 0;
+  }
+
+  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("open_service()"));
+    return 0;
+  }
+
+  bufsize = required;
+  while (true) {
+    /*
+      EnumServicesStatus() returns:
+      1 when it retrieved data and there's no more data to come.
+      0 and sets last error to ERROR_MORE_DATA when it retrieved data and
+        there's more data to come.
+      0 and sets last error to something else on error.
+    */
+    int ret = EnumServicesStatus(services, SERVICE_DRIVER | SERVICE_FILE_SYSTEM_DRIVER | SERVICE_KERNEL_DRIVER | 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 0;
+      }
+    }
+
+    for (i = 0; i < count; i++) {
+      if (str_equiv(status[i].lpDisplayName, service_name)) {
+        if (_sntprintf_s(canonical_name, canonical_namelen, _TRUNCATE, _T("%s"), status[i].lpServiceName) < 0) {
+          HeapFree(GetProcessHeap(), 0, status);
+          print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canonical_name"), _T("open_service()"));
+          return 0;
+        }
+
+        HeapFree(GetProcessHeap(), 0, status);
+        return open_service(services, canonical_name, 0, 0);
+      }
+    }
+
+    if (ret) break;
+  }
+
+  /* Recurse so we can get an error message. */
+  return open_service(services, service_name, 0, 0);
+}
+
 QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE service_handle) {
   QUERY_SERVICE_CONFIG *qsc;
   unsigned long bufsize;
@@ -65,6 +294,22 @@ QUERY_SERVICE_CONFIG *query_service_config(const TCHAR *service_name, SC_HANDLE
   return qsc;
 }
 
+int set_service_description(const TCHAR *service_name, SC_HANDLE service_handle, TCHAR *buffer) {
+  SERVICE_DESCRIPTION description;
+  ZeroMemory(&description, sizeof(description));
+  /*
+    lpDescription must be NULL if we aren't changing, the new description
+    or "".
+  */
+  if (buffer && buffer[0]) description.lpDescription = buffer;
+  else description.lpDescription = _T("");
+
+  if (ChangeServiceConfig2(service_handle, SERVICE_CONFIG_DESCRIPTION, &description)) return 0;
+
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_DESCRIPTION_FAILED, service_name, error_string(GetLastError()), 0);
+  return 1;
+}
+
 int get_service_description(const TCHAR *service_name, SC_HANDLE service_handle, unsigned long len, TCHAR *buffer) {
   if (! buffer) return 1;
 
@@ -166,7 +411,8 @@ int get_service_username(const TCHAR *service_name, const QUERY_SERVICE_CONFIG *
   return 0;
 }
 
-static int grant_logon_as_service(const TCHAR *username) {
+int grant_logon_as_service(const TCHAR *username) {
+  if (! username) return 0;
   if (str_equiv(username, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;
 
   /* Open Policy object. */
@@ -190,7 +436,7 @@ static int grant_logon_as_service(const TCHAR *username) {
 #else
   size_t buflen;
   mbstowcs_s(&buflen, NULL, 0, username, _TRUNCATE);
-  lsa_username.MaximumLength = buflen * sizeof(wchar_t);
+  lsa_username.MaximumLength = (unsigned short) 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);
@@ -317,6 +563,7 @@ void set_nssm_service_defaults(nssm_service_t *service) {
   if (! service) return;
 
   service->type = SERVICE_WIN32_OWN_PROCESS;
+  service->priority = NORMAL_PRIORITY_CLASS;
   service->stdin_sharing = NSSM_STDIN_SHARING;
   service->stdin_disposition = NSSM_STDIN_DISPOSITION;
   service->stdin_flags = NSSM_STDIN_FLAGS;
@@ -403,10 +650,69 @@ int pre_install_service(int argc, TCHAR **argv) {
 /* About to edit the service. */
 int pre_edit_service(int argc, TCHAR **argv) {
   /* Require service name. */
-  if (argc < 1) return usage(1);
+  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;
+  const TCHAR *verb = argv[0];
+  const TCHAR *service_name = argv[1];
+  bool getting = false;
+  bool unsetting = false;
+
+  /* Minimum number of arguments. */
+  int mandatory = 2;
+  /* Index of first value. */
+  int remainder = 3;
+  int i;
+  if (str_equiv(verb, _T("get"))) {
+    mandatory = 3;
+    mode = MODE_GETTING;
+  }
+  else if (str_equiv(verb, _T("set"))) {
+    mandatory = 4;
+    mode = MODE_SETTING;
+  }
+  else if (str_equiv(verb, _T("reset")) || str_equiv(verb, _T("unset"))) {
+    mandatory = 3;
+    mode = MODE_RESETTING;
+  }
+  if (argc < mandatory) return usage(1);
+
+  const TCHAR *parameter = 0;
+  settings_t *setting = 0;
+  TCHAR *additional;
+
+  /* Validate the parameter. */
+  if (mandatory > 2) {
+    bool additional_mandatory = false;
+
+    parameter = argv[2];
+    for (i = 0; settings[i].name; i++) {
+      setting = &settings[i];
+      if (! str_equiv(setting->name, parameter)) continue;
+      if (((setting->additional & ADDITIONAL_GETTING) && mode == MODE_GETTING) || ((setting->additional & ADDITIONAL_SETTING) && mode == MODE_SETTING) || ((setting->additional & ADDITIONAL_RESETTING) && mode == MODE_RESETTING)) {
+        additional_mandatory = true;
+        mandatory++;
+      }
+      break;
+    }
+    if (! settings[i].name) {
+      print_message(stderr, NSSM_MESSAGE_INVALID_PARAMETER, parameter);
+      for (i = 0; settings[i].name; i++) _ftprintf(stderr, _T("%s\n"), settings[i].name);
+      return 1;
+    }
+    if (argc < mandatory) return usage(1);
+
+    additional = 0;
+    if (additional_mandatory) {
+      additional = argv[3];
+      remainder = 4;
+    }
+    else additional = argv[remainder];
+  }
 
   nssm_service_t *service = alloc_nssm_service();
-  _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), argv[0]);
+  _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), service_name);
 
   /* Open service manager */
   SC_HANDLE services = open_service_manager();
@@ -416,15 +722,13 @@ int pre_edit_service(int argc, TCHAR **argv) {
   }
 
   /* Try to open the service */
-  service->handle = OpenService(services, service->name, SC_MANAGER_ALL_ACCESS);
+  service->handle = open_service(services, service->name, service->name, _countof(service->name));
   if (! service->handle) {
     CloseServiceHandle(services);
-    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED);
     return 3;
   }
 
   /* Get system details. */
-  unsigned long bufsize;
   QUERY_SERVICE_CONFIG *qsc = query_service_config(service->name, service->handle);
   if (! qsc) {
     CloseHandle(service->handle);
@@ -434,31 +738,37 @@ int pre_edit_service(int argc, TCHAR **argv) {
 
   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;
+    if (mode != MODE_GETTING) {
+      HeapFree(GetProcessHeap(), 0, qsc);
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      print_message(stderr, NSSM_MESSAGE_CANNOT_EDIT, service->name, NSSM_WIN32_OWN_PROCESS, 0);
+      return 3;
+    }
   }
 
   if (get_service_startup(service->name, service->handle, qsc, &service->startup)) {
-    HeapFree(GetProcessHeap(), 0, qsc);
-    CloseHandle(service->handle);
-    CloseServiceHandle(services);
-    return 4;
+    if (mode != MODE_GETTING) {
+      HeapFree(GetProcessHeap(), 0, qsc);
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      return 4;
+    }
   }
 
   if (get_service_username(service->name, qsc, &service->username, &service->usernamelen)) {
-    HeapFree(GetProcessHeap(), 0, qsc);
-    CloseHandle(service->handle);
-    CloseServiceHandle(services);
-    return 5;
+    if (mode != MODE_GETTING) {
+      HeapFree(GetProcessHeap(), 0, qsc);
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      return 5;
+    }
   }
 
   _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);
+  unsigned long bufsize = _countof(service->name);
   GetServiceKeyName(services, service->displayname, service->name, &bufsize);
 
   /* Remember the executable in case it isn't NSSM. */
@@ -467,9 +777,11 @@ 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)) {
-    CloseHandle(service->handle);
-    CloseServiceHandle(services);
-    return 6;
+    if (mode != MODE_GETTING) {
+      CloseHandle(service->handle);
+      CloseServiceHandle(services);
+      return 6;
+    }
   }
 
   /* Get NSSM details. */
@@ -478,11 +790,112 @@ int pre_edit_service(int argc, TCHAR **argv) {
   CloseServiceHandle(services);
 
   if (! service->exe[0]) {
-    print_message(stderr, NSSM_MESSAGE_INVALID_SERVICE, service->name, NSSM, service->image);
     service->native = true;
+    if (mode != MODE_GETTING) print_message(stderr, NSSM_MESSAGE_INVALID_SERVICE, service->name, NSSM, service->image);
+  }
+
+  /* Editing with the GUI. */
+  if (mode == MODE_EDITING) {
+    nssm_gui(IDD_EDIT, service);
+    return 0;
+  }
+
+  /* Trying to manage App* parameters for a non-NSSM service. */
+  if (! setting->native && service->native) {
+    CloseHandle(service->handle);
+    print_message(stderr, NSSM_MESSAGE_NATIVE_PARAMETER, setting->name, NSSM);
+    return 1;
+  }
+
+  HKEY key;
+  value_t value;
+  int ret;
+
+  if (mode == MODE_GETTING) {
+    if (! service->native) {
+      key = open_registry(service->name, KEY_READ);
+      if (! key) return 4;
+    }
+
+    if (setting->native) ret = get_setting(service->name, service->handle, setting, &value, additional);
+    else ret = get_setting(service->name, key, setting, &value, additional);
+    if (ret < 0) {
+      CloseHandle(service->handle);
+      return 5;
+    }
+
+    switch (setting->type) {
+      case REG_EXPAND_SZ:
+      case REG_MULTI_SZ:
+      case REG_SZ:
+        _tprintf(_T("%s\n"), value.string ? value.string : _T(""));
+        HeapFree(GetProcessHeap(), 0, value.string);
+        break;
+
+      case REG_DWORD:
+        _tprintf(_T("%u\n"), value.numeric);
+        break;
+    }
+
+    if (! service->native) RegCloseKey(key);
+    CloseHandle(service->handle);
+    return 0;
+  }
+
+  /* Build the value. */
+  if (mode == MODE_RESETTING) {
+    /* Unset the parameter. */
+    value.string = 0;
+  }
+  else {
+    /* Set the parameter. */
+    size_t len = 0;
+    size_t delimiterlen = (setting->additional & ADDITIONAL_CRLF) ? 2 : 1;
+    for (i = remainder; i < argc; i++) len += _tcslen(argv[i]) + delimiterlen;
+    len++;
+
+    value.string = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, len * sizeof(TCHAR));
+    if (! value.string) {
+      print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("value"), _T("edit_service()"));
+      CloseHandle(service->handle);
+      return 2;
+    }
+
+    size_t s = 0;
+    for (i = remainder; i < argc; i++) {
+      size_t len = _tcslen(argv[i]);
+      memmove(value.string + s, argv[i], len * sizeof(TCHAR));
+      s += len;
+      if (i < argc - 1) {
+        if (setting->additional & ADDITIONAL_CRLF) {
+          value.string[s++] = _T('\r');
+          value.string[s++] = _T('\n');
+        }
+        else value.string[s++] = _T(' ');
+      }
+    }
+    value.string[s] = _T('\0');
+  }
+
+  if (! service->native) {
+    key = open_registry(service->name, KEY_WRITE);
+    if (! key) {
+      if (value.string) HeapFree(GetProcessHeap(), 0, value.string);
+      return 4;
+    }
+  }
+
+  if (setting->native) ret = set_setting(service->name, service->handle, setting, &value, additional);
+  else ret = set_setting(service->name, key, setting, &value, additional);
+  if (value.string) HeapFree(GetProcessHeap(), 0, value.string);
+  if (ret < 0) {
+    if (! service->native) RegCloseKey(key);
+    CloseHandle(service->handle);
+    return 6;
   }
 
-  nssm_gui(IDD_EDIT, service);
+  if (! service->native) RegCloseKey(key);
+  CloseHandle(service->handle);
 
   return 0;
 }
@@ -520,9 +933,9 @@ int install_service(nssm_service_t *service) {
   GetModuleFileName(0, service->image, _countof(service->image));
 
   /* 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);
+  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);
   if (! service->handle) {
-    print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED);
+    print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED, error_string(GetLastError()));
     CloseServiceHandle(services);
     return 5;
   }
@@ -565,7 +978,7 @@ int edit_service(nssm_service_t *service, bool editing) {
 
   /*
     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.
+    We must explicitly use 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.
   */
@@ -589,13 +1002,7 @@ int edit_service(nssm_service_t *service, bool editing) {
   }
 
   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);
-    }
+    set_service_description(service->name, service->handle, service->description);
   }
 
   SERVICE_DELAYED_AUTO_START_INFO delayed;
@@ -625,6 +1032,106 @@ int edit_service(nssm_service_t *service, bool editing) {
   return 0;
 }
 
+/* Control a service. */
+int control_service(unsigned long control, int argc, TCHAR **argv) {
+  if (argc < 1) return usage(1);
+  TCHAR *service_name = argv[0];
+  TCHAR canonical_name[SERVICE_NAME_LENGTH];
+
+  SC_HANDLE services = open_service_manager();
+  if (! services) {
+    print_message(stderr, NSSM_MESSAGE_OPEN_SERVICE_MANAGER_FAILED);
+    return 2;
+  }
+
+  SC_HANDLE service_handle = open_service(services, service_name, canonical_name, _countof(canonical_name));
+  if (! service_handle) {
+    CloseServiceHandle(services);
+    return 3;
+  }
+
+  int ret;
+  unsigned long error;
+  SERVICE_STATUS service_status;
+  if (control == 0) {
+    ret = StartService(service_handle, (unsigned long) argc, (const TCHAR **) argv);
+    error = GetLastError();
+    CloseHandle(service_handle);
+    CloseServiceHandle(services);
+
+    if (error == ERROR_IO_PENDING) {
+      /*
+        Older versions of Windows return immediately with ERROR_IO_PENDING
+        indicate that the operation is still in progress.  Newer versions
+        will return it if there really is a delay.  As far as we're
+        concerned the operation is a success.  We don't claim to offer a
+        fully-feature service control method; it's just a quick 'n' dirty
+        interface.
+
+        In the future we may identify and handle this situation properly.
+      */
+      ret = 1;
+      error = ERROR_SUCCESS;
+    }
+
+    if (ret) {
+      _tprintf(_T("%s: %s"), canonical_name, error_string(error));
+      return 0;
+    }
+    else {
+      _ftprintf(stderr, _T("%s: %s"), canonical_name, error_string(error));
+      return 1;
+    }
+  }
+  else if (control == SERVICE_CONTROL_INTERROGATE) {
+    /*
+      We could actually send an INTERROGATE control but that won't return
+      any information if the service is stopped and we don't care about
+      the extra details it might give us in any case.  So we'll fake it.
+    */
+    ret = QueryServiceStatus(service_handle, &service_status);
+    error = GetLastError();
+
+    if (ret) {
+      switch (service_status.dwCurrentState) {
+        case SERVICE_STOPPED: _tprintf(_T("SERVICE_STOPPED\n")); break;
+        case SERVICE_START_PENDING: _tprintf(_T("SERVICE_START_PENDING\n")); break;
+        case SERVICE_STOP_PENDING: _tprintf(_T("SERVICE_STOP_PENDING\n")); break;
+        case SERVICE_RUNNING: _tprintf(_T("SERVICE_RUNNING\n")); break;
+        case SERVICE_CONTINUE_PENDING: _tprintf(_T("SERVICE_CONTINUE_PENDING\n")); break;
+        case SERVICE_PAUSE_PENDING: _tprintf(_T("SERVICE_PAUSE_PENDING\n")); break;
+        case SERVICE_PAUSED: _tprintf(_T("SERVICE_PAUSED\n")); break;
+        default: _tprintf(_T("?\n")); return 1;
+      }
+      return 0;
+    }
+    else {
+      _ftprintf(stderr, _T("%s: %s\n"), canonical_name, error_string(error));
+      return 1;
+    }
+  }
+  else {
+    ret = ControlService(service_handle, control, &service_status);
+    error = GetLastError();
+    CloseHandle(service_handle);
+    CloseServiceHandle(services);
+
+    if (error == ERROR_IO_PENDING) {
+      ret = 1;
+      error = ERROR_SUCCESS;
+    }
+
+    if (ret) {
+      _tprintf(_T("%s: %s"), canonical_name, error_string(error));
+      return 0;
+    }
+    else {
+      _ftprintf(stderr, _T("%s: %s"), canonical_name, error_string(error));
+      return 1;
+    }
+  }
+}
+
 /* Remove the service */
 int remove_service(nssm_service_t *service) {
   if (! service) return 1;
@@ -637,9 +1144,8 @@ int remove_service(nssm_service_t *service) {
   }
 
   /* Try to open the service */
-  service->handle = OpenService(services, service->name, SC_MANAGER_ALL_ACCESS);
+  service->handle = open_service(services, service->name, service->name, _countof(service->name));
   if (! service->handle) {
-    print_message(stderr, NSSM_MESSAGE_OPENSERVICE_FAILED);
     CloseServiceHandle(services);
     return 3;
   }
@@ -775,6 +1281,7 @@ TCHAR *service_control_text(unsigned long control) {
     case SERVICE_CONTROL_PAUSE: return _T("PAUSE");
     case SERVICE_CONTROL_CONTINUE: return _T("CONTINUE");
     case SERVICE_CONTROL_INTERROGATE: return _T("INTERROGATE");
+    case NSSM_SERVICE_CONTROL_ROTATE: return _T("ROTATE");
     default: return 0;
   }
 }
@@ -862,6 +1369,12 @@ unsigned long WINAPI service_control_handler(unsigned long control, unsigned lon
       */
       log_service_control(service->name, control, false);
       return ERROR_CALL_NOT_IMPLEMENTED;
+
+    case NSSM_SERVICE_CONTROL_ROTATE:
+      log_service_control(service->name, control, true);
+      if (service->rotate_stdout_online) service->rotate_stdout_online = NSSM_ROTATE_ONLINE_ASAP;
+      if (service->rotate_stdout_online) service->rotate_stderr_online = NSSM_ROTATE_ONLINE_ASAP;
+      return NO_ERROR;
   }
 
   /* Unknown control */
@@ -904,7 +1417,8 @@ int start_service(nssm_service_t *service) {
 
   bool inherit_handles = false;
   if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;
-  unsigned long flags = 0;
+  unsigned long flags = service->priority & priority_mask();
+  if (service->affinity) flags |= CREATE_SUSPENDED;
 #ifdef UNICODE
   flags |= CREATE_UNICODE_ENVIRONMENT;
 #endif
@@ -924,7 +1438,36 @@ int start_service(nssm_service_t *service) {
 
   if (get_process_creation_time(service->process_handle, &service->creation_time)) ZeroMemory(&service->creation_time, sizeof(service->creation_time));
 
-  close_output_handles(&si);
+  close_output_handles(&si, ! service->rotate_stdout_online, ! service->rotate_stderr_online);
+
+  if (service->affinity) {
+    /*
+      We are explicitly storing service->affinity as a 64-bit unsigned integer
+      so that we can parse it regardless of whether we're running in 32-bit
+      or 64-bit mode.  The arguments to SetProcessAffinityMask(), however, are
+      defined as type DWORD_PTR and hence limited to 32 bits on a 32-bit system
+      (or when running the 32-bit NSSM).
+
+      The result is a lot of seemingly-unnecessary casting throughout the code
+      and potentially confusion when we actually try to start the service.
+      Having said that, however, it's unlikely that we're actually going to
+      run in 32-bit mode on a system which has more than 32 CPUs so the
+      likelihood of seeing a confusing situation is somewhat diminished.
+    */
+    DWORD_PTR affinity, system_affinity;
+
+    if (GetProcessAffinityMask(service->process_handle, &affinity, &system_affinity)) affinity = service->affinity & system_affinity;
+    else {
+      affinity = (DWORD_PTR) service->affinity;
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GETPROCESSAFFINITYMASK_FAILED, service->name, error_string(GetLastError()), 0);
+    }
+
+    if (! SetProcessAffinityMask(service->process_handle, affinity)) {
+      log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETPROCESSAFFINITYMASK_FAILED, service->name, error_string(GetLastError()), 0);
+    }
+
+    ResumeThread(pi.hThread);
+  }
 
   /*
     Wait for a clean startup before changing the service status to RUNNING
@@ -954,6 +1497,9 @@ int start_service(nssm_service_t *service) {
     else service->throttle = 0;
   }
 
+  /* Ensure the restart delay is always applied. */
+  if (service->restart_delay && ! service->throttle) service->throttle++;
+
   return 0;
 }
 
@@ -1096,14 +1642,22 @@ void throttle_restart(nssm_service_t *service) {
   /* This can't be a restart if the service is already running. */
   if (! service->throttle++) return;
 
-  int ms = throttle_milliseconds(service->throttle);
+  unsigned long ms;
+  unsigned long throttle_ms = throttle_milliseconds(service->throttle);
+  TCHAR threshold[8], milliseconds[8];
+
+  if (service->restart_delay > throttle_ms) ms = service->restart_delay;
+  else ms = throttle_ms;
 
   if (service->throttle > 7) service->throttle = 8;
 
-  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 (service->throttle == 1 && service->restart_delay > throttle_ms) log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_RESTART_DELAY, service->name, milliseconds, 0);
+  else {
+    _sntprintf_s(threshold, _countof(threshold), _TRUNCATE, _T("%lu"), service->throttle_delay);
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service->name, threshold, milliseconds, 0);
+  }
 
   if (use_critical_section) EnterCriticalSection(&service->throttle_section);
   else if (service->throttle_timer) {