Sebastian Lackner : services: Pass a process argument to send_control function.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Mar 16 11:36:41 CDT 2016
Module: wine
Branch: master
Commit: fa593d4d87ca2938ef706a5a782744e38738eae8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa593d4d87ca2938ef706a5a782744e38738eae8
Author: Sebastian Lackner <sebastian at fds-team.de>
Date: Wed Mar 16 04:32:34 2016 +0100
services: Pass a process argument to send_control function.
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/services/rpc.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/programs/services/rpc.c b/programs/services/rpc.c
index cdac948..59bbe7f 100644
--- a/programs/services/rpc.c
+++ b/programs/services/rpc.c
@@ -1035,25 +1035,25 @@ BOOL process_send_command(struct process_entry *process, const void *data, DWORD
}
/******************************************************************************
- * service_send_control
+ * process_send_control
*/
-static BOOL service_send_control(struct service_entry *service, DWORD dwControl, DWORD *result)
+static BOOL process_send_control(struct process_entry *process, const WCHAR *name, DWORD dwControl, DWORD *result)
{
service_start_info *ssi;
DWORD len;
BOOL r;
/* calculate how much space we need to send the startup info */
- len = strlenW(service->name) + 1;
+ len = strlenW(name) + 1;
ssi = HeapAlloc(GetProcessHeap(),0,FIELD_OFFSET(service_start_info, data[len]));
ssi->cmd = WINESERV_SENDCONTROL;
ssi->control = dwControl;
ssi->total_size = FIELD_OFFSET(service_start_info, data[len]);
- ssi->name_size = strlenW(service->name) + 1;
- strcpyW( ssi->data, service->name );
+ ssi->name_size = strlenW(name) + 1;
+ strcpyW(ssi->data, name);
- r = process_send_command(service->process, ssi, ssi->total_size, result);
+ r = process_send_command(process, ssi, ssi->total_size, result);
HeapFree( GetProcessHeap(), 0, ssi );
return r;
}
@@ -1176,7 +1176,7 @@ DWORD __cdecl svcctl_ControlService(
if (ret != WAIT_OBJECT_0)
return ERROR_SERVICE_REQUEST_TIMEOUT;
- service_send_control(service->service_entry, dwControl, &result);
+ process_send_control(service->service_entry->process, service->service_entry->name, dwControl, &result);
if (lpServiceStatus)
{
More information about the wine-cvs
mailing list