[hbelusca] 58520: [ADVAPI32-SERVICES] Put an event name into a macro (shared between advapi32.dll and services.exe) [BOOTDATA] Remove two reactos-specific and unused values in HKLM\SOFTWARE\Microso...
Author: hbelusca Date: Sat Mar 16 15:39:08 2013 New Revision: 58520
URL: http://svn.reactos.org/svn/reactos?rev=58520&view=rev Log: [ADVAPI32-SERVICES] Put an event name into a macro (shared between advapi32.dll and services.exe)
[BOOTDATA] Remove two reactos-specific and unused values in HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon : StartLsass and StartServices.
Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/include/reactos/services/services.h
Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?r... ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sat Mar 16 15:39:08 2013 @@ -1059,14 +1059,12 @@
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"
Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service/... ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Mar 16 15:39:08 2013 @@ -1675,7 +1675,7 @@ /* 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 @@ 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; }
Modified: trunk/reactos/include/reactos/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/services/se... ============================================================================== --- trunk/reactos/include/reactos/services/services.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/services/services.h [iso-8859-1] Sat Mar 16 15:39:08 2013 @@ -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;
-
hbelusca＠svn.reactos.org