diff --git a/reactos/boot/bootdata/hivesft.inf b/reactos/boot/bootdata/hivesft.inf index 80fb969952b..d8a76a7718c 100644 --- a/reactos/boot/bootdata/hivesft.inf +++ b/reactos/boot/bootdata/hivesft.inf @@ -1059,14 +1059,12 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"Administrator" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"Secret" -;Time Zone Servers +; Time Zone Servers HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","2",0x00000000,"asia.pool.ntp.org" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","3",0x00000000,"europe.pool.ntp.org" diff --git a/reactos/dll/win32/advapi32/service/scm.c b/reactos/dll/win32/advapi32/service/scm.c index f8cc95a7310..29ecebe13e2 100644 --- a/reactos/dll/win32/advapi32/service/scm.c +++ b/reactos/dll/win32/advapi32/service/scm.c @@ -1675,7 +1675,7 @@ WaitForSCManager(VOID) /* Try to open the existing event */ hEvent = OpenEventW(SYNCHRONIZE, FALSE, - L"SvcctrlStartEvent_A3752DX"); + SCM_START_EVENT); if (hEvent == NULL) { if (GetLastError() != ERROR_FILE_NOT_FOUND) @@ -1685,13 +1685,13 @@ WaitForSCManager(VOID) hEvent = CreateEventW(NULL, TRUE, FALSE, - L"SvcctrlStartEvent_A3752DX"); + SCM_START_EVENT); if (hEvent == NULL) { /* Try to open the existing event again */ hEvent = OpenEventW(SYNCHRONIZE, FALSE, - L"SvcctrlStartEvent_A3752DX"); + SCM_START_EVENT); if (hEvent == NULL) return; } diff --git a/reactos/include/reactos/services/services.h b/reactos/include/reactos/services/services.h index b30854eae4f..c513a291c3d 100644 --- a/reactos/include/reactos/services/services.h +++ b/reactos/include/reactos/services/services.h @@ -19,6 +19,12 @@ /* Start a service that runs in its own process */ #define SERVICE_CONTROL_START_OWN 81 +/* + * Start event name used by OpenSCManager + * to know whether the SCM is initialized. + */ +#define SCM_START_EVENT L"SvcctrlStartEvent_A3752DX" + typedef struct _SCM_CONTROL_PACKET { DWORD dwSize;