return 0;\r
}\r
\r
-inline unsigned long priority_mask() {\r
+unsigned long priority_mask() {\r
return REALTIME_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | ABOVE_NORMAL_PRIORITY_CLASS | NORMAL_PRIORITY_CLASS | BELOW_NORMAL_PRIORITY_CLASS | IDLE_PRIORITY_CLASS;\r
}\r
\r
\r
void set_service_environment(nssm_service_t *service) {\r
if (! service) return;\r
- if (service->env) duplicate_environment(service->env);\r
- if (service->env_extra) set_environment_block(service->env_extra);\r
+\r
+ /*\r
+ We have to duplicate the block because this function will be called\r
+ multiple times between registry reads.\r
+ */\r
+ if (service->env) duplicate_environment_strings(service->env);\r
+ if (! service->env_extra) return;\r
+ TCHAR *env_extra = copy_environment_block(service->env_extra);\r
+ if (! env_extra) return;\r
+\r
+ set_environment_block(env_extra);\r
+ HeapFree(GetProcessHeap(), 0, env_extra);\r
}\r
\r
void unset_service_environment(nssm_service_t *service) {\r
if (service->throttle_section_initialised) DeleteCriticalSection(&service->throttle_section);\r
if (service->throttle_timer) CloseHandle(service->throttle_timer);\r
if (service->hook_section_initialised) DeleteCriticalSection(&service->hook_section);\r
- if (service->initial_env) FreeEnvironmentStrings(service->initial_env);\r
+ if (service->initial_env) HeapFree(GetProcessHeap(), 0, service->initial_env);\r
HeapFree(GetProcessHeap(), 0, service);\r
}\r
\r
}\r
\r
/* Get path of this program */\r
- GetModuleFileName(0, service->image, _countof(service->image));\r
+ _sntprintf_s(service->image, _countof(service->image), _TRUNCATE, _T("%s"), nssm_imagepath());\r
\r
/* Create the service - settings will be changed in edit_service() */\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
service->hook_section_initialised = true;\r
\r
/* Remember our initial environment. */\r
- service->initial_env = GetEnvironmentStrings();\r
+ service->initial_env = copy_environment();\r
\r
/* Remember our creation time. */\r
if (get_process_creation_time(GetCurrentProcess(), &service->nssm_creation_time)) ZeroMemory(&service->nssm_creation_time, sizeof(service->nssm_creation_time));\r
return stop_service(service, 4, true, true);\r
}\r
\r
+ /* The pre-start hook will have cleaned the environment. */\r
+ set_service_environment(service);\r
+\r
bool inherit_handles = false;\r
if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;\r
unsigned long flags = service->priority & priority_mask();\r