|
@@ -1,13 +1,13 @@
|
|
|
#include "nssm.h"
|
|
|
|
|
|
-extern const char *exit_action_strings[];
|
|
|
+extern const TCHAR *exit_action_strings[];
|
|
|
|
|
|
int create_messages() {
|
|
|
HKEY key;
|
|
|
|
|
|
- char registry[KEY_LENGTH];
|
|
|
- if (_snprintf_s(registry, sizeof(registry), _TRUNCATE, "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\%s", NSSM) < 0) {
|
|
|
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "eventlog registry", "create_messages()", 0);
|
|
|
+ TCHAR registry[KEY_LENGTH];
|
|
|
+ if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, _T("SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\%s"), NSSM) < 0) {
|
|
|
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("eventlog registry"), _T("create_messages()"), 0);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
@@ -17,22 +17,22 @@ int create_messages() {
|
|
|
}
|
|
|
|
|
|
/* Get path of this program */
|
|
|
- char path[MAX_PATH];
|
|
|
- GetModuleFileName(0, path, MAX_PATH);
|
|
|
+ TCHAR path[MAX_PATH];
|
|
|
+ GetModuleFileName(0, path, _countof(path));
|
|
|
|
|
|
/* Try to register the module but don't worry so much on failure */
|
|
|
- RegSetValueEx(key, "EventMessageFile", 0, REG_SZ, (const unsigned char *) path, (unsigned long) strlen(path) + 1);
|
|
|
+ RegSetValueEx(key, _T("EventMessageFile"), 0, REG_SZ, (const unsigned char *) path, (unsigned long) (_tcslen(path) + 1) * sizeof(TCHAR));
|
|
|
unsigned long types = EVENTLOG_INFORMATION_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_ERROR_TYPE;
|
|
|
- RegSetValueEx(key, "TypesSupported", 0, REG_DWORD, (const unsigned char *) &types, sizeof(types));
|
|
|
+ RegSetValueEx(key, _T("TypesSupported"), 0, REG_DWORD, (const unsigned char *) &types, sizeof(types));
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
int create_parameters(nssm_service_t *service) {
|
|
|
/* Get registry */
|
|
|
- char registry[KEY_LENGTH];
|
|
|
- if (_snprintf_s(registry, sizeof(registry), _TRUNCATE, NSSM_REGISTRY, service->name) < 0) {
|
|
|
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "NSSM_REGISTRY", "create_parameters()", 0);
|
|
|
+ TCHAR registry[KEY_LENGTH];
|
|
|
+ if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY, service->name) < 0) {
|
|
|
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("NSSM_REGISTRY"), _T("create_parameters()"), 0);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
@@ -89,12 +89,12 @@ int create_parameters(nssm_service_t *service) {
|
|
|
|
|
|
/* Environment */
|
|
|
if (service->env) {
|
|
|
- if (RegSetValueEx(key, NSSM_REG_ENV, 0, REG_MULTI_SZ, (const unsigned char *) service->env, (unsigned long) service->envlen) != ERROR_SUCCESS) {
|
|
|
+ if (RegSetValueEx(key, NSSM_REG_ENV, 0, REG_MULTI_SZ, (const unsigned char *) service->env, (unsigned long) service->envlen * sizeof(TCHAR)) != ERROR_SUCCESS) {
|
|
|
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);
|
|
|
}
|
|
|
}
|
|
|
if (service->env_extra) {
|
|
|
- if (RegSetValueEx(key, NSSM_REG_ENV_EXTRA, 0, REG_MULTI_SZ, (const unsigned char *) service->env_extra, (unsigned long) service->env_extralen) != ERROR_SUCCESS) {
|
|
|
+ if (RegSetValueEx(key, NSSM_REG_ENV_EXTRA, 0, REG_MULTI_SZ, (const unsigned char *) service->env_extra, (unsigned long) service->env_extralen * sizeof(TCHAR)) != ERROR_SUCCESS) {
|
|
|
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV_EXTRA, error_string(GetLastError()), 0);
|
|
|
}
|
|
|
}
|
|
@@ -105,11 +105,11 @@ int create_parameters(nssm_service_t *service) {
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-int create_exit_action(char *service_name, const char *action_string) {
|
|
|
+int create_exit_action(TCHAR *service_name, const TCHAR *action_string) {
|
|
|
/* Get registry */
|
|
|
- char registry[KEY_LENGTH];
|
|
|
- if (_snprintf_s(registry, sizeof(registry), _TRUNCATE, NSSM_REGISTRY "\\%s", service_name, NSSM_REG_EXIT) < 0) {
|
|
|
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "NSSM_REG_EXIT", "create_exit_action()", 0);
|
|
|
+ TCHAR registry[KEY_LENGTH];
|
|
|
+ if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY _T("\\%s"), service_name, NSSM_REG_EXIT) < 0) {
|
|
|
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("NSSM_REG_EXIT"), _T("create_exit_action()"), 0);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
@@ -128,7 +128,7 @@ int create_exit_action(char *service_name, const char *action_string) {
|
|
|
}
|
|
|
|
|
|
/* Create the default value */
|
|
|
- if (RegSetValueEx(key, 0, 0, REG_SZ, (const unsigned char *) action_string, (unsigned long) strlen(action_string) + 1) != ERROR_SUCCESS) {
|
|
|
+ if (RegSetValueEx(key, 0, 0, REG_SZ, (const unsigned char *) action_string, (unsigned long) (_tcslen(action_string) + 1) * sizeof(TCHAR)) != ERROR_SUCCESS) {
|
|
|
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_EXIT, error_string(GetLastError()), 0);
|
|
|
RegCloseKey(key);
|
|
|
return 3;
|
|
@@ -140,7 +140,7 @@ int create_exit_action(char *service_name, const char *action_string) {
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-int set_environment(char *service_name, HKEY key, char *value, char **env, unsigned long *envlen) {
|
|
|
+int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {
|
|
|
unsigned long type = REG_MULTI_SZ;
|
|
|
|
|
|
/* Dummy test to find buffer size */
|
|
@@ -164,9 +164,9 @@ int set_environment(char *service_name, HKEY key, char *value, char **env, unsig
|
|
|
/* Previously initialised? */
|
|
|
if (*env) HeapFree(GetProcessHeap(), 0, *env);
|
|
|
|
|
|
- *env = (char *) HeapAlloc(GetProcessHeap(), 0, *envlen);
|
|
|
+ *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, *envlen);
|
|
|
if (! *env) {
|
|
|
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, "set_environment()", 0);
|
|
|
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("set_environment()"), 0);
|
|
|
return 3;
|
|
|
}
|
|
|
|
|
@@ -183,10 +183,10 @@ int set_environment(char *service_name, HKEY key, char *value, char **env, unsig
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise, bool must_exist) {
|
|
|
- unsigned char *buffer = (unsigned char *) HeapAlloc(GetProcessHeap(), 0, datalen);
|
|
|
+int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {
|
|
|
+ TCHAR *buffer = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, datalen);
|
|
|
if (! buffer) {
|
|
|
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, "expand_parameter()", 0);
|
|
|
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("expand_parameter()"), 0);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
@@ -195,7 +195,7 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
|
|
|
unsigned long type = REG_EXPAND_SZ;
|
|
|
unsigned long buflen = datalen;
|
|
|
|
|
|
- unsigned long ret = RegQueryValueEx(key, value, 0, &type, buffer, &buflen);
|
|
|
+ unsigned long ret = RegQueryValueEx(key, value, 0, &type, (unsigned char *) buffer, &buflen);
|
|
|
if (ret != ERROR_SUCCESS) {
|
|
|
unsigned long error = GetLastError();
|
|
|
HeapFree(GetProcessHeap(), 0, buffer);
|
|
@@ -209,7 +209,7 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
|
|
|
}
|
|
|
|
|
|
/* Paths aren't allowed to contain quotes. */
|
|
|
- if (sanitise) PathUnquoteSpaces((LPSTR) buffer);
|
|
|
+ if (sanitise) PathUnquoteSpaces(buffer);
|
|
|
|
|
|
/* Technically we shouldn't expand environment strings from REG_SZ values */
|
|
|
if (type != REG_EXPAND_SZ) {
|
|
@@ -218,7 +218,7 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- ret = ExpandEnvironmentStrings((char *) buffer, data, datalen);
|
|
|
+ ret = ExpandEnvironmentStrings((TCHAR *) buffer, data, datalen);
|
|
|
if (! ret || ret > datalen) {
|
|
|
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_EXPANDENVIRONMENTSTRINGS_FAILED, buffer, error_string(GetLastError()), 0);
|
|
|
HeapFree(GetProcessHeap(), 0, buffer);
|
|
@@ -229,7 +229,7 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise) {
|
|
|
+int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {
|
|
|
return expand_parameter(key, value, data, datalen, sanitise, true);
|
|
|
}
|
|
|
|
|
@@ -238,8 +238,8 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
|
|
|
Returns: 0 if it was set.
|
|
|
1 on error.
|
|
|
*/
|
|
|
-int set_expand_string(HKEY key, char *value, char *string) {
|
|
|
- if (RegSetValueEx(key, value, 0, REG_EXPAND_SZ, (const unsigned char *) string, (unsigned long) strlen(string) + 1) == ERROR_SUCCESS) return 0;
|
|
|
+int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {
|
|
|
+ if (RegSetValueEx(key, value, 0, REG_EXPAND_SZ, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;
|
|
|
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0);
|
|
|
return 1;
|
|
|
}
|
|
@@ -249,7 +249,7 @@ int set_expand_string(HKEY key, char *value, char *string) {
|
|
|
Returns: 0 if it was set.
|
|
|
1 on error.
|
|
|
*/
|
|
|
-int set_number(HKEY key, char *value, unsigned long number) {
|
|
|
+int set_number(HKEY key, TCHAR *value, unsigned long number) {
|
|
|
if (RegSetValueEx(key, value, 0, REG_DWORD, (const unsigned char *) &number, sizeof(number)) == ERROR_SUCCESS) return 0;
|
|
|
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0);
|
|
|
return 1;
|
|
@@ -262,7 +262,7 @@ int set_number(HKEY key, char *value, unsigned long number) {
|
|
|
-1 if none was found and must_exist is true.
|
|
|
-2 otherwise.
|
|
|
*/
|
|
|
-int get_number(HKEY key, char *value, unsigned long *number, bool must_exist) {
|
|
|
+int get_number(HKEY key, TCHAR *value, unsigned long *number, bool must_exist) {
|
|
|
unsigned long type = REG_DWORD;
|
|
|
unsigned long number_len = sizeof(unsigned long);
|
|
|
|
|
@@ -279,11 +279,11 @@ int get_number(HKEY key, char *value, unsigned long *number, bool must_exist) {
|
|
|
return -2;
|
|
|
}
|
|
|
|
|
|
-int get_number(HKEY key, char *value, unsigned long *number) {
|
|
|
+int get_number(HKEY key, TCHAR *value, unsigned long *number) {
|
|
|
return get_number(key, value, number, true);
|
|
|
}
|
|
|
|
|
|
-void override_milliseconds(char *service_name, HKEY key, char *value, unsigned long *buffer, unsigned long default_value, unsigned long event) {
|
|
|
+void override_milliseconds(TCHAR *service_name, HKEY key, TCHAR *value, unsigned long *buffer, unsigned long default_value, unsigned long event) {
|
|
|
unsigned long type = REG_DWORD;
|
|
|
unsigned long buflen = sizeof(unsigned long);
|
|
|
bool ok = false;
|
|
@@ -291,8 +291,8 @@ void override_milliseconds(char *service_name, HKEY key, char *value, unsigned l
|
|
|
if (ret != ERROR_SUCCESS) {
|
|
|
if (ret != ERROR_FILE_NOT_FOUND) {
|
|
|
if (type != REG_DWORD) {
|
|
|
- char milliseconds[16];
|
|
|
- _snprintf_s(milliseconds, sizeof(milliseconds), _TRUNCATE, "%lu", default_value);
|
|
|
+ TCHAR milliseconds[16];
|
|
|
+ _sntprintf_s(milliseconds, _countof(milliseconds), _TRUNCATE, _T("%lu"), default_value);
|
|
|
log_event(EVENTLOG_WARNING_TYPE, event, service_name, value, milliseconds, 0);
|
|
|
}
|
|
|
else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);
|
|
@@ -307,9 +307,9 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
|
|
|
unsigned long ret;
|
|
|
|
|
|
/* Get registry */
|
|
|
- char registry[KEY_LENGTH];
|
|
|
- if (_snprintf_s(registry, sizeof(registry), _TRUNCATE, NSSM_REGISTRY, service->name) < 0) {
|
|
|
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "NSSM_REGISTRY", "get_parameters()", 0);
|
|
|
+ TCHAR registry[KEY_LENGTH];
|
|
|
+ if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY, service->name) < 0) {
|
|
|
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("NSSM_REGISTRY"), _T("get_parameters()"), 0);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
@@ -334,14 +334,9 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
|
|
|
|
|
|
/* Try to get startup directory - may fail and we fall back to a default */
|
|
|
if (expand_parameter(key, NSSM_REG_DIR, service->dir, sizeof(service->dir), true) || ! service->dir[0]) {
|
|
|
- /* Our buffers are defined to be long enough for this to be safe */
|
|
|
- size_t i;
|
|
|
- for (i = strlen(service->exe); i && service->exe[i] != '\\' && service->exe[i] != '/'; i--);
|
|
|
- if (i) {
|
|
|
- memmove(service->dir, service->exe, i);
|
|
|
- service->dir[i] = '\0';
|
|
|
- }
|
|
|
- else {
|
|
|
+ _sntprintf_s(service->dir, _countof(service->dir), _TRUNCATE, _T("%s"), service->exe);
|
|
|
+ strip_basename(service->dir);
|
|
|
+ if (service->dir[0] == _T('\0')) {
|
|
|
/* Help! */
|
|
|
ret = GetWindowsDirectory(service->dir, sizeof(service->dir));
|
|
|
if (! ret || ret > sizeof(service->dir)) {
|
|
@@ -363,28 +358,29 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
|
|
|
if (service->env) {
|
|
|
/* Append extra variables to configured variables. */
|
|
|
unsigned long envlen = service->envlen + service->env_extralen - 1;
|
|
|
- char *env = (char *) HeapAlloc(GetProcessHeap(), 0, envlen);
|
|
|
+ TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);
|
|
|
if (env) {
|
|
|
- memmove(env, service->env, service->envlen - 1);
|
|
|
- memmove(env + service->envlen - 1, service->env_extra, service->env_extralen);
|
|
|
+ memmove(env, service->env, service->envlen - sizeof(TCHAR));
|
|
|
+ /* envlen is in bytes. */
|
|
|
+ memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);
|
|
|
|
|
|
HeapFree(GetProcessHeap(), 0, service->env);
|
|
|
service->env = env;
|
|
|
service->envlen = envlen;
|
|
|
}
|
|
|
- else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "environment", "get_parameters()", 0);
|
|
|
+ else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);
|
|
|
}
|
|
|
else {
|
|
|
/* Append extra variables to our environment. */
|
|
|
- char *env, *s;
|
|
|
+ TCHAR *env, *s;
|
|
|
size_t envlen, len;
|
|
|
|
|
|
env = service->env_extra;
|
|
|
len = 0;
|
|
|
while (*env) {
|
|
|
- envlen = strlen(env) + 1;
|
|
|
- for (s = env; *s && *s != '='; s++);
|
|
|
- if (*s == '=') *s++ = '\0';
|
|
|
+ envlen = _tcslen(env) + 1;
|
|
|
+ for (s = env; *s && *s != _T('='); s++);
|
|
|
+ if (*s == _T('=')) *s++ = _T('\0');
|
|
|
if (! SetEnvironmentVariable(env, s)) log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_SETENVIRONMENTVARIABLE_FAILED, env, s, error_string(GetLastError()));
|
|
|
env += envlen;
|
|
|
}
|
|
@@ -432,14 +428,14 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-int get_exit_action(char *service_name, unsigned long *ret, unsigned char *action, bool *default_action) {
|
|
|
+int get_exit_action(TCHAR *service_name, unsigned long *ret, TCHAR *action, bool *default_action) {
|
|
|
/* Are we returning the default action or a status-specific one? */
|
|
|
*default_action = ! ret;
|
|
|
|
|
|
/* Get registry */
|
|
|
- char registry[KEY_LENGTH];
|
|
|
- if (_snprintf_s(registry, sizeof(registry), _TRUNCATE, NSSM_REGISTRY "\\%s", service_name, NSSM_REG_EXIT) < 0) {
|
|
|
- log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "NSSM_REG_EXIT", "get_exit_action()", 0);
|
|
|
+ TCHAR registry[KEY_LENGTH];
|
|
|
+ if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY _T("\\%s"), service_name, NSSM_REG_EXIT) < 0) {
|
|
|
+ log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("NSSM_REG_EXIT"), _T("get_exit_action()"), 0);
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
@@ -454,13 +450,13 @@ int get_exit_action(char *service_name, unsigned long *ret, unsigned char *actio
|
|
|
unsigned long type = REG_SZ;
|
|
|
unsigned long action_len = ACTION_LEN;
|
|
|
|
|
|
- char code[64];
|
|
|
- if (! ret) code[0] = '\0';
|
|
|
- else if (_snprintf_s(code, sizeof(code), _TRUNCATE, "%lu", *ret) < 0) {
|
|
|
+ TCHAR code[16];
|
|
|
+ if (! ret) code[0] = _T('\0');
|
|
|
+ else if (_sntprintf_s(code, _countof(code), _TRUNCATE, _T("%lu"), *ret) < 0) {
|
|
|
RegCloseKey(key);
|
|
|
return get_exit_action(service_name, 0, action, default_action);
|
|
|
}
|
|
|
- if (RegQueryValueEx(key, code, 0, &type, action, &action_len) != ERROR_SUCCESS) {
|
|
|
+ if (RegQueryValueEx(key, code, 0, &type, (unsigned char *) action, &action_len) != ERROR_SUCCESS) {
|
|
|
RegCloseKey(key);
|
|
|
/* Try again with * as the key if an exit code was defined */
|
|
|
if (ret) return get_exit_action(service_name, 0, action, default_action);
|