RegisterPowerSettingNotification is unnecessary.

[nssm.git] / nssm.cpp

diff --git a/nssm.cpp b/nssm.cpp
index 498a213..7eef69d 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -55,24 +55,42 @@ void check_admin() {
   FreeSid(AdministratorsGroup);\r
 }\r
 \r
-/* See if we were launched from a console window. */\r
-static void check_console() {\r
-  /* If we're running in a service context there will be no console window. */\r
-  HWND console = GetConsoleWindow();\r
-  if (! console) return;\r
+static int elevate(int argc, TCHAR **argv, unsigned long message) {\r
+  print_message(stderr, message);\r
+\r
+  SHELLEXECUTEINFO sei;\r
+  ZeroMemory(&sei, sizeof(sei));\r
+  sei.cbSize = sizeof(sei);\r
+  sei.lpVerb = _T("runas");\r
+  sei.lpFile = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, PATH_LENGTH);\r
+  if (! sei.lpFile) {\r
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("GetModuleFileName()"), _T("elevate()"));\r
+    return 111;\r
+  }\r
+  GetModuleFileName(0, (TCHAR *) sei.lpFile, PATH_LENGTH);\r
 \r
-  unsigned long pid;\r
-  if (! GetWindowThreadProcessId(console, &pid)) return;\r
+  TCHAR *args = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, EXE_LENGTH * sizeof(TCHAR));\r
+  if (! args) {\r
+    HeapFree(GetProcessHeap(), 0, (void *) sei.lpFile);\r
+    print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("GetCommandLine()"), _T("elevate()"));\r
+    return 111;\r
+  }\r
 \r
-  /*\r
-    If the process associated with the console window handle is the same as\r
-    this process, we were not launched from an existing console.  The user\r
-    probably double-clicked our executable.\r
-  */\r
-  if (GetCurrentProcessId() != pid) return;\r
+  /* Get command line, which includes the path to NSSM, and skip that part. */\r
+  _sntprintf_s(args, EXE_LENGTH, _TRUNCATE, _T("%s"), GetCommandLine());\r
+  size_t s = _tcslen(argv[0]) + 1;\r
+  if (args[0] == _T('"')) s += 2;\r
+  while (isspace(args[s])) s++;\r
+\r
+  sei.lpParameters = args + s;\r
+  sei.nShow = SW_SHOW;\r
 \r
-  /* We close our new console so that subsequent messages appear in a popup. */\r
-  FreeConsole();\r
+  unsigned long exitcode = 0;\r
+  if (! ShellExecuteEx(&sei)) exitcode = 100;\r
+\r
+  HeapFree(GetProcessHeap(), 0, (void *) sei.lpFile);\r
+  HeapFree(GetProcessHeap(), 0, (void *) args);\r
+  return exitcode;\r
 }\r
 \r
 int num_cpus() {\r
@@ -97,40 +115,39 @@ int _tmain(int argc, TCHAR **argv) {
   /* Remember if we are admin */\r
   check_admin();\r
 \r
+  /* Set up function pointers. */\r
+  if (get_imports()) exit(111);\r
+\r
   /* Elevate */\r
   if (argc > 1) {\r
     /*\r
       Valid commands are:\r
       start, stop, pause, continue, install, edit, get, set, reset, unset, remove\r
     */\r
-    if (str_equiv(argv[1], _T("start"))) exit(control_service(0, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("start"))) exit(control_service(NSSM_SERVICE_CONTROL_START, argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("stop"))) exit(control_service(SERVICE_CONTROL_STOP, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("restart"))) {\r
+      int ret = control_service(SERVICE_CONTROL_STOP, argc - 2, argv + 2);\r
+      if (ret) exit(ret);\r
+      exit(control_service(NSSM_SERVICE_CONTROL_START, argc - 2, argv + 2));\r
+    }\r
     if (str_equiv(argv[1], _T("pause"))) exit(control_service(SERVICE_CONTROL_PAUSE, argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("continue"))) exit(control_service(SERVICE_CONTROL_CONTINUE, argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("status"))) exit(control_service(SERVICE_CONTROL_INTERROGATE, argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("rotate"))) exit(control_service(NSSM_SERVICE_CONTROL_ROTATE, argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("install"))) {\r
-      if (! is_admin) {\r
-        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL);\r
-        exit(100);\r
-      }\r
+      if (! is_admin) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL));\r
       exit(pre_install_service(argc - 2, argv + 2));\r
     }\r
     if (str_equiv(argv[1], _T("edit")) || str_equiv(argv[1], _T("get")) || str_equiv(argv[1], _T("set")) || str_equiv(argv[1], _T("reset")) || str_equiv(argv[1], _T("unset"))) {\r
-      if (! is_admin) {\r
-        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_EDIT);\r
-        exit(100);\r
-      }\r
       int ret = pre_edit_service(argc - 1, argv + 1);\r
+      if (ret == 3 && ! is_admin && argc == 3) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_EDIT));\r
       /* There might be a password here. */\r
       for (int i = 0; i < argc; i++) SecureZeroMemory(argv[i], _tcslen(argv[i]) * sizeof(TCHAR));\r
       exit(ret);\r
     }\r
     if (str_equiv(argv[1], _T("remove"))) {\r
-      if (! is_admin) {\r
-        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE);\r
-        exit(100);\r
-      }\r
+      if (! is_admin) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE));\r
       exit(pre_remove_service(argc - 2, argv + 2));\r
     }\r
   }\r
@@ -151,10 +168,7 @@ int _tmain(int argc, TCHAR **argv) {
     actually running as a service.\r
     This will save time when running with no arguments from a command prompt.\r
   */\r
-  if (_fileno(stdin) < 0) {\r
-    /* Set up function pointers. */\r
-    if (get_imports()) exit(111);\r
-\r
+  if (! GetStdHandle(STD_INPUT_HANDLE)) {\r
     /* Start service magic */\r
     SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };\r
     if (! StartServiceCtrlDispatcher(table)) {\r