Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 02:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SERVICES]

Browse source 
Removing the redundant function WaitForLSA() and use ScmWaitForLsa() instead.
Patch by Hermès Bélusca.

See issue #7110 for more details.

svn path=/trunk/; revision=56721
This commit is contained in:
Eric Kohl 2012-06-11 19:02:00 +00:00
parent 916fe2874f
commit c8731b39d7
3 changed files with 9 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
reactos/base/system/services/database.c
View file

@ -661,46 +661,6 @@ ScmDeleteMarkedServices(VOID)
}
VOID
WaitForLSA(VOID)
{
HANDLE hEvent;
DWORD dwError;
DPRINT("WaitForLSA() called\n");
hEvent = CreateEventW(NULL,
TRUE,
FALSE,
L"LSA_RPC_SERVER_ACTIVE");
if (hEvent == NULL)
{
dwError = GetLastError();
DPRINT1("Failed to create the notication event (Error %lu)\n", dwError);
if (dwError == ERROR_ALREADY_EXISTS)
{
hEvent = OpenEventW(SYNCHRONIZE,
FALSE,
L"LSA_RPC_SERVER_ACTIVE");
if (hEvent != NULL)
{
DPRINT1("Could not open the notification event!\n");
return;
}
}
}
DPRINT("Wait for LSA!\n");
WaitForSingleObject(hEvent, INFINITE);
DPRINT("LSA is available!\n");
CloseHandle(hEvent);
DPRINT("WaitForLSA() done\n");
}
DWORD
ScmCreateServiceDatabase(VOID)
{
@ -772,8 +732,8 @@ ScmCreateServiceDatabase(VOID)
RegCloseKey(hServicesKey);
/* Wait for LSA */
WaitForLSA();
/* Wait for the LSA server */
ScmWaitForLsa();
/* Delete services that are marked for delete */
ScmDeleteMarkedServices();

10
reactos/base/system/services/services.c
View file

@ -113,8 +113,8 @@ ScmCreateStartEvent(PHANDLE StartEvent)
}
static VOID
ScmWaitForLsass(VOID)
VOID
ScmWaitForLsa(VOID)
{
HANDLE hEvent;
DWORD dwError;
@ -126,7 +126,7 @@ ScmWaitForLsass(VOID)
if (hEvent == NULL)
{
dwError = GetLastError();
DPRINT("Failed to create the notication event (Error %lu)\n", dwError);
DPRINT1("Failed to create the notication event (Error %lu)\n", dwError);
if (dwError == ERROR_ALREADY_EXISTS)
{
@ -146,6 +146,8 @@ ScmWaitForLsass(VOID)
DPRINT("LSA server running!\n");
CloseHandle(hEvent);
DPRINT("ScmWaitForLsa() done\n");
}
@ -420,7 +422,7 @@ wWinMain(HINSTANCE hInstance,
SetConsoleCtrlHandler(ShutdownHandlerRoutine, TRUE);
/* Wait for the LSA server */
ScmWaitForLsass();
ScmWaitForLsa();
/* Acquire privileges to load drivers */
AcquireLoadDriverPrivilege();

1
reactos/base/system/services/services.h
View file

@ -161,6 +161,7 @@ VOID PrintString(LPCSTR fmt, ...);
VOID ScmLogError(DWORD dwEventId,
WORD wStrings,
LPCWSTR *lpStrings);
VOID ScmWaitForLsa(VOID);
/* EOF */