services: Use nameless unions.
Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
ce39ae9f4d
commit
a4b0732451
|
@ -1,6 +1,5 @@
|
|||
MODULE = services.exe
|
||||
IMPORTS = rpcrt4 advapi32 userenv setupapi
|
||||
EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
|
||||
|
||||
EXTRADLLFLAGS = -mconsole -mno-cygwin
|
||||
|
||||
|
|
|
@ -859,7 +859,7 @@ static void fill_notify(struct sc_notify_handle *notify, struct service_entry *s
|
|||
list->cElements = 1;
|
||||
|
||||
list->NotifyParamsArray[0].dwInfoLevel = 2;
|
||||
list->NotifyParamsArray[0].u.params = cparams;
|
||||
list->NotifyParamsArray[0].params = cparams;
|
||||
|
||||
InterlockedExchangePointer((void**)¬ify->params_list, list);
|
||||
|
||||
|
@ -934,12 +934,12 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI
|
|||
{
|
||||
WCHAR *descr = NULL;
|
||||
|
||||
if (!config.u.descr->lpDescription)
|
||||
if (!config.descr->lpDescription)
|
||||
break;
|
||||
|
||||
if (config.u.descr->lpDescription[0])
|
||||
if (config.descr->lpDescription[0])
|
||||
{
|
||||
if (!(descr = strdupW( config.u.descr->lpDescription )))
|
||||
if (!(descr = strdupW( config.descr->lpDescription )))
|
||||
return ERROR_NOT_ENOUGH_MEMORY;
|
||||
}
|
||||
|
||||
|
@ -953,15 +953,15 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI
|
|||
break;
|
||||
case SERVICE_CONFIG_FAILURE_ACTIONS:
|
||||
WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %u msg %s cmd %s\n",
|
||||
config.u.actions->dwResetPeriod,
|
||||
wine_dbgstr_w(config.u.actions->lpRebootMsg),
|
||||
wine_dbgstr_w(config.u.actions->lpCommand) );
|
||||
config.actions->dwResetPeriod,
|
||||
wine_dbgstr_w(config.actions->lpRebootMsg),
|
||||
wine_dbgstr_w(config.actions->lpCommand) );
|
||||
break;
|
||||
case SERVICE_CONFIG_PRESHUTDOWN_INFO:
|
||||
WINE_TRACE( "changing service %p preshutdown timeout to %d\n",
|
||||
service, config.u.preshutdown->dwPreshutdownTimeout );
|
||||
service, config.preshutdown->dwPreshutdownTimeout );
|
||||
service_lock( service->service_entry );
|
||||
service->service_entry->preshutdown_timeout = config.u.preshutdown->dwPreshutdownTimeout;
|
||||
service->service_entry->preshutdown_timeout = config.preshutdown->dwPreshutdownTimeout;
|
||||
save_service_config( service->service_entry );
|
||||
service_unlock( service->service_entry );
|
||||
break;
|
||||
|
@ -1682,7 +1682,7 @@ DWORD __cdecl svcctl_NotifyServiceStatusChange(
|
|||
struct sc_handle *hdr = handle;
|
||||
|
||||
WINE_TRACE("(%p, NotifyMask: 0x%x, %p, %p, %p, %p)\n", handle,
|
||||
params.u.params->dwNotifyMask, clientprocessguid, scmprocessguid,
|
||||
params.params->dwNotifyMask, clientprocessguid, scmprocessguid,
|
||||
createremotequeue, hNotify);
|
||||
|
||||
switch (hdr->type)
|
||||
|
@ -1716,7 +1716,7 @@ DWORD __cdecl svcctl_NotifyServiceStatusChange(
|
|||
|
||||
notify->event = CreateEventW(NULL, TRUE, FALSE, NULL);
|
||||
|
||||
notify->notify_mask = params.u.params->dwNotifyMask;
|
||||
notify->notify_mask = params.params->dwNotifyMask;
|
||||
|
||||
service_lock(service->service_entry);
|
||||
|
||||
|
|
Loading…
Reference in New Issue