X-Git-Url: http://git.iain.cx/?p=nssm.git;a=blobdiff_plain;f=hook.cpp;h=abe4577bb7c34630f2a09c39cb338c098b77fbbe;hp=01e3a50f74c61ea0057110155f245b2e9c7259b9;hb=HEAD;hpb=b6f7fe3b11fd130f46eb6b5009391cc3bb0cad49

diff --git a/hook.cpp b/hook.cpp
index 01e3a50..abe4577 100644
--- a/hook.cpp
+++ b/hook.cpp
@@ -9,6 +9,9 @@ typedef struct {
   kill_t k;
 } hook_t;
 
+const TCHAR *hook_event_strings[] = { NSSM_HOOK_EVENT_START, NSSM_HOOK_EVENT_STOP, NSSM_HOOK_EVENT_EXIT, NSSM_HOOK_EVENT_POWER, NSSM_HOOK_EVENT_ROTATE, NULL };
+const TCHAR *hook_action_strings[] = { NSSM_HOOK_ACTION_PRE, NSSM_HOOK_ACTION_POST, NSSM_HOOK_ACTION_CHANGE, NSSM_HOOK_ACTION_RESUME, NULL };
+
 static unsigned long WINAPI await_hook(void *arg) {
   hook_t *hook = (hook_t *) arg;
   if (! hook) return NSSM_HOOK_STATUS_ERROR;
@@ -344,12 +347,16 @@ int nssm_hook(hook_thread_t *hook_threads, nssm_service_t *service, TCHAR *hook_
   si.cb = sizeof(si);
   PROCESS_INFORMATION pi;
   ZeroMemory(&pi, sizeof(pi));
+  if (service->hook_share_output_handles) (void) use_output_handles(service, &si);
+  bool inherit_handles = false;
+  if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;
   unsigned long flags = 0;
 #ifdef UNICODE
   flags |= CREATE_UNICODE_ENVIRONMENT;
 #endif
   ret = NSSM_HOOK_STATUS_NOTRUN;
-  if (CreateProcess(0, cmd, 0, 0, false, flags, 0, service->dir, &si, &pi)) {
+  if (CreateProcess(0, cmd, 0, 0, inherit_handles, flags, 0, service->dir, &si, &pi)) {
+    close_output_handles(&si);
     hook->name = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, HOOK_NAME_LENGTH * sizeof(TCHAR));
     if (hook->name) _sntprintf_s(hook->name, HOOK_NAME_LENGTH, _TRUNCATE, _T("%s (%s/%s)"), service->name, hook_event, hook_action);
     hook->process_handle = pi.hProcess;
@@ -383,6 +390,7 @@ int nssm_hook(hook_thread_t *hook_threads, nssm_service_t *service, TCHAR *hook_
   else {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_HOOK_CREATEPROCESS_FAILED, hook_event, hook_action, service->name, cmd, error_string(GetLastError()), 0);
     HeapFree(GetProcessHeap(), 0, hook);
+    close_output_handles(&si);
   }
 
   /* Restore our environment. */