#include "nssm.h"\r
\r
-static enum { NSSM_TAB_APPLICATION, NSSM_TAB_DETAILS, NSSM_TAB_LOGON, NSSM_TAB_PROCESS, NSSM_TAB_SHUTDOWN, NSSM_TAB_EXIT, NSSM_TAB_IO, NSSM_TAB_ROTATION, NSSM_TAB_ENVIRONMENT, NSSM_NUM_TABS };\r
+static enum { NSSM_TAB_APPLICATION, NSSM_TAB_DETAILS, NSSM_TAB_LOGON, NSSM_TAB_DEPENDENCIES, NSSM_TAB_PROCESS, NSSM_TAB_SHUTDOWN, NSSM_TAB_EXIT, NSSM_TAB_IO, NSSM_TAB_ROTATION, NSSM_TAB_ENVIRONMENT, NSSM_NUM_TABS };\r
static HWND tablist[NSSM_NUM_TABS];\r
static int selected_tab;\r
\r
if (service->type & SERVICE_INTERACTIVE_PROCESS) SendDlgItemMessage(tablist[NSSM_TAB_LOGON], IDC_INTERACT, BM_SETCHECK, BST_CHECKED, 0);\r
}\r
\r
+ /* Dependencies tab. */\r
+ if (service->dependencieslen) {\r
+ TCHAR *formatted;\r
+ unsigned long newlen;\r
+ if (format_double_null(service->dependencies, service->dependencieslen, &formatted, &newlen)) {\r
+ popup_message(dlg, MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, _T("dependencies"), _T("nssm_dlg()"));\r
+ }\r
+ else {\r
+ SetDlgItemText(tablist[NSSM_TAB_DEPENDENCIES], IDC_DEPENDENCIES, formatted);\r
+ HeapFree(GetProcessHeap(), 0, formatted);\r
+ }\r
+ }\r
+\r
/* Process tab. */\r
if (service->priority) {\r
int priority = priority_constant_to_index(service->priority);\r
}\r
}\r
\r
+ if (service->no_console) {\r
+ SendDlgItemMessage(tablist[NSSM_TAB_PROCESS], IDC_CONSOLE, BM_SETCHECK, BST_UNCHECKED, 0);\r
+ }\r
+\r
/* Shutdown tab. */\r
if (! (service->stop_method & NSSM_STOP_METHOD_CONSOLE)) {\r
SendDlgItemMessage(tablist[NSSM_TAB_SHUTDOWN], IDC_METHOD_CONSOLE, BM_SETCHECK, BST_UNCHECKED, 0);\r
if (! (service->stop_method & NSSM_STOP_METHOD_TERMINATE)) {\r
SendDlgItemMessage(tablist[NSSM_TAB_SHUTDOWN], IDC_METHOD_TERMINATE, BM_SETCHECK, BST_UNCHECKED, 0);\r
}\r
+ if (! service->kill_process_tree) {\r
+ SendDlgItemMessage(tablist[NSSM_TAB_SHUTDOWN], IDC_KILL_PROCESS_TREE, BM_SETCHECK, BST_UNCHECKED, 0);\r
+ }\r
\r
/* Restart tab. */\r
SetDlgItemInt(tablist[NSSM_TAB_EXIT], IDC_THROTTLE, service->throttle_delay, 0);\r
if (! service->rotate_bytes_high) SetDlgItemInt(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_BYTES_LOW, service->rotate_bytes_low, 0);\r
\r
/* Check if advanced settings are in use. */\r
- if (service->stdout_disposition ^ service->stderr_disposition || service->stdout_disposition & ~CREATE_ALWAYS || service->stderr_disposition & ~CREATE_ALWAYS) popup_message(dlg, MB_OK | MB_ICONWARNING, NSSM_GUI_WARN_STDIO);\r
+ if (service->stdout_disposition != service->stderr_disposition || (service->stdout_disposition && service->stdout_disposition != NSSM_STDOUT_DISPOSITION && service->stdout_disposition != CREATE_ALWAYS) || (service->stderr_disposition && service->stderr_disposition != NSSM_STDERR_DISPOSITION && service->stderr_disposition != CREATE_ALWAYS)) popup_message(dlg, MB_OK | MB_ICONWARNING, NSSM_GUI_WARN_STDIO);\r
if (service->rotate_bytes_high) popup_message(dlg, MB_OK | MB_ICONWARNING, NSSM_GUI_WARN_ROTATE_BYTES);\r
\r
/* Environment tab. */\r
if (envlen) {\r
TCHAR *formatted;\r
unsigned long newlen;\r
- if (format_environment(env, envlen, &formatted, &newlen)) {\r
+ if (format_double_null(env, envlen, &formatted, &newlen)) {\r
popup_message(dlg, MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("nssm_dlg()"));\r
}\r
else {\r
}\r
\r
/*\r
- Special case LOCALSYSTEM.\r
+ Special case for well-known accounts.\r
Ignore the password if we're editing and the username hasn't changed.\r
*/\r
- if (str_equiv(service->username, NSSM_LOCALSYSTEM_ACCOUNT)) {\r
- HeapFree(GetProcessHeap(), 0, service->username);\r
- service->username = 0;\r
- service->usernamelen = 0;\r
+ const TCHAR *well_known = well_known_username(service->username);\r
+ if (well_known) {\r
+ if (str_equiv(well_known, NSSM_LOCALSYSTEM_ACCOUNT)) {\r
+ HeapFree(GetProcessHeap(), 0, service->username);\r
+ service->username = 0;\r
+ service->usernamelen = 0;\r
+ }\r
+ else {\r
+ service->usernamelen = _tcslen(well_known) + 1;\r
+ service->username = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, service->usernamelen * sizeof(TCHAR));\r
+ if (! service->username) {\r
+ print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY, _T("canon"), _T("install()"));\r
+ return 6;\r
+ }\r
+ memmove(service->username, well_known, service->usernamelen * sizeof(TCHAR));\r
+ }\r
}\r
else {\r
/* Password. */\r
}\r
}\r
\r
+ /* Get dependencies. */\r
+ unsigned long dependencieslen = (unsigned long) SendMessage(GetDlgItem(tablist[NSSM_TAB_DEPENDENCIES], IDC_DEPENDENCIES), WM_GETTEXTLENGTH, 0, 0);\r
+ if (dependencieslen) {\r
+ TCHAR *dependencies = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (dependencieslen + 2) * sizeof(TCHAR));\r
+ if (! dependencies) {\r
+ popup_message(window, MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, _T("dependencies"), _T("install()"));\r
+ cleanup_nssm_service(service);\r
+ return 6;\r
+ }\r
+\r
+ if (! GetDlgItemText(tablist[NSSM_TAB_DEPENDENCIES], IDC_DEPENDENCIES, dependencies, dependencieslen + 1)) {\r
+ popup_message(window, MB_OK | MB_ICONEXCLAMATION, NSSM_GUI_INVALID_DEPENDENCIES);\r
+ HeapFree(GetProcessHeap(), 0, dependencies);\r
+ cleanup_nssm_service(service);\r
+ return 6;\r
+ }\r
+\r
+ if (unformat_double_null(dependencies, dependencieslen, &service->dependencies, &service->dependencieslen)) {\r
+ HeapFree(GetProcessHeap(), 0, dependencies);\r
+ popup_message(window, MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, _T("dependencies"), _T("install()"));\r
+ cleanup_nssm_service(service);\r
+ return 6;\r
+ }\r
+\r
+ HeapFree(GetProcessHeap(), 0, dependencies);\r
+ }\r
+\r
/* Remaining tabs are only for services we manage. */\r
if (service->native) return 0;\r
\r
}\r
}\r
\r
+ if (SendDlgItemMessage(tablist[NSSM_TAB_PROCESS], IDC_CONSOLE, BM_GETCHECK, 0, 0) & BST_CHECKED) service->no_console = 0;\r
+ else service->no_console = 1;\r
+\r
/* Get stop method stuff. */\r
check_stop_method(service, NSSM_STOP_METHOD_CONSOLE, IDC_METHOD_CONSOLE);\r
check_stop_method(service, NSSM_STOP_METHOD_WINDOW, IDC_METHOD_WINDOW);\r
check_number(tablist[NSSM_TAB_SHUTDOWN], IDC_KILL_CONSOLE, &service->kill_console_delay);\r
check_number(tablist[NSSM_TAB_SHUTDOWN], IDC_KILL_WINDOW, &service->kill_window_delay);\r
check_number(tablist[NSSM_TAB_SHUTDOWN], IDC_KILL_THREADS, &service->kill_threads_delay);\r
+ if (SendDlgItemMessage(tablist[NSSM_TAB_SHUTDOWN], IDC_KILL_PROCESS_TREE, BM_GETCHECK, 0, 0) & BST_CHECKED) service->kill_process_tree = 1;\r
+ else service->kill_process_tree = 0;\r
\r
/* Get exit action stuff. */\r
check_number(tablist[NSSM_TAB_EXIT], IDC_THROTTLE, &service->throttle_delay);\r
/* Get rotation stuff. */\r
if (SendDlgItemMessage(tablist[NSSM_TAB_ROTATION], IDC_ROTATE, BM_GETCHECK, 0, 0) & BST_CHECKED) {\r
service->rotate_files = true;\r
- if (SendDlgItemMessage(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_ONLINE, BM_GETCHECK, 0, 0) & BST_CHECKED) service->rotate_stdout_online = service->rotate_stderr_online = true;
+ if (SendDlgItemMessage(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_ONLINE, BM_GETCHECK, 0, 0) & BST_CHECKED) service->rotate_stdout_online = service->rotate_stderr_online = NSSM_ROTATE_ONLINE;\r
check_number(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_SECONDS, &service->rotate_seconds);\r
check_number(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_BYTES_LOW, &service->rotate_bytes_low);\r
}\r
\r
TCHAR *newenv;\r
unsigned long newlen;\r
- if (unformat_environment(env, envlen, &newenv, &newlen)) {\r
+ if (unformat_double_null(env, envlen, &newenv, &newlen)) {\r
HeapFree(GetProcessHeap(), 0, env);\r
popup_message(window, MB_OK | MB_ICONEXCLAMATION, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("install()"));\r
cleanup_nssm_service(service);\r
va_end(arg);\r
/* Remainder of the buffer is already zeroed */\r
}\r
- ofn.lpstrFile = new TCHAR[MAX_PATH];\r
- if (flags & OFN_NOVALIDATE) {\r
- /* Directory hack. */\r
- _sntprintf_s(ofn.lpstrFile, MAX_PATH, _TRUNCATE, _T(":%s:"), message_string(NSSM_GUI_BROWSE_FILTER_DIRECTORIES));\r
+ ofn.lpstrFile = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, PATH_LENGTH * sizeof(TCHAR));\r
+ if (ofn.lpstrFile) {\r
+ if (flags & OFN_NOVALIDATE) {\r
+ /* Directory hack. */\r
+ _sntprintf_s(ofn.lpstrFile, PATH_LENGTH, _TRUNCATE, _T(":%s:"), message_string(NSSM_GUI_BROWSE_FILTER_DIRECTORIES));\r
+ ofn.nMaxFile = DIR_LENGTH;\r
+ }\r
+ else {\r
+ _sntprintf_s(ofn.lpstrFile, PATH_LENGTH, _TRUNCATE, _T("%s"), current);\r
+ ofn.nMaxFile = PATH_LENGTH;\r
+ }\r
}\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
\r
if (GetOpenFileName(&ofn)) {\r
SendMessage(window, WM_SETTEXT, 0, (LPARAM) ofn.lpstrFile);\r
}\r
if (ofn.lpstrFilter) HeapFree(GetProcessHeap(), 0, (void *) ofn.lpstrFilter);\r
-\r
- delete[] ofn.lpstrFile;\r
+ if (ofn.lpstrFile) HeapFree(GetProcessHeap(), 0, ofn.lpstrFile);\r
}\r
\r
INT_PTR CALLBACK tab_dlg(HWND tab, UINT message, WPARAM w, LPARAM l) {\r
/* Button was pressed or control was controlled. */\r
case WM_COMMAND:\r
HWND dlg;\r
- TCHAR buffer[MAX_PATH];\r
+ TCHAR buffer[PATH_LENGTH];\r
unsigned char enabled;\r
\r
switch (LOWORD(w)) {\r
CheckRadioButton(tablist[NSSM_TAB_LOGON], IDC_LOCALSYSTEM, IDC_ACCOUNT, IDC_LOCALSYSTEM);\r
set_logon_enabled(0);\r
\r
+ /* Dependencies tab. */\r
+ tab.pszText = message_string(NSSM_GUI_TAB_DEPENDENCIES);\r
+ tab.cchTextMax = (int) _tcslen(tab.pszText);\r
+ SendMessage(tabs, TCM_INSERTITEM, NSSM_TAB_DEPENDENCIES, (LPARAM) &tab);\r
+ tablist[NSSM_TAB_DEPENDENCIES] = dialog(MAKEINTRESOURCE(IDD_DEPENDENCIES), window, tab_dlg);\r
+ ShowWindow(tablist[NSSM_TAB_DEPENDENCIES], SW_HIDE);\r
+\r
/* Remaining tabs are only for services we manage. */\r
if (service->native) return 1;\r
\r
SendMessage(combo, CB_INSERTSTRING, NSSM_IDLE_PRIORITY, (LPARAM) message_string(NSSM_GUI_IDLE_PRIORITY_CLASS));\r
SendMessage(combo, CB_SETCURSEL, NSSM_NORMAL_PRIORITY, 0);\r
\r
+ SendDlgItemMessage(tablist[NSSM_TAB_PROCESS], IDC_CONSOLE, BM_SETCHECK, BST_CHECKED, 0);\r
+\r
list = GetDlgItem(tablist[NSSM_TAB_PROCESS], IDC_AFFINITY);\r
n = num_cpus();\r
SendMessage(list, LB_SETCOLUMNWIDTH, 16, 0);\r
Size to fit.\r
The box is high enough for four rows. It is wide enough for eight\r
columns without scrolling. With scrollbars it shrinks to two rows.\r
- Note that the above only holds if we set the column width BEFORE
- adding the strings.
+ Note that the above only holds if we set the column width BEFORE\r
+ adding the strings.\r
*/\r
if (n < 32) {\r
int columns = (n - 1) / 4;\r
RECT rect;\r
GetWindowRect(list, &rect);\r
- int width = rect.right - rect.left;
+ int width = rect.right - rect.left;\r
width -= (7 - columns) * 16;\r
int height = rect.bottom - rect.top;\r
- if (n < 4) height -= (int) SendMessage(list, LB_GETITEMHEIGHT, 0, 0) * (4 - n);
+ if (n < 4) height -= (int) SendMessage(list, LB_GETITEMHEIGHT, 0, 0) * (4 - n);\r
SetWindowPos(list, 0, 0, 0, width, height, SWP_NOMOVE | SWP_NOOWNERZORDER);\r
}\r
SendMessage(list, LB_SELITEMRANGE, 1, MAKELPARAM(0, n));\r
SendDlgItemMessage(tablist[NSSM_TAB_SHUTDOWN], IDC_METHOD_THREADS, BM_SETCHECK, BST_CHECKED, 0);\r
SetDlgItemInt(tablist[NSSM_TAB_SHUTDOWN], IDC_KILL_THREADS, NSSM_KILL_THREADS_GRACE_PERIOD, 0);\r
SendDlgItemMessage(tablist[NSSM_TAB_SHUTDOWN], IDC_METHOD_TERMINATE, BM_SETCHECK, BST_CHECKED, 0);\r
+ SendDlgItemMessage(tablist[NSSM_TAB_SHUTDOWN], IDC_KILL_PROCESS_TREE, BM_SETCHECK, BST_CHECKED, 1);\r
\r
/* Restart tab. */\r
tab.pszText = message_string(NSSM_GUI_TAB_EXIT);\r
git://git.iain.cx/iain / nssm.git / blobdiff