[hpoussin] 29997: Add .ndi extension as it is usually done in network driver .inf files Clean up TCP/IP service installation, by letting setupapi do most of the work
Author: hpoussin Date: Wed Oct 31 11:57:13 2007 New Revision: 29997
URL: http://svn.reactos.org/svn/reactos?rev=29997&view=rev Log: Add .ndi extension as it is usually done in network driver .inf files Clean up TCP/IP service installation, by letting setupapi do most of the work
Modified: trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/netrtpnt.inf trunk/reactos/media/inf/nettcpip.inf
Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=29... ============================================================================== --- trunk/reactos/media/inf/netamd.inf (original) +++ trunk/reactos/media/inf/netamd.inf Wed Oct 31 11:57:13 2007 @@ -18,11 +18,11 @@ %AMDMfg% = AMDMfg
[AMDMfg] -%PCNET.DeviceDesc% = PCNet_Inst,PCI\VEN_1022&DEV_2000 +%PCNET.DeviceDesc% = PCNet_Inst.ndi,PCI\VEN_1022&DEV_2000
;----------------------------- PCNET DRIVER -----------------------------
-[PCNet_Inst.NT] +[PCNet_Inst.ndi.NT] Characteristics = 0x4 ; NCF_PHYSICAL BusType = 5 ; PCIBus AddReg = PCNet_AddReg.NT @@ -43,7 +43,7 @@ [PCNet_CopyFiles.NT] pcnet.sys
-[PCNet_Inst.NT.Services] +[PCNet_Inst.ndi.NT.Services] AddService = PCNet, 0x00000002, PCNet_Service_Inst
[PCNet_Service_Inst]
Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=29... ============================================================================== --- trunk/reactos/media/inf/netisa.inf (original) +++ trunk/reactos/media/inf/netisa.inf Wed Oct 31 11:57:13 2007 @@ -18,11 +18,11 @@ %GenericMfg% = GenericMfg
[GenericMfg] -%*PNP80D6.DeviceDesc% = NE2000_Inst,*PNP80D6 +%*PNP80D6.DeviceDesc% = NE2000_Inst.ndi,*PNP80D6
;---------------------------- NE2000 DRIVER -----------------------------
-[NE2000_Inst.NT] +[NE2000_Inst.ndi.NT] Characteristics = 0x4 ; NCF_PHYSICAL BusType = 14 ; PNPIsaBus AddReg = NE2000_AddReg.NT @@ -36,7 +36,7 @@ [NE2000_CopyFiles.NT] ne2000.sys
-[NE2000_Inst.NT.Services] +[NE2000_Inst.ndi.NT.Services] AddService = ne2000, 0x00000002, ne2000_Service_Inst
[ne2000_Service_Inst]
Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev=... ============================================================================== --- trunk/reactos/media/inf/netrtpnt.inf (original) +++ trunk/reactos/media/inf/netrtpnt.inf Wed Oct 31 11:57:13 2007 @@ -18,11 +18,11 @@ %RealtekMfg% = RealtekMfg
[RealtekMfg] -%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst,PCI\VEN_10EC&DEV_8029 +%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst.ndi,PCI\VEN_10EC&DEV_8029
;---------------------------- NE2000 DRIVER -----------------------------
-[NE2000_Inst.NT] +[NE2000_Inst.ndi.NT] Characteristics = 0x4 ; NCF_PHYSICAL BusType = 5 ; PCIBus AddReg = NE2000_AddReg.NT @@ -36,7 +36,7 @@ [NE2000_CopyFiles.NT] ne2000.sys
-[NE2000_Inst.NT.Services] +[NE2000_Inst.ndi.NT.Services] AddService = ne2000, 0x00000002, ne2000_Service_Inst
[ne2000_Service_Inst]
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 (original) +++ trunk/reactos/media/inf/nettcpip.inf Wed Oct 31 11:57:13 2007 @@ -14,9 +14,9 @@ ;----------------------------- TCP/IP DRIVER ----------------------------
[MS_TCPIP.PrimaryInstall] -AddReg = TCPIP_AddReg.NT +AddReg = TCPIP_AddReg_Global.NT
-[TCPIP_AddReg.NT] +[TCPIP_AddReg_Global.NT] ; The following entries should be generated from .inf files during installation ; TCPIP Protocol HKLM,"SYSTEM\CurrentControlSet\Control\Network{4D36E975-E325-11CE-BFC1-08002BE10318}{RandomProtocolGUID_TCPIP}","Characteristics",0x00010001,0x00000080 @@ -29,24 +29,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Network{4D36E975-E325-11CE-BFC1-08002BE10318}{RandomProtocolGUID_TCPIP}\Ndi","Service",0x00000000,"Tcpip"
; TCP/IP driver -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Group",0x00000000,"PNP_TDI" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ImagePath",0x00020000,"system32\drivers\tcpip.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Type",0x00010001,0x00000001 ; NOTE: These settings should be added by the network setup ; These bindings are of the windows 2000 type, and will probably need to be ; twiddled to get 3rd-party network-related software to work. ; NT4 puts additional stuff in the Bind, Export, and Route values. -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",0x00010000,"DataBasePath" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Domain",0x00010000,"" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Hostname",0x00010000,"ROSHost" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer",0x00010000,"0.0.0.0" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","ForwardBroadcasts",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","IPEnableRouter",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","SearchList",0x00010000,"" -HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","EnableSecurityFilters",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\PersistentRoutes",,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","UseDelayedAcceptance",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010 @@ -54,8 +40,29 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0c,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00010000,"Tcpip"
+[MS_TCPIP.PrimaryInstall.Services] +AddService = Tcpip, , tcpip_Service_Inst + +[tcpip_Service_Inst] +ServiceType = 1 +StartType = 1 +ErrorControl = 1 +ServiceBinary = %12%\tcpip.sys +LoadOrderGroup = PNP_TDI +AddReg = tcpip_AddReg + +[tcpip_AddReg] +HKR,"Parameters","DataBasePath",0x00010000,"DataBasePath" +HKR,"Parameters","Domain",0x00010000,"" +HKR,"Parameters","Hostname",0x00010000,"ROSHost" +HKR,"Parameters","NameServer",0x00010000,"0.0.0.0" +HKR,"Parameters","ForwardBroadcasts",0x00010001,0x00000000 +HKR,"Parameters","IPEnableRouter",0x00010001,0x00000000 +HKR,"Parameters","SearchList",0x00010000,"" +HKR,"Parameters","EnableSecurityFilters",0x00010001,0x00000000 +;HKR,"Parameters","PersistentRoutes",,0x00000010 + ;-------------------------------- STRINGS -------------------------------
[Strings] ReactOS = "ReactOS Team" -
-
hpoussin＠svn.reactos.org