Sebastian Lackner : services: Do not create environment block before first service startup.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b783f207fedc968d78900cfe9703d436ec5141df
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b783f207fedc968d78900cfe9703d436ec5141df

Author: Sebastian Lackner <sebastian at fds-team.de>
Date:   Thu Sep  1 07:39:21 2016 +0200

services: Do not create environment block before first service startup.

This basically reverts ce07a77610dec0f273912425dc68fc646a7f3624.

Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/services/services.c      | 26 ++++++++++++--------------
 programs/services/tests/service.c |  5 +++++
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/programs/services/services.c b/programs/services/services.c
index e7610bd..04f440f 100644
--- a/programs/services/services.c
+++ b/programs/services/services.c
@@ -41,7 +41,7 @@ struct scmdatabase *active_database;
 DWORD service_pipe_timeout = 10000;
 DWORD service_kill_timeout = 60000;
 static DWORD default_preshutdown_timeout = 180000;
-static void *env = NULL;
+static void *environment = NULL;
 static HKEY service_current_key = NULL;
 
 static const BOOL is_win64 = (sizeof(void *) > sizeof(int));
@@ -748,6 +748,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p
     struct process_entry *process;
     PROCESS_INFORMATION pi;
     STARTUPINFOW si;
+    HANDLE token;
     LPWSTR path = NULL;
     DWORD err;
     BOOL r;
@@ -791,6 +792,12 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p
         si.lpDesktop = desktopW;
     }
 
+    if (!environment && OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY | TOKEN_DUPLICATE, &token))
+    {
+        CreateEnvironmentBlock(&environment, token, FALSE);
+        CloseHandle(token);
+    }
+
     service_entry->status.dwCurrentState = SERVICE_START_PENDING;
     service_entry->status.dwControlsAccepted = 0;
     ResetEvent(service_entry->status_changed_event);
@@ -801,7 +808,7 @@ static DWORD service_start_process(struct service_entry *service_entry, struct p
 
     service_unlock(service_entry);
 
-    r = CreateProcessW(NULL, path, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &si, &pi);
+    r = CreateProcessW(NULL, path, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, environment, NULL, &si, &pi);
     HeapFree(GetProcessHeap(),0,path);
     if (!r)
     {
@@ -975,20 +982,11 @@ int main(int argc, char *argv[])
         'C','o','n','t','r','o','l','\\',
         'S','e','r','v','i','c','e','C','u','r','r','e','n','t',0};
     static const WCHAR svcctl_started_event[] = SVCCTL_STARTED_EVENT;
-    HANDLE started_event, htok;
+    HANDLE started_event;
     DWORD err;
 
     started_event = CreateEventW(NULL, TRUE, FALSE, svcctl_started_event);
 
-    if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok))
-    {
-        CreateEnvironmentBlock(&env, htok, FALSE);
-        CloseHandle(htok);
-    }
-
-    if (!env)
-        WINE_ERR("failed to create services environment\n");
-
     err = RegCreateKeyExW(HKEY_LOCAL_MACHINE, service_current_key_str, 0,
         NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE | KEY_QUERY_VALUE, NULL,
         &service_current_key, NULL);
@@ -1010,8 +1008,8 @@ int main(int argc, char *argv[])
         RPC_Stop();
     }
     scmdatabase_destroy(active_database);
-    if (env)
-        DestroyEnvironmentBlock(env);
+    if (environment)
+        DestroyEnvironmentBlock(environment);
 
     WINE_TRACE("services.exe exited with code %d\n", err);
     return err;
diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c
index 66b273c..70f3262 100644
--- a/programs/services/tests/service.c
+++ b/programs/services/tests/service.c
@@ -96,6 +96,7 @@ static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_da
 static void WINAPI service_main(DWORD argc, char **argv)
 {
     SERVICE_STATUS status;
+    char buf[64];
     BOOL res;
 
     service_ok(argc == 3, "argc = %u, expected 3\n", argc);
@@ -103,6 +104,10 @@ static void WINAPI service_main(DWORD argc, char **argv)
     service_ok(!strcmp(argv[1], "param1"), "argv[1] = '%s', expected 'param1'\n", argv[1]);
     service_ok(!strcmp(argv[2], "param2"), "argv[2] = '%s', expected 'param2'\n", argv[2]);
 
+    buf[0] = 0;
+    GetEnvironmentVariableA("PATHEXT", buf, sizeof(buf));
+    service_ok(buf[0], "did not find PATHEXT environment variable\n");
+
     service_handle = pRegisterServiceCtrlHandlerExA(service_name, service_handler, NULL);
     service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError());
     if(!service_handle)