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

services: Return an error instead of BOOL from process_send_start_message. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2016-08-19 08:00:41 +02:00 committed by Alexandre Julliard
parent 68c1765a5d
commit 51f36c220e
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
programs/services/services.c
View File

@ -838,14 +838,13 @@ static DWORD service_is_running(struct service_entry *service)
/****************************************************************************** /******************************************************************************
* process_send_start_message * process_send_start_message
*/ */
static BOOL process_send_start_message(struct process_entry *process, const WCHAR *name, static DWORD process_send_start_message(struct process_entry *process, const WCHAR *name,
LPCWSTR *argv, DWORD argc) const WCHAR **argv, DWORD argc)
{ {
OVERLAPPED overlapped; OVERLAPPED overlapped;
DWORD i, len, result; DWORD i, len, result;
service_start_info *ssi; service_start_info *ssi;
LPWSTR p; LPWSTR p;
BOOL r;
WINE_TRACE("%p %s %p %d\n", process, wine_dbgstr_w(name), argv, argc); WINE_TRACE("%p %s %p %d\n", process, wine_dbgstr_w(name), argv, argc);
@ -862,13 +861,13 @@ static BOOL process_send_start_message(struct process_entry *process, const WCHA
if (!HasOverlappedIoCompleted( &overlapped )) if (!HasOverlappedIoCompleted( &overlapped ))
{ {
WINE_ERR("service %s failed to start\n", wine_dbgstr_w(name)); WINE_ERR("service %s failed to start\n", wine_dbgstr_w(name));
return FALSE; return ERROR_SERVICE_REQUEST_TIMEOUT;
} }
} }
else if (GetLastError() != ERROR_PIPE_CONNECTED) else if (GetLastError() != ERROR_PIPE_CONNECTED)
{ {
WINE_ERR("pipe connect failed\n"); WINE_ERR("pipe connect failed\n");
return FALSE; return ERROR_SERVICE_REQUEST_TIMEOUT;
} }
} }
@ -894,16 +893,11 @@ static BOOL process_send_start_message(struct process_entry *process, const WCHA
} }
*p=0; *p=0;
r = process_send_command( process, ssi, ssi->total_size, &result ); if (!process_send_command(process, ssi, ssi->total_size, &result))
if (r && result) result = ERROR_SERVICE_REQUEST_TIMEOUT;
{
SetLastError(result);
r = FALSE;
}
HeapFree(GetProcessHeap(),0,ssi); HeapFree(GetProcessHeap(), 0, ssi);
return result;
return r;
} }
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)
@ -914,8 +908,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *
err = service_start_process(service, &process); err = service_start_process(service, &process);
if (err == ERROR_SUCCESS) if (err == ERROR_SUCCESS)
{ {
if (!process_send_start_message(process, service->name, service_argv, service_argc)) err = process_send_start_message(process, service->name, service_argv, service_argc);
err = ERROR_SERVICE_REQUEST_TIMEOUT;
if (err == ERROR_SUCCESS) if (err == ERROR_SUCCESS)
err = process_wait_for_startup(process); err = process_wait_for_startup(process);