From fafcd50a35a77f1dd1f4606a30dd4f5b6fe520bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 28 Jun 2018 22:32:28 +0200 Subject: [PATCH] [SERVICES] Minor additions. - Remove a redundant ScmWaitForLsa() call. - Remove the LSA_RPC_SERVER_ACTIVE macro (just use directly the string). - Improve output of DPRINTs. --- base/system/services/services.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/base/system/services/services.c b/base/system/services/services.c index 3b3342f3504..bd7f24ccc0e 100644 --- a/base/system/services/services.c +++ b/base/system/services/services.c @@ -24,7 +24,6 @@ int WINAPI RegisterServicesProcess(DWORD ServicesProcessId); /* Defined in include/reactos/services/services.h */ // #define SCM_START_EVENT L"SvcctrlStartEvent_A3752DX" #define SCM_AUTOSTARTCOMPLETE_EVENT L"SC_AutoStartComplete" -#define LSA_RPC_SERVER_ACTIVE L"LSA_RPC_SERVER_ACTIVE" BOOL ScmInitialize = FALSE; BOOL ScmShutdown = FALSE; @@ -85,10 +84,10 @@ ScmLogEvent(DWORD dwEventId, VOID ScmWaitForLsa(VOID) { - HANDLE hEvent = CreateEventW(NULL, TRUE, FALSE, LSA_RPC_SERVER_ACTIVE); + HANDLE hEvent = CreateEventW(NULL, TRUE, FALSE, L"LSA_RPC_SERVER_ACTIVE"); if (hEvent == NULL) { - DPRINT1("Failed to create the notification event (Error %lu)\n", GetLastError()); + DPRINT1("Failed to create or open the notification event (Error %lu)\n", GetLastError()); } else { @@ -194,9 +193,6 @@ wWinMain(HINSTANCE hInstance, goto done; } - /* Wait for the LSA server */ - ScmWaitForLsa(); - /* Update the services database */ ScmGetBootAndSystemDriverState();