Added CreateWellKnownSid and IsWellKnownSid imports.

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index 1477ba7..91e726f 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -791,6 +791,10 @@ int pre_edit_service(int argc, TCHAR **argv) {
       additional = argv[3];\r
       remainder = 4;\r
     }\r
+    else if (str_equiv(setting->name, NSSM_NATIVE_OBJECTNAME) && mode == MODE_SETTING) {\r
+      additional = argv[3];\r
+      remainder = 4;\r
+    }\r
     else {\r
       additional = argv[remainder];\r
       if (argc < mandatory) return usage(1);\r
@@ -933,6 +937,9 @@ int pre_edit_service(int argc, TCHAR **argv) {
     /* Unset the parameter. */\r
     value.string = 0;\r
   }\r
+  else if (remainder == argc) {\r
+    value.string = 0;\r
+  }\r
   else {\r
     /* Set the parameter. */\r
     size_t len = 0;\r
@@ -1680,15 +1687,18 @@ void CALLBACK end_service(void *arg, unsigned char why) {
 \r
   service->rotate_stdout_online = service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
 \r
+  /* Use now as a dummy exit time. */\r
+  GetSystemTimeAsFileTime(&service->exit_time);\r
+\r
   /* Check exit code */\r
   unsigned long exitcode = 0;\r
   TCHAR code[16];\r
   if (service->process_handle) {\r
     GetExitCodeProcess(service->process_handle, &exitcode);\r
-    if (exitcode == STILL_ACTIVE || get_process_exit_time(service->process_handle, &service->exit_time)) GetSystemTimeAsFileTime(&service->exit_time);\r
+    /* Check real exit time. */\r
+    if (exitcode != STILL_ACTIVE) get_process_exit_time(service->process_handle, &service->exit_time);\r
     CloseHandle(service->process_handle);\r
   }\r
-  else GetSystemTimeAsFileTime(&service->exit_time);\r
 \r
   service->process_handle = 0;\r
 \r