Jacek Caban : sechost: Use nameless unions.
Alexandre Julliard
julliard at winehq.org
Wed Mar 24 16:20:42 CDT 2021
Module: wine
Branch: master
Commit: b8b57a9809a9edf4853c454948534eeb55736f9d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8b57a9809a9edf4853c454948534eeb55736f9d
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Mar 24 18:38:14 2021 +0100
sechost: Use nameless unions.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/sechost/Makefile.in | 1 -
dlls/sechost/service.c | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in
index 8e03946c7af..f4d88272857 100644
--- a/dlls/sechost/Makefile.in
+++ b/dlls/sechost/Makefile.in
@@ -2,7 +2,6 @@ MODULE = sechost.dll
IMPORTLIB = sechost
IMPORTS = kernelbase
DELAYIMPORTS = rpcrt4
-EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c
index 5beff41a164..305c1169bd4 100644
--- a/dlls/sechost/service.c
+++ b/dlls/sechost/service.c
@@ -533,10 +533,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH ChangeServiceConfig2W( SC_HANDLE service, DWORD le
rpc_privinfo.cbRequiredPrivileges = multisz_size( privinfo->pmszRequiredPrivileges );
rpc_privinfo.pRequiredPrivileges = (BYTE *)privinfo->pmszRequiredPrivileges;
- rpc_info.u.privinfo = &rpc_privinfo;
+ rpc_info.privinfo = &rpc_privinfo;
}
else
- rpc_info.u.descr = info;
+ rpc_info.descr = info;
err = svcctl_ChangeServiceConfig2W( service, rpc_info );
}
__EXCEPT(rpc_filter)
@@ -1309,7 +1309,7 @@ static DWORD WINAPI notify_thread(void *user)
if (err == ERROR_SUCCESS && list)
{
- cparams = list->NotifyParamsArray[0].u.params;
+ cparams = list->NotifyParamsArray[0].params;
data->notify_buffer->dwNotificationStatus = cparams->dwNotificationStatus;
memcpy(&data->notify_buffer->ServiceStatus, &cparams->ServiceStatus,
@@ -1372,7 +1372,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH NotifyServiceStatusChangeW( SC_HANDLE service, DW
}
data->params.dwInfoLevel = 2;
- data->params.u.params = &data->cparams;
+ data->params.params = &data->cparams;
data->cparams.dwNotifyMask = mask;
More information about the wine-cvs
mailing list