static HWND tablist[NSSM_NUM_TABS];\r
static int selected_tab;\r
\r
-int nssm_gui(int resource, char *name) {\r
+int nssm_gui(int resource, TCHAR *name) {\r
/* Create window */\r
HWND dlg = CreateDialog(0, MAKEINTRESOURCE(resource), 0, install_dlg);\r
if (! dlg) {\r
if (translated) *timeout = configured;\r
}\r
\r
-static inline void check_io(char *name, char *buffer, size_t bufsize, unsigned long control) {\r
+static inline void check_io(TCHAR *name, TCHAR *buffer, size_t bufsize, unsigned long control) {\r
if (! SendMessage(GetDlgItem(tablist[NSSM_TAB_IO], control), WM_GETTEXTLENGTH, 0, 0)) return;\r
if (GetDlgItemText(tablist[NSSM_TAB_IO], control, buffer, (int) bufsize)) return;\r
popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_MESSAGE_PATH_TOO_LONG, name);\r
\r
/* Get startup directory. */\r
if (! GetDlgItemText(tablist[NSSM_TAB_APPLICATION], IDC_DIR, service->dir, sizeof(service->dir))) {\r
- memmove(service->dir, service->exe, sizeof(service->dir));\r
+ _sntprintf_s(service->dir, _countof(service->dir), _TRUNCATE, _T("%s"), service->exe);\r
strip_basename(service->dir);\r
}\r
\r
if (service->default_exit_action == CB_ERR) service->default_exit_action = 0;\r
\r
/* Get I/O stuff. */\r
- check_io("stdin", service->stdin_path, sizeof(service->stdin_path), IDC_STDIN);\r
- check_io("stdout", service->stdout_path, sizeof(service->stdout_path), IDC_STDOUT);\r
- check_io("stderr", service->stderr_path, sizeof(service->stderr_path), IDC_STDERR);\r
+ check_io(_T("stdin"), service->stdin_path, sizeof(service->stdin_path), IDC_STDIN);\r
+ check_io(_T("stdout"), service->stdout_path, sizeof(service->stdout_path), IDC_STDOUT);\r
+ check_io(_T("stderr"), service->stderr_path, sizeof(service->stderr_path), IDC_STDERR);\r
/* Override stdout and/or stderr. */\r
if (SendDlgItemMessage(tablist[NSSM_TAB_IO], IDC_TRUNCATE, BM_GETCHECK, 0, 0) & BST_CHECKED) {\r
if (service->stdout_path[0]) service->stdout_disposition = CREATE_ALWAYS;\r
/* Get environment. */\r
unsigned long envlen = (unsigned long) SendMessage(GetDlgItem(tablist[NSSM_TAB_ENVIRONMENT], IDC_ENVIRONMENT), WM_GETTEXTLENGTH, 0, 0);\r
if (envlen) {\r
- char *env = (char *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, envlen + 2);\r
+ TCHAR *env = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (envlen + 2) * sizeof(TCHAR));\r
if (! env) {\r
- popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, "environment", "install()");\r
+ popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("install()"));\r
cleanup_nssm_service(service);\r
return 5;\r
}\r
/* Strip CR and replace LF with NULL. */\r
unsigned long newlen = 0;\r
unsigned long i, j;\r
- for (i = 0; i < envlen; i++) if (env[i] != '\r') newlen++;\r
+ for (i = 0; i < envlen; i++) if (env[i] != _T('\r')) newlen++;\r
/* Must end with two NULLs. */\r
newlen += 2;\r
\r
- char *newenv = (char *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, newlen);\r
+ TCHAR *newenv = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, newlen * sizeof(TCHAR));\r
if (! newenv) {\r
HeapFree(GetProcessHeap(), 0, env);\r
- popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, "environment", "install()");\r
+ popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("install()"));\r
cleanup_nssm_service(service);\r
return 5;\r
}\r
\r
for (i = 0, j = 0; i < envlen; i++) {\r
- if (env[i] == '\r') continue;\r
- if (env[i] == '\n') newenv[j] = '\0';\r
+ if (env[i] == _T('\r')) continue;\r
+ if (env[i] == _T('\n')) newenv[j] = _T('\0');\r
else newenv[j] = env[i];\r
j++;\r
}\r
envlen = newlen;\r
\r
/* Test the environment is valid. */\r
- char path[MAX_PATH];\r
- GetModuleFileName(0, path, sizeof(path));\r
+ TCHAR path[MAX_PATH];\r
+ GetModuleFileName(0, path, _countof(path));\r
STARTUPINFO si;\r
ZeroMemory(&si, sizeof(si));\r
si.cb = sizeof(si);\r
PROCESS_INFORMATION pi;\r
ZeroMemory(&pi, sizeof(pi));\r
+ unsigned long flags = CREATE_SUSPENDED;\r
+#ifdef UNICODE\r
+ flags |= CREATE_UNICODE_ENVIRONMENT;\r
+#endif\r
\r
- if (! CreateProcess(0, path, 0, 0, 0, CREATE_SUSPENDED, env, 0, &si, &pi)) {\r
+ if (! CreateProcess(0, path, 0, 0, 0, flags, env, 0, &si, &pi)) {\r
unsigned long error = GetLastError();\r
if (error == ERROR_INVALID_PARAMETER) {\r
popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_GUI_INVALID_ENVIRONMENT);\r
/* See if it works. */\r
switch (install_service(service)) {\r
case 1:\r
- popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, "service", "install()");\r
+ popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, _T("service"), _T("install()"));\r
cleanup_nssm_service(service);\r
return 1;\r
\r
\r
switch (remove_service(service)) {\r
case 1:\r
- popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, "service", "remove()");\r
+ popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, _T("service"), _T("remove()"));\r
cleanup_nssm_service(service);\r
return 1;\r
\r
return 0;\r
}\r
\r
-static char *browse_filter(int message) {\r
+static TCHAR *browse_filter(int message) {\r
switch (message) {\r
- case NSSM_GUI_BROWSE_FILTER_APPLICATIONS: return "*.exe;*.bat;*.cmd";\r
- case NSSM_GUI_BROWSE_FILTER_DIRECTORIES: return ".";\r
+ case NSSM_GUI_BROWSE_FILTER_APPLICATIONS: return _T("*.exe;*.bat;*.cmd");\r
+ case NSSM_GUI_BROWSE_FILTER_DIRECTORIES: return _T(".");\r
case NSSM_GUI_BROWSE_FILTER_ALL_FILES: /* Fall through. */\r
- default: return "*.*";\r
+ default: return _T("*.*");\r
}\r
}\r
\r
}\r
\r
/* Browse for application */\r
-void browse(HWND window, char *current, unsigned long flags, ...) {\r
+void browse(HWND window, TCHAR *current, unsigned long flags, ...) {\r
if (! window) return;\r
\r
va_list arg;\r
OPENFILENAME ofn;\r
ZeroMemory(&ofn, sizeof(ofn));\r
ofn.lStructSize = sizeof(ofn);\r
- ofn.lpstrFilter = (char *) HeapAlloc(GetProcessHeap(), 0, bufsize);\r
+ ofn.lpstrFilter = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, bufsize * sizeof(TCHAR));\r
/* XXX: Escaping nulls with FormatMessage is tricky */\r
if (ofn.lpstrFilter) {\r
ZeroMemory((void *) ofn.lpstrFilter, bufsize);\r
/* "Applications" + NULL + "*.exe" + NULL */\r
va_start(arg, flags);\r
while (i = va_arg(arg, int)) {\r
- char *localised = message_string(i);\r
- _snprintf_s((char *) ofn.lpstrFilter + len, bufsize, _TRUNCATE, localised);\r
- len += strlen(localised) + 1;\r
+ TCHAR *localised = message_string(i);\r
+ _sntprintf_s((TCHAR *) ofn.lpstrFilter + len, bufsize, _TRUNCATE, localised);\r
+ len += _tcslen(localised) + 1;\r
LocalFree(localised);\r
- char *filter = browse_filter(i);\r
- _snprintf_s((char *) ofn.lpstrFilter + len, bufsize - len, _TRUNCATE, "%s", filter);\r
- len += strlen(filter) + 1;\r
+ TCHAR *filter = browse_filter(i);\r
+ _sntprintf_s((TCHAR *) ofn.lpstrFilter + len, bufsize - len, _TRUNCATE, _T("%s"), filter);\r
+ len += _tcslen(filter) + 1;\r
}\r
va_end(arg);\r
/* Remainder of the buffer is already zeroed */\r
}\r
- ofn.lpstrFile = new char[MAX_PATH];\r
+ ofn.lpstrFile = new TCHAR[MAX_PATH];\r
if (flags & OFN_NOVALIDATE) {\r
/* Directory hack. */\r
- _snprintf_s(ofn.lpstrFile, MAX_PATH, _TRUNCATE, ":%s:", message_string(NSSM_GUI_BROWSE_FILTER_DIRECTORIES));\r
+ _sntprintf_s(ofn.lpstrFile, MAX_PATH, _TRUNCATE, _T(":%s:"), message_string(NSSM_GUI_BROWSE_FILTER_DIRECTORIES));\r
}\r
- else _snprintf_s(ofn.lpstrFile, MAX_PATH, _TRUNCATE, "%s", current);\r
+ else _sntprintf_s(ofn.lpstrFile, MAX_PATH, _TRUNCATE, _T("%s"), current);\r
ofn.lpstrTitle = message_string(NSSM_GUI_BROWSE_TITLE);\r
ofn.nMaxFile = MAX_PATH;\r
ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY | OFN_PATHMUSTEXIST | flags;\r
/* Button was pressed or control was controlled. */\r
case WM_COMMAND:\r
HWND dlg;\r
- char buffer[MAX_PATH];\r
+ TCHAR buffer[MAX_PATH];\r
\r
switch (LOWORD(w)) {\r
/* Browse for application. */\r
\r
/* Application tab. */\r
tab.pszText = message_string(NSSM_GUI_TAB_APPLICATION);\r
- tab.cchTextMax = (int) strlen(tab.pszText);\r
+ tab.cchTextMax = (int) _tcslen(tab.pszText);\r
SendMessage(tabs, TCM_INSERTITEM, NSSM_TAB_APPLICATION, (LPARAM) &tab);\r
tablist[NSSM_TAB_APPLICATION] = CreateDialog(0, MAKEINTRESOURCE(IDD_APPLICATION), window, tab_dlg);\r
ShowWindow(tablist[NSSM_TAB_APPLICATION], SW_SHOW);\r
\r
/* Shutdown tab. */\r
tab.pszText = message_string(NSSM_GUI_TAB_SHUTDOWN);\r
- tab.cchTextMax = (int) strlen(tab.pszText);\r
+ tab.cchTextMax = (int) _tcslen(tab.pszText);\r
SendMessage(tabs, TCM_INSERTITEM, NSSM_TAB_SHUTDOWN, (LPARAM) &tab);\r
tablist[NSSM_TAB_SHUTDOWN] = CreateDialog(0, MAKEINTRESOURCE(IDD_SHUTDOWN), window, tab_dlg);\r
ShowWindow(tablist[NSSM_TAB_SHUTDOWN], SW_HIDE);\r
\r
/* Restart tab. */\r
tab.pszText = message_string(NSSM_GUI_TAB_EXIT);\r
- tab.cchTextMax = (int) strlen(tab.pszText);\r
+ tab.cchTextMax = (int) _tcslen(tab.pszText);\r
SendMessage(tabs, TCM_INSERTITEM, NSSM_TAB_EXIT, (LPARAM) &tab);\r
tablist[NSSM_TAB_EXIT] = CreateDialog(0, MAKEINTRESOURCE(IDD_APPEXIT), window, tab_dlg);\r
ShowWindow(tablist[NSSM_TAB_EXIT], SW_HIDE);\r
\r
/* I/O tab. */\r
tab.pszText = message_string(NSSM_GUI_TAB_IO);\r
- tab.cchTextMax = (int) strlen(tab.pszText) + 1;\r
+ tab.cchTextMax = (int) _tcslen(tab.pszText) + 1;\r
SendMessage(tabs, TCM_INSERTITEM, NSSM_TAB_IO, (LPARAM) &tab);\r
tablist[NSSM_TAB_IO] = CreateDialog(0, MAKEINTRESOURCE(IDD_IO), window, tab_dlg);\r
ShowWindow(tablist[NSSM_TAB_IO], SW_HIDE);\r
\r
/* Environment tab. */\r
tab.pszText = message_string(NSSM_GUI_TAB_ENVIRONMENT);\r
- tab.cchTextMax = (int) strlen(tab.pszText) + 1;\r
+ tab.cchTextMax = (int) _tcslen(tab.pszText) + 1;\r
SendMessage(tabs, TCM_INSERTITEM, NSSM_TAB_ENVIRONMENT, (LPARAM) &tab);\r
tablist[NSSM_TAB_ENVIRONMENT] = CreateDialog(0, MAKEINTRESOURCE(IDD_ENVIRONMENT), window, tab_dlg);\r
ShowWindow(tablist[NSSM_TAB_ENVIRONMENT], SW_HIDE);\r
git://git.iain.cx/iain / nssm.git / blobdiff