[SERVICES] Restore Herves name and readd g_dwServiceBits CORE-18071

Partial revert of 0.4.15-dev-4274-g d31a557237

As hbelusca explained the special character will warn only
once for each non-UTF8-file and not every time, unlike I anticipated.

The g_dwServiceBits is not important right now, but hpoussin expects it
to be a preparation step for making the stuff passed to the
function SetServiceBits() persistent
https://docs.microsoft.com/en-us/windows/win32/api/lmserver/nf-lmserver-setservicebits
for (yet unknown) features to come.
This commit is contained in:
Joachim Henze 2022-03-20 20:52:53 +01:00
parent d31a557237
commit b66389c140
2 changed files with 9 additions and 2 deletions

View file

@ -4,7 +4,7 @@
* FILE: base/system/services/database.c * FILE: base/system/services/database.c
* PURPOSE: Database control interface * PURPOSE: Database control interface
* COPYRIGHT: Copyright 2002-2006 Eric Kohl * COPYRIGHT: Copyright 2002-2006 Eric Kohl
* Copyright 2006 H. Poussineau <hpoussin@reactos.org> * Copyright 2006 Hervé Poussineau <hpoussin@reactos.org>
* Copyright 2007 Ged Murphy <gedmurphy@reactos.org> * Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
* Gregor Brunmar <gregor.brunmar@home.se> * Gregor Brunmar <gregor.brunmar@home.se>
* *

View file

@ -4,7 +4,7 @@
* FILE: base/system/services/rpcserver.c * FILE: base/system/services/rpcserver.c
* PURPOSE: RPC server interface for the advapi32 calls * PURPOSE: RPC server interface for the advapi32 calls
* COPYRIGHT: Copyright 2005-2006 Eric Kohl * COPYRIGHT: Copyright 2005-2006 Eric Kohl
* Copyright 2006-2007 H. Poussineau <hpoussin@reactos.org> * Copyright 2006-2007 Hervé Poussineau <hpoussin@reactos.org>
* Copyright 2007 Ged Murphy <gedmurphy@reactos.org> * Copyright 2007 Ged Murphy <gedmurphy@reactos.org>
*/ */
@ -99,6 +99,7 @@ ScmServiceMapping = {SERVICE_READ,
SERVICE_EXECUTE, SERVICE_EXECUTE,
SERVICE_ALL_ACCESS}; SERVICE_ALL_ACCESS};
DWORD g_dwServiceBits = 0;
/* FUNCTIONS ***************************************************************/ /* FUNCTIONS ***************************************************************/
@ -1893,14 +1894,20 @@ RI_ScSetServiceBitsW(
if (bSetBitsOn) if (bSetBitsOn)
{ {
DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); DPRINT("Old service bits: %08lx\n", pService->dwServiceBits);
DPRINT("Old global service bits: %08lx\n", g_dwServiceBits);
pService->dwServiceBits |= dwServiceBits; pService->dwServiceBits |= dwServiceBits;
g_dwServiceBits |= dwServiceBits;
DPRINT("New service bits: %08lx\n", pService->dwServiceBits); DPRINT("New service bits: %08lx\n", pService->dwServiceBits);
DPRINT("New global service bits: %08lx\n", g_dwServiceBits);
} }
else else
{ {
DPRINT("Old service bits: %08lx\n", pService->dwServiceBits); DPRINT("Old service bits: %08lx\n", pService->dwServiceBits);
DPRINT("Old global service bits: %08lx\n", g_dwServiceBits);
pService->dwServiceBits &= ~dwServiceBits; pService->dwServiceBits &= ~dwServiceBits;
g_dwServiceBits &= ~dwServiceBits;
DPRINT("New service bits: %08lx\n", pService->dwServiceBits); DPRINT("New service bits: %08lx\n", pService->dwServiceBits);
DPRINT("New global service bits: %08lx\n", g_dwServiceBits);
} }
return ERROR_SUCCESS; return ERROR_SUCCESS;