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

services: Add a helper function to send a command to the service.

This commit is contained in:
Alexandre Julliard 2011-05-20 11:49:02 +02:00
parent be57450fee
commit 0c1c1fc20d
3 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
programs/services/rpc.c
View File

@ -887,13 +887,38 @@ static BOOL service_accepts_control(const struct service_entry *service, DWORD d
return FALSE; return FALSE;
} }
/******************************************************************************
* service_send_command
*/
BOOL service_send_command( struct service_entry *service, HANDLE pipe,
const void *data, DWORD size, DWORD *result )
{
DWORD count;
BOOL r;
r = WriteFile(pipe, data, size, &count, NULL);
if (!r || count != size)
{
WINE_ERR("service protocol error - failed to write pipe!\n");
return FALSE;
}
r = ReadFile(pipe, result, sizeof *result, &count, NULL);
if (!r || count != sizeof *result)
{
WINE_ERR("service protocol error - failed to read pipe "
"r = %d count = %d!\n", r, count);
return FALSE;
}
return r;
}
/****************************************************************************** /******************************************************************************
* service_send_control * service_send_control
*/ */
static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWORD dwControl, DWORD *result) static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWORD dwControl, DWORD *result)
{ {
service_start_info *ssi; service_start_info *ssi;
DWORD len, count = 0; DWORD len;
BOOL r; BOOL r;
/* calculate how much space we need to send the startup info */ /* calculate how much space we need to send the startup info */
@ -906,16 +931,8 @@ static BOOL service_send_control(struct service_entry *service, HANDLE pipe, DWO
ssi->name_size = strlenW(service->name) + 1; ssi->name_size = strlenW(service->name) + 1;
strcpyW( ssi->data, service->name ); strcpyW( ssi->data, service->name );
r = WriteFile(pipe, ssi, ssi->total_size, &count, NULL); r = service_send_command( service, pipe, ssi, ssi->total_size, result );
if (!r || count != ssi->total_size) HeapFree( GetProcessHeap(), 0, ssi );
{
WINE_ERR("service protocol error - failed to write pipe!\n");
return r;
}
r = ReadFile(pipe, result, sizeof *result, &count, NULL);
if (!r || count != sizeof *result)
WINE_ERR("service protocol error - failed to read pipe "
"r = %d count = %d!\n", r, count);
return r; return r;
} }

14
programs/services/services.c
View File

@ -671,7 +671,7 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL
*/ */
static BOOL service_send_start_message(struct service_entry *service, LPCWSTR *argv, DWORD argc) static BOOL service_send_start_message(struct service_entry *service, LPCWSTR *argv, DWORD argc)
{ {
DWORD i, len, count, result; DWORD i, len, result;
service_start_info *ssi; service_start_info *ssi;
LPWSTR p; LPWSTR p;
BOOL r; BOOL r;
@ -708,15 +708,11 @@ static BOOL service_send_start_message(struct service_entry *service, LPCWSTR *a
} }
*p=0; *p=0;
r = WriteFile(service->control_pipe, ssi, ssi->total_size, &count, NULL); r = service_send_command( service, service->control_pipe, ssi, ssi->total_size, &result );
if (r) if (r && result)
{ {
r = ReadFile(service->control_pipe, &result, sizeof result, &count, NULL); SetLastError(result);
if (r && result) r = FALSE;
{
SetLastError(result);
r = FALSE;
}
} }
HeapFree(GetProcessHeap(),0,ssi); HeapFree(GetProcessHeap(),0,ssi);

2
programs/services/services.h
View File

@ -75,6 +75,8 @@ void service_lock_shared(struct service_entry *service);
void service_lock_exclusive(struct service_entry *service); void service_lock_exclusive(struct service_entry *service);
void service_unlock(struct service_entry *service); void service_unlock(struct service_entry *service);
DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv); DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv);
BOOL service_send_command( struct service_entry *service, HANDLE pipe,
const void *data, DWORD size, DWORD *result );
extern HANDLE g_hStartedEvent; extern HANDLE g_hStartedEvent;