\r
extern imports_t imports;\r
\r
-const char *exit_action_strings[] = { "Restart", "Ignore", "Exit", "Suicide", 0 };\r
+const TCHAR *exit_action_strings[] = { _T("Restart"), _T("Ignore"), _T("Exit"), _T("Suicide"), 0 };\r
\r
static inline int throttle_milliseconds(unsigned long throttle) {\r
/* pow() operates on doubles. */\r
return ret;\r
}\r
\r
+/* Set default values which aren't zero. */\r
+void set_nssm_service_defaults(nssm_service_t *service) {\r
+ if (! service) return;\r
+\r
+ service->type = SERVICE_WIN32_OWN_PROCESS;\r
+ service->stdin_sharing = NSSM_STDIN_SHARING;\r
+ service->stdin_disposition = NSSM_STDIN_DISPOSITION;\r
+ service->stdin_flags = NSSM_STDIN_FLAGS;\r
+ service->stdout_sharing = NSSM_STDOUT_SHARING;\r
+ service->stdout_disposition = NSSM_STDOUT_DISPOSITION;\r
+ service->stdout_flags = NSSM_STDOUT_FLAGS;\r
+ service->stderr_sharing = NSSM_STDERR_SHARING;\r
+ service->stderr_disposition = NSSM_STDERR_DISPOSITION;\r
+ service->stderr_flags = NSSM_STDERR_FLAGS;\r
+ service->throttle_delay = NSSM_RESET_THROTTLE_RESTART;\r
+ service->stop_method = ~0;\r
+ service->kill_console_delay = NSSM_KILL_CONSOLE_GRACE_PERIOD;\r
+ service->kill_window_delay = NSSM_KILL_WINDOW_GRACE_PERIOD;\r
+ service->kill_threads_delay = NSSM_KILL_THREADS_GRACE_PERIOD;\r
+}\r
+\r
/* Allocate and zero memory for a service. */\r
nssm_service_t *alloc_nssm_service() {\r
nssm_service_t *service = (nssm_service_t *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(nssm_service_t));\r
- if (! service) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "service", "alloc_nssm_service()", 0);\r
+ if (! service) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("service"), _T("alloc_nssm_service()"), 0);\r
return service;\r
}\r
\r
/* Free memory for a service. */\r
void cleanup_nssm_service(nssm_service_t *service) {\r
if (! service) return;\r
+ if (service->username) HeapFree(GetProcessHeap(), 0, service->username);\r
+ if (service->password) {\r
+ SecureZeroMemory(service->password, service->passwordlen);\r
+ HeapFree(GetProcessHeap(), 0, service->password);\r
+ }\r
if (service->env) HeapFree(GetProcessHeap(), 0, service->env);\r
+ if (service->env_extra) HeapFree(GetProcessHeap(), 0, service->env_extra);\r
if (service->handle) CloseServiceHandle(service->handle);\r
if (service->process_handle) CloseHandle(service->process_handle);\r
if (service->wait_handle) UnregisterWait(service->process_handle);\r
}\r
\r
/* About to install the service */\r
-int pre_install_service(int argc, char **argv) {\r
+int pre_install_service(int argc, TCHAR **argv) {\r
/* Show the dialogue box if we didn't give the service name and path */\r
if (argc < 2) return nssm_gui(IDD_INSTALL, argv[0]);\r
\r
nssm_service_t *service = alloc_nssm_service();\r
if (! service) {\r
- print_message(stderr, NSSM_EVENT_OUT_OF_MEMORY, "service", "pre_install_service()");\r
+ print_message(stderr, NSSM_EVENT_OUT_OF_MEMORY, _T("service"), _T("pre_install_service()"));\r
return 1;\r
}\r
\r
- memmove(service->name, argv[0], strlen(argv[0]));\r
- memmove(service->exe, argv[1], strlen(argv[1]));\r
+ set_nssm_service_defaults(service);\r
+ _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), argv[0]);\r
+ _sntprintf_s(service->exe, _countof(service->exe), _TRUNCATE, _T("%s"), argv[1]);\r
\r
/* Arguments are optional */\r
size_t flagslen = 0;\r
size_t s = 0;\r
- size_t i;\r
- for (i = 2; i < argc; i++) flagslen += strlen(argv[i]) + 1;\r
+ int i;\r
+ for (i = 2; i < argc; i++) flagslen += _tcslen(argv[i]) + 1;\r
if (! flagslen) flagslen = 1;\r
+ if (flagslen > _countof(service->flags)) {\r
+ print_message(stderr, NSSM_MESSAGE_FLAGS_TOO_LONG);\r
+ return 2;\r
+ }\r
\r
- /*\r
- This probably isn't UTF8-safe and should use std::string or something\r
- but it's been broken for the best part of a decade and due for a rewrite\r
- anyway so it'll do as a quick-'n'-dirty fix. Note that we don't free\r
- the flags buffer but as the program exits that isn't a big problem.\r
- */\r
for (i = 2; i < argc; i++) {\r
- size_t len = strlen(argv[i]);\r
- memmove(service->flags + s, argv[i], len);\r
+ size_t len = _tcslen(argv[i]);\r
+ memmove(service->flags + s, argv[i], len * sizeof(TCHAR));\r
s += len;\r
- if (i < argc - 1) service->flags[s++] = ' ';\r
+ if (i < argc - 1) service->flags[s++] = _T(' ');\r
}\r
\r
/* Work out directory name */\r
- size_t len = strlen(service->exe);\r
- for (i = len; i && service->exe[i] != '\\' && service->exe[i] != '/'; i--);\r
- memmove(service->dir, service->exe, i);\r
- service->dir[i] = '\0';\r
+ _sntprintf_s(service->dir, _countof(service->dir), _TRUNCATE, _T("%s"), service->exe);\r
+ strip_basename(service->dir);\r
\r
int ret = install_service(service);\r
cleanup_nssm_service(service);\r
}\r
\r
/* About to remove the service */\r
-int pre_remove_service(int argc, char **argv) {\r
+int pre_remove_service(int argc, TCHAR **argv) {\r
/* Show dialogue box if we didn't pass service name and "confirm" */\r
if (argc < 2) return nssm_gui(IDD_REMOVE, argv[0]);\r
- if (str_equiv(argv[1], "confirm")) {\r
+ if (str_equiv(argv[1], _T("confirm"))) {\r
nssm_service_t *service = alloc_nssm_service();\r
- memmove(service->name, argv[0], strlen(argv[0]));\r
+ _sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), argv[0]);\r
int ret = remove_service(service);\r
cleanup_nssm_service(service);\r
return ret;\r
}\r
\r
/* Get path of this program */\r
- char path[MAX_PATH];\r
- GetModuleFileName(0, path, MAX_PATH);\r
-\r
- /* Construct command */\r
- char command[CMD_LENGTH];\r
- size_t pathlen = strlen(path);\r
- if (pathlen + 1 >= VALUE_LENGTH) {\r
- print_message(stderr, NSSM_MESSAGE_PATH_TOO_LONG, NSSM);\r
- return 3;\r
- }\r
- if (_snprintf_s(command, sizeof(command), _TRUNCATE, "\"%s\"", path) < 0) {\r
- print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY_FOR_IMAGEPATH);\r
- return 4;\r
+ TCHAR command[MAX_PATH];\r
+ GetModuleFileName(0, command, _countof(command));\r
+\r
+ /*\r
+ The only two valid flags for service type are SERVICE_WIN32_OWN_PROCESS\r
+ and SERVICE_INTERACTIVE_PROCESS.\r
+ */\r
+ service->type &= SERVICE_INTERACTIVE_PROCESS;\r
+ service->type |= SERVICE_WIN32_OWN_PROCESS;\r
+\r
+ /* Startup type. */\r
+ unsigned long startup;\r
+ switch (service->startup) {\r
+ case NSSM_STARTUP_MANUAL: startup = SERVICE_DEMAND_START; break;\r
+ case NSSM_STARTUP_DISABLED: startup = SERVICE_DISABLED; break;\r
+ default: startup = SERVICE_AUTO_START;\r
}\r
\r
+ /* Display name. */\r
+ if (! service->displayname[0]) _sntprintf_s(service->displayname, _countof(service->displayname), _TRUNCATE, _T("%s"), service->name);\r
+\r
/* Create the service */\r
- service->handle = CreateService(services, service->name, service->name, SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, command, 0, 0, 0, 0, 0);\r
+ service->handle = CreateService(services, service->name, service->displayname, SC_MANAGER_ALL_ACCESS, service->type, startup, SERVICE_ERROR_NORMAL, command, 0, 0, 0, service->username, service->password);\r
if (! service->handle) {\r
print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED);\r
CloseServiceHandle(services);\r
return 5;\r
}\r
\r
+ if (service->description[0]) {\r
+ SERVICE_DESCRIPTION description;\r
+ ZeroMemory(&description, sizeof(description));\r
+ description.lpDescription = service->description;\r
+ if (! ChangeServiceConfig2(service->handle, SERVICE_CONFIG_DESCRIPTION, &description)) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_DESCRIPTION_FAILED, service->name, error_string(GetLastError()), 0);\r
+ }\r
+ }\r
+\r
+ if (service->startup == NSSM_STARTUP_DELAYED) {\r
+ SERVICE_DELAYED_AUTO_START_INFO delayed;\r
+ ZeroMemory(&delayed, sizeof(delayed));\r
+ delayed.fDelayedAutostart = 1;\r
+ /* Delayed startup isn't supported until Vista. */\r
+ if (! ChangeServiceConfig2(service->handle, SERVICE_CONFIG_DELAYED_AUTO_START_INFO, &delayed)) {\r
+ unsigned long error = GetLastError();\r
+ /* Pre-Vista we expect to fail with ERROR_INVALID_LEVEL */\r
+ if (error != ERROR_INVALID_LEVEL) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_DELAYED_AUTO_START_INFO_FAILED, service->name, error_string(error), 0);\r
+ }\r
+ }\r
+ }\r
+\r
/* Now we need to put the parameters into the registry */\r
if (create_parameters(service)) {\r
print_message(stderr, NSSM_MESSAGE_CREATE_PARAMETERS_FAILED);\r
}\r
\r
/* Service initialisation */\r
-void WINAPI service_main(unsigned long argc, char **argv) {\r
+void WINAPI service_main(unsigned long argc, TCHAR **argv) {\r
nssm_service_t *service = alloc_nssm_service();\r
if (! service) return;\r
\r
- if (_snprintf_s(service->name, sizeof(service->name), _TRUNCATE, "%s", argv[0]) < 0) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "service->name", "service_main()", 0);\r
+ if (_sntprintf_s(service->name, _countof(service->name), _TRUNCATE, _T("%s"), argv[0]) < 0) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("service->name"), _T("service_main()"), 0);\r
return;\r
}\r
\r
unsigned long error = GetLastError();\r
/* Pre-Vista we expect to fail with ERROR_INVALID_LEVEL */\r
if (error != ERROR_INVALID_LEVEL) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CHANGESERVICECONFIG2_FAILED, service->name, error_string(error), 0);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SERVICE_CONFIG_FAILURE_ACTIONS_FAILED, service->name, error_string(error), 0);\r
}\r
}\r
}\r
/* Set service status to started */\r
int ret = start_service(service);\r
if (ret) {\r
- char code[16];\r
- _snprintf_s(code, sizeof(code), _TRUNCATE, "%d", ret);\r
+ TCHAR code[16];\r
+ _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%d"), ret);\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, service->exe, service->name, ret, 0);\r
return ret;\r
}\r
return 0;\r
}\r
\r
-char *service_control_text(unsigned long control) {\r
+TCHAR *service_control_text(unsigned long control) {\r
switch (control) {\r
/* HACK: there is no SERVICE_CONTROL_START constant */\r
- case 0: return "START";\r
- case SERVICE_CONTROL_STOP: return "STOP";\r
- case SERVICE_CONTROL_SHUTDOWN: return "SHUTDOWN";\r
- case SERVICE_CONTROL_PAUSE: return "PAUSE";\r
- case SERVICE_CONTROL_CONTINUE: return "CONTINUE";\r
- case SERVICE_CONTROL_INTERROGATE: return "INTERROGATE";\r
+ case 0: return _T("START");\r
+ case SERVICE_CONTROL_STOP: return _T("STOP");\r
+ case SERVICE_CONTROL_SHUTDOWN: return _T("SHUTDOWN");\r
+ case SERVICE_CONTROL_PAUSE: return _T("PAUSE");\r
+ case SERVICE_CONTROL_CONTINUE: return _T("CONTINUE");\r
+ case SERVICE_CONTROL_INTERROGATE: return _T("INTERROGATE");\r
default: return 0;\r
}\r
}\r
\r
-void log_service_control(char *service_name, unsigned long control, bool handled) {\r
- char *text = service_control_text(control);\r
+void log_service_control(TCHAR *service_name, unsigned long control, bool handled) {\r
+ TCHAR *text = service_control_text(control);\r
unsigned long event;\r
\r
if (! text) {\r
/* "0x" + 8 x hex + NULL */\r
- text = (char *) HeapAlloc(GetProcessHeap(), 0, 11);\r
+ text = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, 11 * sizeof(TCHAR));\r
if (! text) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control()", 0);\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("control code"), _T("log_service_control()"), 0);\r
return;\r
}\r
- if (_snprintf_s(text, 11, _TRUNCATE, "0x%08x", control) < 0) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control()", 0);\r
+ if (_sntprintf_s(text, 11, _TRUNCATE, _T("0x%08x"), control) < 0) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("control code"), _T("log_service_control()"), 0);\r
HeapFree(GetProcessHeap(), 0, text);\r
return;\r
}\r
}\r
\r
/* Launch executable with arguments */\r
- char cmd[CMD_LENGTH];\r
- if (_snprintf_s(cmd, sizeof(cmd), _TRUNCATE, "\"%s\" %s", service->exe, service->flags) < 0) {\r
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "command line", "start_service", 0);\r
+ TCHAR cmd[CMD_LENGTH];\r
+ if (_sntprintf_s(cmd, _countof(cmd), _TRUNCATE, _T("\"%s\" %s"), service->exe, service->flags) < 0) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("command line"), _T("start_service"), 0);\r
close_output_handles(&si);\r
return stop_service(service, 2, true, true);\r
}\r
\r
bool inherit_handles = false;\r
if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;\r
- if (! CreateProcess(0, cmd, 0, 0, inherit_handles, 0, service->env, service->dir, &si, &pi)) {\r
+ unsigned long flags = 0;\r
+#ifdef UNICODE\r
+ flags |= CREATE_UNICODE_ENVIRONMENT;\r
+#endif\r
+ if (! CreateProcess(0, cmd, 0, 0, inherit_handles, flags, service->env, service->dir, &si, &pi)) {\r
+ unsigned long exitcode = 3;\r
unsigned long error = GetLastError();\r
- if (error == ERROR_INVALID_PARAMETER && service->env) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service->name, service->exe, NSSM_REG_ENV, 0);\r
+ if (error == ERROR_INVALID_PARAMETER && service->env) {\r
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service->name, service->exe, NSSM_REG_ENV, 0);\r
+ if (test_environment(service->env)) exitcode = 4;\r
+ }\r
else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service->name, service->exe, error_string(error), 0);\r
close_output_handles(&si);\r
- return stop_service(service, 3, true, true);\r
+ return stop_service(service, exitcode, true, true);\r
}\r
service->process_handle = pi.hProcess;\r
service->pid = pi.dwProcessId;\r
*/\r
unsigned long delay = service->throttle_delay;\r
if (delay > NSSM_SERVICE_STATUS_DEADLINE) {\r
- char delay_milliseconds[16];\r
- _snprintf_s(delay_milliseconds, sizeof(delay_milliseconds), _TRUNCATE, "%lu", delay);\r
- char deadline_milliseconds[16];\r
- _snprintf_s(deadline_milliseconds, sizeof(deadline_milliseconds), _TRUNCATE, "%lu", NSSM_SERVICE_STATUS_DEADLINE);\r
+ TCHAR delay_milliseconds[16];\r
+ _sntprintf_s(delay_milliseconds, _countof(delay_milliseconds), _TRUNCATE, _T("%lu"), delay);\r
+ TCHAR deadline_milliseconds[16];\r
+ _sntprintf_s(deadline_milliseconds, _countof(deadline_milliseconds), _TRUNCATE, _T("%lu"), NSSM_SERVICE_STATUS_DEADLINE);\r
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_STARTUP_DELAY_TOO_LONG, service->name, delay_milliseconds, NSSM, deadline_milliseconds, 0);\r
delay = NSSM_SERVICE_STATUS_DEADLINE;\r
}\r
}\r
\r
if (default_action && ! exitcode && ! graceful) {\r
- log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_GRACEFUL_SUICIDE, service->name, service->exe, exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_REALLY] ,0);\r
+ log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_GRACEFUL_SUICIDE, service->name, service->exe, exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_REALLY], 0);\r
graceful = true;\r
}\r
\r
\r
/* Check exit code */\r
unsigned long exitcode = 0;\r
- char code[16];\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
- CloseHandle(service->process_handle);\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
+ CloseHandle(service->process_handle);\r
+ }\r
+ else GetSystemTimeAsFileTime(&service->exit_time);\r
\r
service->process_handle = 0;\r
- service->pid = 0;\r
\r
/*\r
Log that the service ended BEFORE logging about killing the process\r
tree. See below for the possible values of the why argument.\r
*/\r
if (! why) {\r
- _snprintf_s(code, sizeof(code), _TRUNCATE, "%lu", exitcode);\r
+ _sntprintf_s(code, _countof(code), _TRUNCATE, _T("%lu"), exitcode);\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ENDED_SERVICE, service->exe, service->name, code, 0);\r
}\r
\r
/* Clean up. */\r
if (exitcode == STILL_ACTIVE) exitcode = 0;\r
- kill_process_tree(service, service->pid, exitcode, service->pid);\r
+ if (service->pid) kill_process_tree(service, service->pid, exitcode, service->pid);\r
+ service->pid = 0;\r
\r
/*\r
The why argument is true if our wait timed out or false otherwise.\r
\r
/* What action should we take? */\r
int action = NSSM_EXIT_RESTART;\r
- unsigned char action_string[ACTION_LEN];\r
+ TCHAR action_string[ACTION_LEN];\r
bool default_action;\r
if (! get_exit_action(service->name, &exitcode, action_string, &default_action)) {\r
for (int i = 0; exit_action_strings[i]; i++) {\r
- if (! _strnicmp((const char *) action_string, exit_action_strings[i], ACTION_LEN)) {\r
+ if (! _tcsnicmp((const TCHAR *) action_string, exit_action_strings[i], ACTION_LEN)) {\r
action = i;\r
break;\r
}\r
\r
if (service->throttle > 7) service->throttle = 8;\r
\r
- char threshold[8], milliseconds[8];\r
- _snprintf_s(threshold, sizeof(threshold), _TRUNCATE, "%lu", service->throttle_delay);\r
- _snprintf_s(milliseconds, sizeof(milliseconds), _TRUNCATE, "%lu", ms);\r
+ TCHAR threshold[8], milliseconds[8];\r
+ _sntprintf_s(threshold, _countof(threshold), _TRUNCATE, _T("%lu"), service->throttle_delay);\r
+ _sntprintf_s(milliseconds, _countof(milliseconds), _TRUNCATE, _T("%lu"), ms);\r
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service->name, threshold, milliseconds, 0);\r
\r
if (use_critical_section) EnterCriticalSection(&service->throttle_section);\r
0 if the wait completed.\r
-1 on error.\r
*/\r
-int await_shutdown(nssm_service_t *service, char *function_name, unsigned long timeout) {\r
+int await_shutdown(nssm_service_t *service, TCHAR *function_name, unsigned long timeout) {\r
unsigned long interval;\r
unsigned long waithint;\r
unsigned long ret;\r
unsigned long waited;\r
- char interval_milliseconds[16];\r
- char timeout_milliseconds[16];\r
- char waited_milliseconds[16];\r
- char *function = function_name;\r
+ TCHAR interval_milliseconds[16];\r
+ TCHAR timeout_milliseconds[16];\r
+ TCHAR waited_milliseconds[16];\r
+ TCHAR *function = function_name;\r
\r
/* Add brackets to function name. */\r
- size_t funclen = strlen(function_name) + 3;\r
- char *func = (char *) HeapAlloc(GetProcessHeap(), 0, funclen);\r
+ size_t funclen = _tcslen(function_name) + 3;\r
+ TCHAR *func = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, funclen * sizeof(TCHAR));\r
if (func) {\r
- if (_snprintf_s(func, funclen, _TRUNCATE, "%s()", function_name) > -1) function = func;\r
+ if (_sntprintf_s(func, funclen, _TRUNCATE, _T("%s()"), function_name) > -1) function = func;\r
}\r
\r
- _snprintf_s(timeout_milliseconds, sizeof(timeout_milliseconds), _TRUNCATE, "%lu", timeout);\r
+ _sntprintf_s(timeout_milliseconds, _countof(timeout_milliseconds), _TRUNCATE, _T("%lu"), timeout);\r
\r
waithint = service->status.dwWaitHint;\r
waited = 0;\r
SetServiceStatus(service->status_handle, &service->status);\r
\r
if (waited) {\r
- _snprintf_s(waited_milliseconds, sizeof(waited_milliseconds), _TRUNCATE, "%lu", waited);\r
- _snprintf_s(interval_milliseconds, sizeof(interval_milliseconds), _TRUNCATE, "%lu", interval);\r
+ _sntprintf_s(waited_milliseconds, _countof(waited_milliseconds), _TRUNCATE, _T("%lu"), waited);\r
+ _sntprintf_s(interval_milliseconds, _countof(interval_milliseconds), _TRUNCATE, _T("%lu"), interval);\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_AWAITING_SHUTDOWN, function, service->name, waited_milliseconds, interval_milliseconds, timeout_milliseconds, 0);\r
}\r
\r
git://git.iain.cx/iain / nssm.git / blobdiff