From e145ed06c6e8619ddb21c4afe355f5ba2f99948b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Wed, 24 Aug 2016 19:55:12 +0000 Subject: [PATCH] [BOOTDATA] - Remove invalid "ServiceType" registry value of the MPU401 driver. - Fix MUP driver group. - Fix MountMgr driver group. - Fix rosfltmgr driver group. - Add "Base" group list (until we have it inside some driver inf). - Add tags for acpi, pci, null, beep and ksecdd drivers. svn path=/trunk/; revision=72450 --- reactos/boot/bootdata/hivesys.inf | 19 ++++++++++++------- reactos/drivers/base/beep/beep_reg.inf | 1 + reactos/drivers/crypto/ksecdd/ksecdd_reg.inf | 1 + rosapps/drivers/green/green.inf | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf index 4e5f20f021d..ffcc851c37e 100644 --- a/reactos/boot/bootdata/hivesys.inf +++ b/reactos/boot/bootdata/hivesys.inf @@ -1300,6 +1300,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\UseNewKey",,0x00000012 ; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order. +HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Base", 0x00000001, \ + 0x02, 0x00, 0x00, 0x00, \ + 0x01, 0x00, 0x00, 0x00, \ + 0x02, 0x00, 0x00, 0x00 HKLM,"SYSTEM\CurrentControlSet\Control\GroupOrderList","Video Save", 0x00000001, \ 0x02, 0x00, 0x00, 0x00, \ 0x01, 0x00, 0x00, 0x00, \ @@ -1499,18 +1503,16 @@ HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","Type",0x00010001,0x0 HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wkssvc.dll" ; MPU-401 MIDI driver -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ServiceType",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Group",0x00000000,"Base" HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ImagePath",0x00020000,"system32\drivers\mpu401.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Type",0x00010001,0x00000001 ; Multiple UNC provider driver HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)" HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"Network" -HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ImagePath",0x00020000,"system32\drivers\mup.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Type",0x00010001,0x00000002 @@ -1542,6 +1544,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Null","ErrorControl",0x00010001,0x000000 HKLM,"SYSTEM\CurrentControlSet\Services\Null","Group",0x00000000,"Base" HKLM,"SYSTEM\CurrentControlSet\Services\Null","ImagePath",0x00020000,"system32\drivers\null.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Null","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Null","Tag",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Null","Type",0x00010001,0x00000001 ; NMI device driver @@ -1630,7 +1633,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Type",0x00010001,0x00000001 ; MountMgr driver HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Group",0x00000000,"Boot Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Group",0x00000000,"System Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","ImagePath",0x00020000,"system32\drivers\mountmgr.sys" HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\MountMgr","Tag",0x00010001,0x00000008 @@ -1641,6 +1644,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ErrorControl",0x00010001,0x000000 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ImagePath",0x00020000,"system32\drivers\acpi.sys" HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Tag",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Type",0x00010001,0x00000001 ; PCI Bus driver @@ -1648,6 +1652,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x0000000 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ImagePath",0x00020000,"system32\drivers\pci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00 @@ -2004,7 +2009,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\ffs","Type",0x00010001,0x00000002 ; Filesystem Filter Manager driver HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ErrorControl",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"FSFilter Infrastructure" HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ImagePath",0x00020000,"system32\drivers\rosfltmgr.sys" HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Type",0x00010001,0x00000002 diff --git a/reactos/drivers/base/beep/beep_reg.inf b/reactos/drivers/base/beep/beep_reg.inf index c49f411f623..d5166457d10 100644 --- a/reactos/drivers/base/beep/beep_reg.inf +++ b/reactos/drivers/base/beep/beep_reg.inf @@ -4,4 +4,5 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x000000 HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Group",0x00000000,"Base" HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ImagePath",0x00020000,"system32\drivers\beep.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001 diff --git a/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf b/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf index 953433a219b..b2e91847e58 100644 --- a/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf +++ b/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf @@ -4,4 +4,5 @@ HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ErrorControl",0x00010001,0x0000 HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Group",0x00000000,"Base" HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ImagePath",0x00020000,"system32\drivers\ksecdd.sys" HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Tag",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Type",0x00010001,0x00000001 diff --git a/rosapps/drivers/green/green.inf b/rosapps/drivers/green/green.inf index 805fbda8207..274833e011a 100644 --- a/rosapps/drivers/green/green.inf +++ b/rosapps/drivers/green/green.inf @@ -38,7 +38,7 @@ ServiceType = 1 StartType = 1 ErrorControl = 0 ServiceBinary = %12%\green.sys -LoadOrderGroup = Extended base +LoadOrderGroup = Extended Base Description = %GREEN.DriverDesc% Dependencies = blue, serial