From 70f3b132fabbf5302b7771352c1b5f5b461068f2 Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Mon, 16 Jul 2007 17:47:12 +0000 Subject: [PATCH] revert r27695 as it's already implemented in advapi32. My tests failed because it's incorrectly named. svn path=/trunk/; revision=27697 --- reactos/base/system/services/rpcserver.c | 3 --- reactos/base/system/services/services.c | 24 ------------------------ reactos/base/system/services/services.h | 1 - 3 files changed, 28 deletions(-) diff --git a/reactos/base/system/services/rpcserver.c b/reactos/base/system/services/rpcserver.c index 5555357f181..ef82f0b0834 100644 --- a/reactos/base/system/services/rpcserver.c +++ b/reactos/base/system/services/rpcserver.c @@ -1511,9 +1511,6 @@ ScmrOpenSCManagerW(handle_t BindingHandle, if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; - if (!ScmWaitForEvent()) - return ERROR_ACCESS_DENIED; - dwError = ScmCreateManagerHandle(lpDatabaseName, &hHandle); if (dwError != ERROR_SUCCESS) diff --git a/reactos/base/system/services/services.c b/reactos/base/system/services/services.c index 5fa835defac..60ad9fd45a1 100644 --- a/reactos/base/system/services/services.c +++ b/reactos/base/system/services/services.c @@ -94,30 +94,6 @@ ScmCreateStartEvent(PHANDLE StartEvent) } -BOOL ScmWaitForEvent() -{ - HANDLE hEvent; - BOOL ret = FALSE; - - hEvent = OpenEvent(EVENT_ALL_ACCESS, - FALSE, - TEXT("SvcctrlStartEvent_A3752DX")); - - if (hEvent) - { - DWORD ret = WaitForSingleObject(hEvent, - INFINITE); - - if (ret == WAIT_OBJECT_0) - ret = TRUE; - - CloseHandle(hEvent); - } - - return ret; -} - - BOOL ScmNamedPipeHandleRequest(PVOID Request, DWORD RequestSize, diff --git a/reactos/base/system/services/services.h b/reactos/base/system/services/services.h index 52f531cd765..f823a7816aa 100644 --- a/reactos/base/system/services/services.h +++ b/reactos/base/system/services/services.h @@ -134,7 +134,6 @@ VOID ScmStartRpcServer(VOID); /* services.c */ -BOOL ScmWaitForEvent(); VOID PrintString(LPCSTR fmt, ...); /* EOF */