ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: Create service environment when first service is started.

This commit is contained in:
Piotr Caban 2011-11-15 12:55:58 +01:00 committed by Alexandre Julliard
parent f0d8c3383e
commit 8141fb80eb
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/services/Makefile.in
View File

@ -1,7 +1,7 @@
EXTRADEFS = -DWINE_NO_UNICODE_MACROS EXTRADEFS = -DWINE_NO_UNICODE_MACROS
MODULE = services.exe MODULE = services.exe
APPMODE = -mconsole APPMODE = -mconsole
IMPORTS = rpcrt4 advapi32 IMPORTS = rpcrt4 advapi32 userenv
C_SRCS = \ C_SRCS = \
rpc.c \ rpc.c \

17
programs/services/services.c
View File

@ -24,6 +24,7 @@
#include <windows.h> #include <windows.h>
#include <winsvc.h> #include <winsvc.h>
#include <rpc.h> #include <rpc.h>
#include <userenv.h>
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -40,6 +41,7 @@ struct scmdatabase *active_database;
DWORD service_pipe_timeout = 10000; DWORD service_pipe_timeout = 10000;
DWORD service_kill_timeout = 20000; DWORD service_kill_timeout = 20000;
static void *env = NULL;
static const int is_win64 = (sizeof(void *) > sizeof(int)); static const int is_win64 = (sizeof(void *) > sizeof(int));
@ -581,6 +583,17 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE *
service_lock_exclusive(service_entry); service_lock_exclusive(service_entry);
if (!env)
{
HANDLE htok;
if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok))
CreateEnvironmentBlock(&env, htok, FALSE);
if (!env)
WINE_ERR("failed to create services environment\n");
}
size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0); size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0);
path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR));
if (!path) if (!path)
@ -632,7 +645,7 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE *
service_unlock(service_entry); service_unlock(service_entry);
r = CreateProcessW(NULL, path, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); r = CreateProcessW(NULL, path, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &si, &pi);
HeapFree(GetProcessHeap(),0,path); HeapFree(GetProcessHeap(),0,path);
if (!r) if (!r)
{ {
@ -867,5 +880,7 @@ int main(int argc, char *argv[])
RPC_MainLoop(); RPC_MainLoop();
} }
scmdatabase_destroy(active_database); scmdatabase_destroy(active_database);
if (env)
DestroyEnvironmentBlock(env);
return err; return err;
} }