From 3b8ec3046a62588a145ba8a92a2c257f0a06bbdb Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 12 May 2018 17:25:16 -0500 Subject: [PATCH] advapi32: Correctly translate SERVICE_REQUIRED_PRIVILEGES_INFO to RPC. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard --- dlls/advapi32/service.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index c78edb2a712..11f4da07162 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2448,6 +2448,7 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, LPVOID lpInfo) { + SERVICE_RPC_REQUIRED_PRIVILEGES_INFO rpc_privinfo; DWORD err; __TRY @@ -2455,7 +2456,19 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, SC_RPC_CONFIG_INFOW info; info.dwInfoLevel = dwInfoLevel; - info.u.descr = lpInfo; + if (dwInfoLevel == SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO) + { + SERVICE_REQUIRED_PRIVILEGES_INFOW *privinfo = lpInfo; + WCHAR *p; + + for (p = privinfo->pmszRequiredPrivileges; *p; p += strlenW(p) + 1); + rpc_privinfo.cbRequiredPrivileges = + (p - privinfo->pmszRequiredPrivileges + 1) * sizeof(WCHAR); + rpc_privinfo.pRequiredPrivileges = (BYTE *)privinfo->pmszRequiredPrivileges; + info.u.privinfo = &rpc_privinfo; + } + else + info.u.descr = lpInfo; err = svcctl_ChangeServiceConfig2W( hService, info ); } __EXCEPT(rpc_filter)