Give up on older Visual Studio versions.

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index d7c7e6e..4ec5133 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -262,6 +262,7 @@ int get_service_username(const TCHAR *service_name, const QUERY_SERVICE_CONFIG *
 }\r
 \r
 int grant_logon_as_service(const TCHAR *username) {\r
+  if (! username) return 0;\r
   if (str_equiv(username, NSSM_LOCALSYSTEM_ACCOUNT)) return 0;\r
 \r
   /* Open Policy object. */\r
@@ -285,7 +286,7 @@ int grant_logon_as_service(const TCHAR *username) {
 #else\r
   size_t buflen;\r
   mbstowcs_s(&buflen, NULL, 0, username, _TRUNCATE);\r
-  lsa_username.MaximumLength = buflen * sizeof(wchar_t);\r
+  lsa_username.MaximumLength = (unsigned short) buflen * sizeof(wchar_t);\r
   lsa_username.Length = lsa_username.MaximumLength - sizeof(wchar_t);\r
   lsa_username.Buffer = (wchar_t *) HeapAlloc(GetProcessHeap(), 0, lsa_username.MaximumLength);\r
   if (lsa_username.Buffer) mbstowcs_s(&buflen, lsa_username.Buffer, lsa_username.MaximumLength, username, _TRUNCATE);\r
@@ -781,9 +782,9 @@ int install_service(nssm_service_t *service) {
   GetModuleFileName(0, service->image, _countof(service->image));\r
 \r
   /* Create the service - settings will be changed in edit_service() */\r
-  service->handle = CreateService(services, service->name, service->name, SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, service->image, 0, 0, 0, 0, 0);\r
+  service->handle = CreateService(services, service->name, service->name, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, service->image, 0, 0, 0, 0, 0);\r
   if (! service->handle) {\r
-    print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED);\r
+    print_message(stderr, NSSM_MESSAGE_CREATESERVICE_FAILED, error_string(GetLastError()));\r
     CloseServiceHandle(services);\r
     return 5;\r
   }\r