[ros-diffs] [reactos] 01/01: [SERVICES] Restore Herves name and readd g_dwServiceBits CORE-18071

[Joachim Henze]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b66389c14078d1745d5a41...

commit b66389c14078d1745d5a415c7af1a195e8ececf1
Author:     Joachim Henze [e-mail]
AuthorDate: Sun Mar 20 20:52:53 2022 +0100
Commit:     Joachim Henze [e-mail]
CommitDate: Sun Mar 20 20:52:53 2022 +0100

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

Partial revert of 0.4.15-dev-4274-g d31a55723797ce85f60a7fa1491d916a583b1167

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-sets...
    for (yet unknown) features to come.
---
 base/system/services/database.c  | 2 +-
 base/system/services/rpcserver.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/base/system/services/database.c b/base/system/services/database.c
index ad790736177..d773a44e102 100644
--- a/base/system/services/database.c
+++ b/base/system/services/database.c
@@ -4,7 +4,7 @@
  * FILE:        base/system/services/database.c
  * PURPOSE:     Database control interface
  * COPYRIGHT:   Copyright 2002-2006 Eric Kohl
- *              Copyright 2006 H. Poussineau [e-mail]
+ *              Copyright 2006 Herv� Poussineau [e-mail]
  *              Copyright 2007 Ged Murphy [e-mail]
  *                             Gregor Brunmar [e-mail]
  *
diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c
index 2c8e96d3b57..cad1f3b0487 100644
--- a/base/system/services/rpcserver.c
+++ b/base/system/services/rpcserver.c
@@ -4,7 +4,7 @@
  * FILE:        base/system/services/rpcserver.c
  * PURPOSE:     RPC server interface for the advapi32 calls
  * COPYRIGHT:   Copyright 2005-2006 Eric Kohl
- *              Copyright 2006-2007 H. Poussineau [e-mail]
+ *              Copyright 2006-2007 Herv� Poussineau [e-mail]
  *              Copyright 2007 Ged Murphy [e-mail]
  */

@@ -99,6 +99,7 @@ ScmServiceMapping = {SERVICE_READ,
                      SERVICE_EXECUTE,
                      SERVICE_ALL_ACCESS};

+DWORD g_dwServiceBits = 0;

/* FUNCTIONS ***************************************************************/

@@ -1893,14 +1894,20 @@ RI_ScSetServiceBitsW(
     if (bSetBitsOn)
     {
         DPRINT("Old service bits: %08lx\n", pService->dwServiceBits);
+        DPRINT("Old global service bits: %08lx\n", g_dwServiceBits);
         pService->dwServiceBits |= dwServiceBits;
+        g_dwServiceBits |= dwServiceBits;
         DPRINT("New service bits: %08lx\n", pService->dwServiceBits);
+        DPRINT("New global service bits: %08lx\n", g_dwServiceBits);
     }
     else
     {
         DPRINT("Old service bits: %08lx\n", pService->dwServiceBits);
+        DPRINT("Old global service bits: %08lx\n", g_dwServiceBits);
         pService->dwServiceBits &= ~dwServiceBits;
+        g_dwServiceBits &= ~dwServiceBits;
         DPRINT("New service bits: %08lx\n", pService->dwServiceBits);
+        DPRINT("New global service bits: %08lx\n", g_dwServiceBits);
     }

return ERROR_SUCCESS;