git://git.iain.cx/iain / nssm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed Unicode display of GetProcAddress() errors.
[nssm.git] / gui.cpp
diff --git a/gui.cpp b/gui.cpp
index 1c77bfc..bef4d4e 100644 (file)
--- a/gui.cpp
+++ b/gui.cpp
@@ -1,6 +1,6 @@
 #include "nssm.h"\r
 \r
-static enum { NSSM_TAB_APPLICATION, NSSM_TAB_SHUTDOWN, NSSM_TAB_EXIT, NSSM_TAB_IO, NSSM_TAB_ENVIRONMENT, NSSM_NUM_TABS };\r
+static enum { NSSM_TAB_APPLICATION, 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
@@ -74,11 +74,11 @@ static inline void check_method_timeout(HWND tab, unsigned long control, unsigne
   if (translated) *timeout = configured;\r
 }\r
 \r
-static inline void check_io(TCHAR *name, TCHAR *buffer, size_t bufsize, unsigned long control) {\r
+static inline void check_io(TCHAR *name, TCHAR *buffer, unsigned long len, 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
+  if (GetDlgItemText(tablist[NSSM_TAB_IO], control, buffer, (int) len)) return;\r
   popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_MESSAGE_PATH_TOO_LONG, name);\r
-  ZeroMemory(buffer, bufsize);\r
+  ZeroMemory(buffer, len * sizeof(TCHAR));\r
 }\r
 \r
 /* Install the service. */\r
@@ -90,27 +90,27 @@ int install(HWND window) {
     set_nssm_service_defaults(service);\r
 \r
     /* Get service name. */\r
-    if (! GetDlgItemText(window, IDC_NAME, service->name, sizeof(service->name))) {\r
+    if (! GetDlgItemText(window, IDC_NAME, service->name, _countof(service->name))) {\r
       popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_GUI_MISSING_SERVICE_NAME);\r
       cleanup_nssm_service(service);\r
       return 2;\r
     }\r
 \r
     /* Get executable name */\r
-    if (! GetDlgItemText(tablist[NSSM_TAB_APPLICATION], IDC_PATH, service->exe, sizeof(service->exe))) {\r
+    if (! GetDlgItemText(tablist[NSSM_TAB_APPLICATION], IDC_PATH, service->exe, _countof(service->exe))) {\r
       popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_GUI_MISSING_PATH);\r
       return 3;\r
     }\r
 \r
     /* Get startup directory. */\r
-    if (! GetDlgItemText(tablist[NSSM_TAB_APPLICATION], IDC_DIR, service->dir, sizeof(service->dir))) {\r
+    if (! GetDlgItemText(tablist[NSSM_TAB_APPLICATION], IDC_DIR, service->dir, _countof(service->dir))) {\r
       _sntprintf_s(service->dir, _countof(service->dir), _TRUNCATE, _T("%s"), service->exe);\r
       strip_basename(service->dir);\r
     }\r
 \r
     /* Get flags. */\r
     if (SendMessage(GetDlgItem(tablist[NSSM_TAB_APPLICATION], IDC_FLAGS), WM_GETTEXTLENGTH, 0, 0)) {\r
-      if (! GetDlgItemText(tablist[NSSM_TAB_APPLICATION], IDC_FLAGS, service->flags, sizeof(service->flags))) {\r
+      if (! GetDlgItemText(tablist[NSSM_TAB_APPLICATION], IDC_FLAGS, service->flags, _countof(service->flags))) {\r
         popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_GUI_INVALID_OPTIONS);\r
         return 4;\r
       }\r
@@ -132,15 +132,27 @@ int install(HWND window) {
     if (service->default_exit_action == CB_ERR) service->default_exit_action = 0;\r
 \r
     /* Get I/O stuff. */\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
+    check_io(_T("stdin"), service->stdin_path, _countof(service->stdin_path), IDC_STDIN);\r
+    check_io(_T("stdout"), service->stdout_path, _countof(service->stdout_path), IDC_STDOUT);\r
+    check_io(_T("stderr"), service->stderr_path, _countof(service->stderr_path), IDC_STDERR);\r
+\r
     /* Override stdout and/or stderr. */\r
-    if (SendDlgItemMessage(tablist[NSSM_TAB_IO], IDC_TRUNCATE, BM_GETCHECK, 0, 0) & BST_CHECKED) {\r
+    if (SendDlgItemMessage(tablist[NSSM_TAB_ROTATION], IDC_TRUNCATE, BM_GETCHECK, 0, 0) & BST_CHECKED) {\r
       if (service->stdout_path[0]) service->stdout_disposition = CREATE_ALWAYS;\r
       if (service->stderr_path[0]) service->stderr_disposition = CREATE_ALWAYS;\r
     }\r
 \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
+    }\r
+    if (SendDlgItemMessage(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_SECONDS_ENABLED, BM_GETCHECK, 0, 0) & BST_CHECKED) {\r
+      check_method_timeout(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_SECONDS, &service->rotate_seconds);\r
+    }\r
+    if (SendDlgItemMessage(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_BYTES_LOW_ENABLED, BM_GETCHECK, 0, 0) & BST_CHECKED) {\r
+      check_method_timeout(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_BYTES_LOW, &service->rotate_bytes_low);\r
+    }\r
+\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
@@ -185,29 +197,12 @@ int install(HWND window) {
       envlen = newlen;\r
 \r
       /* Test the environment is valid. */\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, 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
-          HeapFree(GetProcessHeap(), 0, env);\r
-          envlen = 0;\r
-        }\r
+      if (test_environment(env)) {\r
+        popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_GUI_INVALID_ENVIRONMENT);\r
+        HeapFree(GetProcessHeap(), 0, env);\r
         cleanup_nssm_service(service);\r
         return 5;\r
       }\r
-      TerminateProcess(pi.hProcess, 0);\r
 \r
       if (SendDlgItemMessage(tablist[NSSM_TAB_ENVIRONMENT], IDC_ENVIRONMENT_REPLACE, BM_GETCHECK, 0, 0) & BST_CHECKED) {\r
         service->env = env;\r
@@ -266,7 +261,7 @@ int remove(HWND window) {
   nssm_service_t *service = alloc_nssm_service();\r
   if (service) {\r
     /* Get service name */\r
-    if (! GetDlgItemText(window, IDC_NAME, service->name, sizeof(service->name))) {\r
+    if (! GetDlgItemText(window, IDC_NAME, service->name, _countof(service->name))) {\r
       popup_message(MB_OK | MB_ICONEXCLAMATION, NSSM_GUI_MISSING_SERVICE_NAME);\r
       cleanup_nssm_service(service);\r
       return 2;\r
@@ -384,17 +379,18 @@ INT_PTR CALLBACK tab_dlg(HWND tab, UINT message, WPARAM w, LPARAM l) {
     case WM_COMMAND:\r
       HWND dlg;\r
       TCHAR buffer[MAX_PATH];\r
+      unsigned long state;\r
 \r
       switch (LOWORD(w)) {\r
         /* Browse for application. */\r
         case IDC_BROWSE:\r
           dlg = GetDlgItem(tab, IDC_PATH);\r
-          GetDlgItemText(tab, IDC_PATH, buffer, sizeof(buffer));\r
+          GetDlgItemText(tab, IDC_PATH, buffer, _countof(buffer));\r
           browse(dlg, buffer, OFN_FILEMUSTEXIST, NSSM_GUI_BROWSE_FILTER_APPLICATIONS, NSSM_GUI_BROWSE_FILTER_ALL_FILES, 0);\r
           /* Fill in startup directory if it wasn't already specified. */\r
-          GetDlgItemText(tab, IDC_DIR, buffer, sizeof(buffer));\r
+          GetDlgItemText(tab, IDC_DIR, buffer, _countof(buffer));\r
           if (! buffer[0]) {\r
-            GetDlgItemText(tab, IDC_PATH, buffer, sizeof(buffer));\r
+            GetDlgItemText(tab, IDC_PATH, buffer, _countof(buffer));\r
             strip_basename(buffer);\r
             SetDlgItemText(tab, IDC_DIR, buffer);\r
           }\r
@@ -403,26 +399,26 @@ INT_PTR CALLBACK tab_dlg(HWND tab, UINT message, WPARAM w, LPARAM l) {
           /* Browse for startup directory. */\r
         case IDC_BROWSE_DIR:\r
           dlg = GetDlgItem(tab, IDC_DIR);\r
-          GetDlgItemText(tab, IDC_DIR, buffer, sizeof(buffer));\r
+          GetDlgItemText(tab, IDC_DIR, buffer, _countof(buffer));\r
           browse(dlg, buffer, OFN_NOVALIDATE, NSSM_GUI_BROWSE_FILTER_DIRECTORIES, 0);\r
           break;\r
 \r
         /* Browse for stdin. */\r
         case IDC_BROWSE_STDIN:\r
           dlg = GetDlgItem(tab, IDC_STDIN);\r
-          GetDlgItemText(tab, IDC_STDIN, buffer, sizeof(buffer));\r
+          GetDlgItemText(tab, IDC_STDIN, buffer, _countof(buffer));\r
           browse(dlg, buffer, 0, NSSM_GUI_BROWSE_FILTER_ALL_FILES, 0);\r
           break;\r
 \r
         /* Browse for stdout. */\r
         case IDC_BROWSE_STDOUT:\r
           dlg = GetDlgItem(tab, IDC_STDOUT);\r
-          GetDlgItemText(tab, IDC_STDOUT, buffer, sizeof(buffer));\r
+          GetDlgItemText(tab, IDC_STDOUT, buffer, _countof(buffer));\r
           browse(dlg, buffer, 0, NSSM_GUI_BROWSE_FILTER_ALL_FILES, 0);\r
           /* Fill in stderr if it wasn't already specified. */\r
-          GetDlgItemText(tab, IDC_STDERR, buffer, sizeof(buffer));\r
+          GetDlgItemText(tab, IDC_STDERR, buffer, _countof(buffer));\r
           if (! buffer[0]) {\r
-            GetDlgItemText(tab, IDC_STDOUT, buffer, sizeof(buffer));\r
+            GetDlgItemText(tab, IDC_STDOUT, buffer, _countof(buffer));\r
             SetDlgItemText(tab, IDC_STDERR, buffer);\r
           }\r
           break;\r
@@ -430,9 +426,20 @@ INT_PTR CALLBACK tab_dlg(HWND tab, UINT message, WPARAM w, LPARAM l) {
         /* Browse for stderr. */\r
         case IDC_BROWSE_STDERR:\r
           dlg = GetDlgItem(tab, IDC_STDERR);\r
-          GetDlgItemText(tab, IDC_STDERR, buffer, sizeof(buffer));\r
+          GetDlgItemText(tab, IDC_STDERR, buffer, _countof(buffer));\r
           browse(dlg, buffer, 0, NSSM_GUI_BROWSE_FILTER_ALL_FILES, 0);\r
           break;\r
+\r
+        /* Rotation. */\r
+        case IDC_ROTATE:\r
+        case IDC_ROTATE_SECONDS_ENABLED:\r
+        case IDC_ROTATE_BYTES_LOW_ENABLED:\r
+          if (SendDlgItemMessage(tab, LOWORD(w), BM_GETCHECK, 0, 0) & BST_CHECKED) state = BST_CHECKED;\r
+          else state = BST_UNCHECKED;\r
+          SendDlgItemMessage(tablist[NSSM_TAB_ROTATION], IDC_ROTATE, BM_SETCHECK, state, 0);\r
+          SendDlgItemMessage(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_SECONDS_ENABLED, BM_SETCHECK, state, 0);\r
+          SendDlgItemMessage(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_BYTES_LOW_ENABLED, BM_SETCHECK, state, 0);\r
+          break;\r
       }\r
       return 1;\r
   }\r
@@ -503,6 +510,17 @@ INT_PTR CALLBACK install_dlg(HWND window, UINT message, WPARAM w, LPARAM l) {
       tablist[NSSM_TAB_IO] = CreateDialog(0, MAKEINTRESOURCE(IDD_IO), window, tab_dlg);\r
       ShowWindow(tablist[NSSM_TAB_IO], SW_HIDE);\r
 \r
+      /* Rotation tab. */\r
+      tab.pszText = message_string(NSSM_GUI_TAB_ROTATION);\r
+      tab.cchTextMax = (int) _tcslen(tab.pszText) + 1;\r
+      SendMessage(tabs, TCM_INSERTITEM, NSSM_TAB_ROTATION, (LPARAM) &tab);\r
+      tablist[NSSM_TAB_ROTATION] = CreateDialog(0, MAKEINTRESOURCE(IDD_ROTATION), window, tab_dlg);\r
+      ShowWindow(tablist[NSSM_TAB_ROTATION], SW_HIDE);\r
+\r
+      /* Set defaults. */\r
+      SetDlgItemInt(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_SECONDS, 0, 0);\r
+      SetDlgItemInt(tablist[NSSM_TAB_ROTATION], IDC_ROTATE_BYTES_LOW, 0, 0);\r
+\r
       /* Environment tab. */\r
       tab.pszText = message_string(NSSM_GUI_TAB_ENVIRONMENT);\r
       tab.cchTextMax = (int) _tcslen(tab.pszText) + 1;\r
The Non-Sucking Service Manager