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

advapi32: Make struct service_data_t have the new SERVICE_STATUS_PROCESS struct.

This commit is contained in:
Rolf Kalbermatter 2007-04-24 07:14:38 +02:00 committed by Alexandre Julliard
parent 68b11d1290
commit e782b836be
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/advapi32/service.c
View File

@ -62,7 +62,7 @@ typedef struct service_data_t
LPHANDLER_FUNCTION_EX handler_ex; LPHANDLER_FUNCTION_EX handler_ex;
} handler; } handler;
LPVOID context; LPVOID context;
SERVICE_STATUS status; SERVICE_STATUS_PROCESS status;
HANDLE thread; HANDLE thread;
BOOL unicode : 1; BOOL unicode : 1;
BOOL extended : 1; /* uses handler_ex instead of handler? */ BOOL extended : 1; /* uses handler_ex instead of handler? */
@ -499,7 +499,7 @@ static BOOL service_handle_get_status(HANDLE pipe, const service_data *service)
/****************************************************************************** /******************************************************************************
* service_get_status * service_get_status
*/ */
static BOOL service_get_status(HANDLE pipe, LPSERVICE_STATUS status) static BOOL service_get_status(HANDLE pipe, LPSERVICE_STATUS_PROCESS status)
{ {
DWORD cmd[2], count = 0; DWORD cmd[2], count = 0;
BOOL r; BOOL r;
@ -1470,6 +1470,8 @@ static DWORD service_start_process(struct sc_service *hsvc)
r = CreateProcessW(NULL, path, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); r = CreateProcessW(NULL, path, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
if (r) if (r)
{ {
/* FIXME: Put the pid into the service struct */
handles[1] = pi.hProcess; handles[1] = pi.hProcess;
ret = WaitForMultipleObjectsEx(2, handles, FALSE, 30000, FALSE); ret = WaitForMultipleObjectsEx(2, handles, FALSE, 30000, FALSE);
if(ret != WAIT_OBJECT_0) if(ret != WAIT_OBJECT_0)
@ -1645,17 +1647,12 @@ BOOL WINAPI QueryServiceStatusEx(SC_HANDLE hService, SC_STATUS_TYPE InfoLevel,
pipe = service_open_pipe(hsvc->name); pipe = service_open_pipe(hsvc->name);
if (pipe != INVALID_HANDLE_VALUE) if (pipe != INVALID_HANDLE_VALUE)
{ {
r = service_get_status(pipe, (LPSERVICE_STATUS)&pSvcStatusData); r = service_get_status(pipe, pSvcStatusData);
CloseHandle(pipe); CloseHandle(pipe);
if (r) if (r)
return TRUE; return TRUE;
} }
/* FIXME: this would be the pid from service_start_process() */
pSvcStatusData->dwProcessId = 0;
/* service is running in a process that is not a system process */
pSvcStatusData->dwServiceFlags = 0;
TRACE("Failed to read service status\n"); TRACE("Failed to read service status\n");
/* read the service type from the registry */ /* read the service type from the registry */