Commit 123cfee9 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

services: Fix compilation on systems that don't support nameless unions.

parent fa01fdc3
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NONAMELESSUNION
#include <stdarg.h> #include <stdarg.h>
#include <windows.h> #include <windows.h>
...@@ -797,9 +798,9 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI ...@@ -797,9 +798,9 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI
{ {
WCHAR *descr = NULL; WCHAR *descr = NULL;
if (config.descr->lpDescription[0]) if (config.u.descr->lpDescription[0])
{ {
if (!(descr = strdupW( config.descr->lpDescription ))) if (!(descr = strdupW( config.u.descr->lpDescription )))
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
} }
...@@ -813,15 +814,15 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI ...@@ -813,15 +814,15 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI
break; break;
case SERVICE_CONFIG_FAILURE_ACTIONS: case SERVICE_CONFIG_FAILURE_ACTIONS:
WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %u msg %s cmd %s\n", WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %u msg %s cmd %s\n",
config.actions->dwResetPeriod, config.u.actions->dwResetPeriod,
wine_dbgstr_w(config.actions->lpRebootMsg), wine_dbgstr_w(config.u.actions->lpRebootMsg),
wine_dbgstr_w(config.actions->lpCommand) ); wine_dbgstr_w(config.u.actions->lpCommand) );
break; break;
case SERVICE_CONFIG_PRESHUTDOWN_INFO: case SERVICE_CONFIG_PRESHUTDOWN_INFO:
WINE_TRACE( "changing service %p preshutdown timeout to %d\n", WINE_TRACE( "changing service %p preshutdown timeout to %d\n",
service, config.preshutdown->dwPreshutdownTimeout ); service, config.u.preshutdown->dwPreshutdownTimeout );
service_lock_exclusive( service->service_entry ); service_lock_exclusive( service->service_entry );
service->service_entry->preshutdown_timeout = config.preshutdown->dwPreshutdownTimeout; service->service_entry->preshutdown_timeout = config.u.preshutdown->dwPreshutdownTimeout;
save_service_config( service->service_entry ); save_service_config( service->service_entry );
service_unlock( service->service_entry ); service_unlock( service->service_entry );
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment