[ros-diffs] [tfaber] 72916: [SYSSETUP] - Install the DHCP client service as part of nettcpip.inf. This ensures it does not try to run before tcpip is installed. CORE-12011 #resolve

Author: tfaber
Date: Thu Oct  6 10:57:29 2016
New Revision: 72916

URL: http://svn.reactos.org/svn/reactos?rev=72916&view=rev
Log:
[SYSSETUP]
- Install the DHCP client service as part of nettcpip.inf. This ensures it does not try to
run before tcpip is installed.
CORE-12011 #resolve

Modified:
    trunk/reactos/boot/bootdata/hivesys.inf
    trunk/reactos/dll/win32/syssetup/install.c
    trunk/reactos/media/inf/nettcpip.inf

Modified: trunk/reactos/boot/bootdata/hivesys.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?…
==============================================================================
--- trunk/reactos/boot/bootdata/hivesys.inf	[iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/hivesys.inf	[iso-8859-1] Thu Oct  6 10:57:29 2016
@@ -1470,17 +1470,6 @@

HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ImagePath",0x00020000,"system32\drivers\debugout.sys"

HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x00000004

HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00000001
-
-; DHCP client service
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","DisplayName",0x00000000,"DHCP
Client"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000,"Attempts
to obtain network settings automatically from an available DHCP server"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"TDI"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe
-k netsvcs"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ObjectName",0x00000000,"LocalSystem"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Start",0x00010001,0x00000002
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000020
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll"
 
 ; EMS Serial Administration Console Driver

HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000

Modified: trunk/reactos/dll/win32/syssetup/install.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/install.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/install.c	[iso-8859-1] Thu Oct  6 10:57:29 2016
@@ -834,6 +834,7 @@
     {
         /* Start the TCP/IP protocol driver */
         SetupStartService(L"Tcpip", FALSE);
+        SetupStartService(L"Dhcp", FALSE);
     }
 
     if (!CommonInstall())
@@ -1148,6 +1149,7 @@
     {
         /* Start the TCP/IP protocol driver */
         SetupStartService(L"Tcpip", FALSE);
+        SetupStartService(L"Dhcp", FALSE);
     }
 
 

Modified: trunk/reactos/media/inf/nettcpip.inf
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev…
==============================================================================
--- trunk/reactos/media/inf/nettcpip.inf	[iso-8859-1] (original)
+++ trunk/reactos/media/inf/nettcpip.inf	[iso-8859-1] Thu Oct  6 10:57:29 2016
@@ -234,6 +234,7 @@
 
 [MS_TCPIP.PrimaryInstall.Services]
 AddService = Tcpip, , tcpip_Service_Inst
+AddService = DHCP, , dhcp_Service_Inst
 
 [tcpip_Service_Inst]
 ServiceType   = 1
@@ -254,6 +255,20 @@
 HKR,"Parameters","EnableSecurityFilters",0x00010001,0x00000000
 ;HKR,"Parameters","PersistentRoutes",,0x00000010
 
+[dhcp_Service_Inst]
+DisplayName   = "DHCP Client"
+Description   = "Attempts to obtain network settings automatically from an available
DHCP server"
+ServiceType   = 0x20
+StartType     = 2
+ErrorControl  = 1
+ServiceBinary = "%11%\svchost.exe -k netsvcs"
+LoadOrderGroup = TDI
+AddReg=dhcp_AddReg
+
+[dhcp_AddReg]
+HKR,,"ObjectName",0x00000000,"LocalSystem"
+HKR,"Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll"
+
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]