X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.h;h=1479f102c67c7939dfc4733add686110f3de4810;hb=98a2516c22eefd912301ff3c39736da8970dcdff;hp=7ab05462582a82142bc95982801dfff7eabb246f;hpb=41c7f8e693c62221d54e91969baeacbea09a14e6;p=nssm.git

diff --git a/nssm.h b/nssm.h
index 7ab0546..1479f10 100644
--- a/nssm.h
+++ b/nssm.h
@@ -7,17 +7,20 @@
 #include <stdio.h>
 #include <windows.h>
 #include "event.h"
+#include "imports.h"
 #include "messages.h"
 #include "process.h"
 #include "registry.h"
+#include "io.h"
 #include "service.h"
 #include "gui.h"
 
 int str_equiv(const char *, const char *);
 
 #define NSSM "nssm"
-#define NSSM_VERSION "2.16"
-#define NSSM_DATE "2012-12-01"
+#define NSSM_VERSION "2.18"
+#define NSSM_VERSIONINFO 2,18,0,0
+#define NSSM_DATE "2013-11-15"
 
 /*
   MSDN says the commandline in CreateProcess() is limited to 32768 characters
@@ -38,18 +41,32 @@ int str_equiv(const char *, const char *);
 */
 #define NSSM_RESET_THROTTLE_RESTART 1500
 
+/*
+  How many milliseconds to wait for the application to die after sending
+  a Control-C event to its console.  Override in registry.
+*/
+#define NSSM_KILL_CONSOLE_GRACE_PERIOD 1500
 /*
   How many milliseconds to wait for the application to die after posting to
-  its windows' message queues.
+  its windows' message queues.  Override in registry.
 */
 #define NSSM_KILL_WINDOW_GRACE_PERIOD 1500
 /*
   How many milliseconds to wait for the application to die after posting to
-  its threads' message queues.
+  its threads' message queues.  Override in registry.
 */
 #define NSSM_KILL_THREADS_GRACE_PERIOD 1500
 
 /* Margin of error for service status wait hints in milliseconds. */
 #define NSSM_WAITHINT_MARGIN 2000
 
+/* Methods used to try to stop the application. */
+#define NSSM_STOP_METHOD_CONSOLE (1 << 0)
+#define NSSM_STOP_METHOD_WINDOW (1 << 1)
+#define NSSM_STOP_METHOD_THREADS (1 << 2)
+#define NSSM_STOP_METHOD_TERMINATE (1 << 3)
+
+/* How many milliseconds to wait before updating service status. */
+#define NSSM_SERVICE_STATUS_DEADLINE 20000
+
 #endif