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