From 2c032f3fc94ec9f4d1fd4c1d3570c33a1707cb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 29 Mar 2022 04:01:55 +0200 Subject: [PATCH] [BOOTDATA][FS] Small adjustments of filesystem drivers registry parameters. - Fix the ErrorControl values to 1 (SERVICE_ERROR_NORMAL). - Fix RamDisk driver type (it's SERVICE_KERNEL_DRIVER, not FS). - btrfs.inf : This is a filesystem driver, so fix its ServiceType. - Move 3rd-party FS data (btrfs, ext2, nfs(d)) from the system hivesys.inf and into their dedicated **.reg.inf files. --- base/services/nfsd/CMakeLists.txt | 2 ++ base/services/nfsd/nfsd_reg.inf | 8 +++++ boot/bootdata/hivesys.inf | 46 +++--------------------- drivers/filesystems/btrfs/CMakeLists.txt | 2 ++ drivers/filesystems/btrfs/btrfs.inf | 2 +- drivers/filesystems/btrfs/btrfs_reg.inf | 7 ++++ drivers/filesystems/cdfs/CMakeLists.txt | 1 + drivers/filesystems/cdfs/cdfs_reg.inf | 5 +-- drivers/filesystems/ext2/CMakeLists.txt | 1 + drivers/filesystems/ext2/ext2fs_reg.inf | 4 +-- drivers/filesystems/msfs/msfs_reg.inf | 5 +-- drivers/filesystems/nfs/CMakeLists.txt | 1 + drivers/filesystems/nfs/nfs41_reg.inf | 10 ++++++ drivers/filesystems/npfs/npfs_reg.inf | 5 +-- drivers/filesystems/udfs/udfs_reg.inf | 4 +-- 15 files changed, 50 insertions(+), 53 deletions(-) create mode 100644 base/services/nfsd/nfsd_reg.inf create mode 100644 drivers/filesystems/btrfs/btrfs_reg.inf create mode 100644 drivers/filesystems/nfs/nfs41_reg.inf diff --git a/base/services/nfsd/CMakeLists.txt b/base/services/nfsd/CMakeLists.txt index fdb6f81857a..6a96dd66c80 100644 --- a/base/services/nfsd/CMakeLists.txt +++ b/base/services/nfsd/CMakeLists.txt @@ -59,6 +59,8 @@ endif() set_module_type(nfsd win32cui) add_importlibs(nfsd advapi32 iphlpapi kernel32_vista libtirpc msvcrt shell32 ws2_32 wldap32 kernel32 ntdll) add_pch(nfsd precomp.h SOURCE) + add_cd_file(TARGET nfsd DESTINATION reactos/system32 FOR all) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/netconfig" DESTINATION reactos/system32/drivers/etc FOR all) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ms-nfs41-idmap.conf" DESTINATION reactos/system32/drivers/etc FOR all) +add_registry_inf(nfsd_reg.inf) diff --git a/base/services/nfsd/nfsd_reg.inf b/base/services/nfsd/nfsd_reg.inf new file mode 100644 index 00000000000..8d2bb10315f --- /dev/null +++ b/base/services/nfsd/nfsd_reg.inf @@ -0,0 +1,8 @@ +; NFS daemon +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","DisplayName",0x00000000,"NFSv4.1 Client" +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ImagePath",0x00020000,"%SystemRoot%\system32\nfsd.exe --noldap" +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Type",0x00010001,0x00000010 diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 2486a3f551c..507f09cc7c5 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1705,7 +1705,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 ; NTFS filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ImagePath",0x00020000,"system32\drivers\ntfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000003 @@ -2180,55 +2180,17 @@ HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch\Parameters","ServiceDll",0x00 ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Type",0x00010001,0x00000001 ; Virtual FAT filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ImagePath",0x00020000,"system32\drivers\fastfat.sys" HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 ; RAM Disk class driver -HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ImagePath",0x00020000,"system32\drivers\ramdisk.sys" HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Type",0x00010001,0x00000002 - -; EXT2 Filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2fs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","CodePage",0x00000000,"default" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","WritingSupport",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","CheckingBitmap",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","Ext3ForceWriting",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs\Parameters","AutoMount",0x00010001,0x00000001 - -; BTRFS Filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Group",0x00000000,"Boot File System" -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ImagePath",0x00020000,"system32\drivers\btrfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Type",0x00010001,0x00000002 - -; NFS Filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Group",0x00000000,"Network" -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ImagePath",0x00020000,"system32\drivers\nfs41_driver.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Type",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","DeviceName",0x00000000,\Device\nfs41_driver -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","Name",0x00000000,"NFS41 Network" -HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","ProviderPath",0x00000000,System32\nfs41_np.dll - -; NFS daemon -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","DisplayName",0x00000000,"NFSv4.1 Client" -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ImagePath",0x00020000,"%SystemRoot%\system32\nfsd.exe --noldap" -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Start",0x00010001,0x00000003 -HKLM,"SYSTEM\CurrentControlSet\Services\pnfs","Type",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Type",0x00010001,0x00000001 ; Filesystem Filter Manager driver HKLM,"SYSTEM\CurrentControlSet\Services\fltmgr","ErrorControl",0x00010001,0x00000003 diff --git a/drivers/filesystems/btrfs/CMakeLists.txt b/drivers/filesystems/btrfs/CMakeLists.txt index e7427fd8e4a..b86b210542e 100644 --- a/drivers/filesystems/btrfs/CMakeLists.txt +++ b/drivers/filesystems/btrfs/CMakeLists.txt @@ -74,5 +74,7 @@ add_definitions(-D__KERNEL__) set_module_type(btrfs kernelmodedriver) target_link_libraries(btrfs rtlver zlib_solo chkstk wdmguid ${PSEH_LIB}) add_importlibs(btrfs ntoskrnl hal) + add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers NO_CAB FOR all) add_driver_inf(btrfs btrfs.inf) +add_registry_inf(btrfs_reg.inf) diff --git a/drivers/filesystems/btrfs/btrfs.inf b/drivers/filesystems/btrfs/btrfs.inf index fa841e227f2..08ef7f9106a 100644 --- a/drivers/filesystems/btrfs/btrfs.inf +++ b/drivers/filesystems/btrfs/btrfs.inf @@ -77,7 +77,7 @@ DelService = %ServiceName%,0x200 ;Ensure service is stopped before deleting DisplayName = %ServiceName% Description = %ServiceDescription% ServiceBinary = %12%\%DriverName%.sys ;%windir%\system32\drivers\ -ServiceType = 1 +ServiceType = 2 StartType = 1 ;SERVICE_SYSTEM_START ErrorControl = 1 LoadOrderGroup = "File System" diff --git a/drivers/filesystems/btrfs/btrfs_reg.inf b/drivers/filesystems/btrfs/btrfs_reg.inf new file mode 100644 index 00000000000..ec4ac369b27 --- /dev/null +++ b/drivers/filesystems/btrfs/btrfs_reg.inf @@ -0,0 +1,7 @@ +; BTRFS Filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","ImagePath",0x00020000,"system32\drivers\btrfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\btrfs","Type",0x00010001,0x00000002 diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt index 552224c2058..f85cfea326f 100644 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ b/drivers/filesystems/cdfs/CMakeLists.txt @@ -37,5 +37,6 @@ set_module_type(cdfs kernelmodedriver) target_link_libraries(cdfs ${PSEH_LIB} memcmp) add_importlibs(cdfs ntoskrnl hal) set_property(TARGET cdfs PROPERTY C_STANDARD 90) + add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(cdfs_reg.inf) diff --git a/drivers/filesystems/cdfs/cdfs_reg.inf b/drivers/filesystems/cdfs/cdfs_reg.inf index 9ae7413c613..f8d685ea3ec 100644 --- a/drivers/filesystems/cdfs/cdfs_reg.inf +++ b/drivers/filesystems/cdfs/cdfs_reg.inf @@ -1,6 +1,7 @@ -; Cdfs (ISO96660) filesystem driver +; Cdfs (ISO96660) Filesystem driver [AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","DependOnGroup",0x00010000,"SCSI CDROM Class" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index 005bfcb6dac..e07135b419d 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -120,3 +120,4 @@ set_property(TARGET ext2fs PROPERTY C_STANDARD 90) add_pch(ext2fs inc/ext2fs.h SOURCE) add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(ext2fs_reg.inf) diff --git a/drivers/filesystems/ext2/ext2fs_reg.inf b/drivers/filesystems/ext2/ext2fs_reg.inf index dfea9e0d515..5857076551c 100644 --- a/drivers/filesystems/ext2/ext2fs_reg.inf +++ b/drivers/filesystems/ext2/ext2fs_reg.inf @@ -1,6 +1,6 @@ -; ext2/3/4 filesystem driver +; ext2/3/4 Filesystem driver [AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2fs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 diff --git a/drivers/filesystems/msfs/msfs_reg.inf b/drivers/filesystems/msfs/msfs_reg.inf index 482f0ecaeed..c1e68d72af7 100644 --- a/drivers/filesystems/msfs/msfs_reg.inf +++ b/drivers/filesystems/msfs/msfs_reg.inf @@ -1,5 +1,6 @@ -; Mailslot filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000 +; Mailslot Filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ImagePath",0x00020000,"system32\drivers\msfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Start",0x00010001,0x00000001 diff --git a/drivers/filesystems/nfs/CMakeLists.txt b/drivers/filesystems/nfs/CMakeLists.txt index 91ad25761d0..10b71000757 100644 --- a/drivers/filesystems/nfs/CMakeLists.txt +++ b/drivers/filesystems/nfs/CMakeLists.txt @@ -23,3 +23,4 @@ endif() set_property(TARGET nfs41_driver PROPERTY C_STANDARD 90) add_cd_file(TARGET nfs41_driver DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(nfs41_reg.inf) diff --git a/drivers/filesystems/nfs/nfs41_reg.inf b/drivers/filesystems/nfs/nfs41_reg.inf new file mode 100644 index 00000000000..1d91282e908 --- /dev/null +++ b/drivers/filesystems/nfs/nfs41_reg.inf @@ -0,0 +1,10 @@ +; NFS Filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Group",0x00000000,"Network" +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","ImagePath",0x00020000,"system32\drivers\nfs41_driver.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","DeviceName",0x00000000,\Device\nfs41_driver +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","Name",0x00000000,"NFS41 Network" +HKLM,"SYSTEM\CurrentControlSet\Services\nfs41_driver\NetworkProvider","ProviderPath",0x00000000,System32\nfs41_np.dll diff --git a/drivers/filesystems/npfs/npfs_reg.inf b/drivers/filesystems/npfs/npfs_reg.inf index aff93e18320..77ee7a00bd7 100644 --- a/drivers/filesystems/npfs/npfs_reg.inf +++ b/drivers/filesystems/npfs/npfs_reg.inf @@ -1,5 +1,6 @@ -; Named Pipe filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000 +; Named Pipe Filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ImagePath",0x00020000,"system32\drivers\npfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Start",0x00010001,0x00000001 diff --git a/drivers/filesystems/udfs/udfs_reg.inf b/drivers/filesystems/udfs/udfs_reg.inf index 94f378729ed..bb289578eb5 100644 --- a/drivers/filesystems/udfs/udfs_reg.inf +++ b/drivers/filesystems/udfs/udfs_reg.inf @@ -1,6 +1,6 @@ -; UDF filesystem driver +; UDF Filesystem driver [AddReg] -HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","ImagePath",0x00020000,"system32\drivers\udfs.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","Start",0x00010001,0x00000003