Author: tkreuzer Date: Sun Mar 29 11:38:05 2015 New Revision: 66952
URL: http://svn.reactos.org/svn/reactos?rev=66952&view=rev Log: [CMAKE/BOOTDATA] Implement support for decentralized registry inf files. This is done with the new add_registry_inf() cmake function, which takes one or more inf files, which are then converted to UTF-16 and merged into a single registry.inf, which is then used to create the livecd hives and imported by usetup. Move the registry entries for some drivers out of hivesys.inf into separate files next to the driver.
Added: trunk/reactos/drivers/base/beep/beep_reg.inf (with props) trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf (with props) trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf (with props) trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf (with props) trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf (with props) trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf (with props) trunk/reactos/drivers/input/mouclass/mouclass_reg.inf (with props) trunk/reactos/drivers/network/afd/afd_reg.inf (with props) trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf (with props) trunk/reactos/drivers/storage/class/disk/disk_reg.inf (with props) trunk/reactos/drivers/storage/floppy/floppy_reg.inf (with props) trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf (with props) trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf (with props) trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf (with props) trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/drivers/base/beep/CMakeLists.txt trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt trunk/reactos/drivers/input/kbdclass/CMakeLists.txt trunk/reactos/drivers/input/mouclass/CMakeLists.txt trunk/reactos/drivers/network/afd/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt trunk/reactos/drivers/storage/class/disk/CMakeLists.txt trunk/reactos/drivers/storage/floppy/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt
Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66952&am... ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -244,6 +244,9 @@ add_subdirectory(tools/wpp) add_subdirectory(win32ss)
+ # Create the registry hives + create_registry_hives() + # Create {bootcd, livecd, bootcdregtest}.lst create_iso_lists()
Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.tx... ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -5,59 +5,12 @@
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest)
-list(APPEND _common_hives - ${CMAKE_CURRENT_SOURCE_DIR}/hivecls.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hivedef.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hivesft.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hivesys.inf) +add_registry_inf( + hivecls.inf + hivedef.inf + hivesft.inf + hivesys.inf)
-foreach(_hive ${_common_hives}) - get_filename_component(_hive_name ${_hive} NAME) - set(_converted_hive ${CMAKE_CURRENT_BINARY_DIR}/${_hive_name}) - add_custom_command(OUTPUT ${_converted_hive} - COMMAND native-utf16le ${_hive} ${_converted_hive} - DEPENDS native-utf16le ${_hive}) - list(APPEND _converted_common_hives ${_converted_hive}) -endforeach() - -add_custom_target(converted_hives DEPENDS ${_converted_common_hives}) -add_cd_file(TARGET converted_hives - FILE ${_converted_common_hives} - DESTINATION reactos - NO_CAB - FOR bootcd regtest) - -# livecd hives -list(APPEND _livecd_hives - ${_converted_common_hives} - ${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf - ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst.inf) - -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sam - ${CMAKE_CURRENT_BINARY_DIR}/default - ${CMAKE_CURRENT_BINARY_DIR}/security - ${CMAKE_CURRENT_BINARY_DIR}/software - ${CMAKE_CURRENT_BINARY_DIR}/system - COMMAND native-mkhive ${CMAKE_CURRENT_BINARY_DIR} ${_livecd_hives} - DEPENDS native-mkhive ${_livecd_hives} ${_converted_common_hives}) - -add_custom_target(livecd_hives - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sam - ${CMAKE_CURRENT_BINARY_DIR}/default - ${CMAKE_CURRENT_BINARY_DIR}/security - ${CMAKE_CURRENT_BINARY_DIR}/software - ${CMAKE_CURRENT_BINARY_DIR}/system) - -add_cd_file( - FILE ${CMAKE_CURRENT_BINARY_DIR}/sam - ${CMAKE_CURRENT_BINARY_DIR}/default - ${CMAKE_CURRENT_BINARY_DIR}/security - ${CMAKE_CURRENT_BINARY_DIR}/software - ${CMAKE_CURRENT_BINARY_DIR}/system - TARGET livecd_hives - DESTINATION reactos/system32/config - FOR livecd)
#regtest add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin FOR all)
Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?r... ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -1348,22 +1348,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Type",0x00010001,0x00000001
- -; Afd driver -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI" -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"system32\drivers\afd.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 - -; UniATA/Atapi miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 - ; Audio Service HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Description",0x00000000,"Provides audio facilities to applications" @@ -1374,21 +1358,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010
-; BusLogic 958 miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"SCSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x00020000,"system32\drivers\buslogic.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00000020 - -; Beep device driver -HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000 -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","Type",0x00010001,0x00000001 - ; Background Intelligent Transfer Service (BITS) HKLM,"SYSTEM\CurrentControlSet\Services\BITS","DisplayName",0x00000000,"BITS" HKLM,"SYSTEM\CurrentControlSet\Services\BITS","Description",0x00000000,"Background Intelligent Transfer Service (BITS)" @@ -1406,33 +1375,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Type",0x00010001,0x00000001
-; Cdfs (ISO96660) filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 -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 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 - -; Cdrom class driver -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Group",0x00000000,"SCSI Class" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ImagePath",0x00020000,"system32\drivers\cdrom.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Type",0x00010001,0x00000001 - ; Debug output driver HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Group",0x00000000,"Debug" 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 - -; Disk class driver -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Group",0x00000000,"SCSI Class" -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\drivers\disk.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001
; DHCP client service HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","DisplayName",0x00000000,"DHCP Client" @@ -1482,35 +1430,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","TypesSupported",0x00010001,0x00000007
-; Floppy driver -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk" -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001 - ; Filesystem recognizer driver HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Group",0x00000000,"Boot file system" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32\drivers\fs_rec.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 - -; Keyboard class driver -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class" -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000,"system32\drivers\kbdclass.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Control\Class{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass" - -; Kernel Security Support Provider Interface Driver -HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ErrorControl",0x00010001,0x00000003 -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","Type",0x00010001,0x00000001
; Workstation service HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","DisplayName",0x00000000,"Workstation service" @@ -1530,22 +1455,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ImagePath",0x00020000,"system32\drivers\mpu401.sys"
-; Mouse class driver -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Group",0x00000000,"Pointer Class" -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000,"system32\drivers\mouclass.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMultiplePorts",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Control\Class{4D36E96F-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"mouclass" - -; Mailslot filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000 -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 -HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002 - ; Multiple UNC provider driver ;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)" ;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001 @@ -1569,13 +1478,6 @@ ;HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe" ;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003 ;HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020 - -; Named Pipe filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000 -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 -HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Type",0x00010001,0x00000002
; NTFS filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000 @@ -2020,48 +1922,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002
-; VBE SVGA driver -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 - -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XPanning",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YPanning",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeX",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Device Description",0x00020000,"Generic VESA Adapter" - -; This is not true but it allows to use 3rd party drivers while having the VBE driver installed -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1 - -; VGA miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","VgaCompatible",0x00010001,1 - -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480 - ; ControlSet selection settings HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001 HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001
Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif?... ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -519,9 +519,6 @@ 00000455 = kbdbur.dll
[HiveInfs.Install] -AddReg=hivecls.inf,AddReg -AddReg=hivedef.inf,AddReg -AddReg=hivesft.inf,AddReg -AddReg=hivesys.inf,AddReg +AddReg=registry.inf,AddReg
; EOF
Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMakeL... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -226,13 +226,10 @@ add_dependencies(freeldr_pe asm) add_dependencies(freeldr_pe_dbg asm)
-# Retrieve the full path to the generated file of the 'freeldr_pe' target -get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION) - concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - ${_freeldr_pe_output_file}) + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll)
add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
@@ -243,7 +240,7 @@ concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - ${_freeldr_pe_output_file}) + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll)
add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)
Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?rev... ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -315,7 +315,7 @@ endforeach() if(_CD_TARGET) #manage dependency - add_dependencies(bootcd ${_CD_TARGET} converted_hives) + add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() #add it in reactos.cab @@ -337,7 +337,7 @@ if(NOT __cd EQUAL -1) #manage dependency if(_CD_TARGET) - add_dependencies(livecd ${_CD_TARGET} converted_hives) + add_dependencies(livecd ${_CD_TARGET} registry_inf) endif() foreach(item ${_CD_FILE}) if(_CD_NAME_ON_CD) @@ -385,7 +385,7 @@ endforeach() if(_CD_TARGET) #manage dependency - add_dependencies(bootcdregtest ${_CD_TARGET} converted_hives) + add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf) endif() else() #add it in reactos.cab @@ -668,7 +668,7 @@
function(preprocess_file __in __out) set(__arg ${__in}) - foreach(__def in ${ARGN}) + foreach(__def ${ARGN}) list(APPEND __arg -D${__def}) endforeach() if(MSVC) @@ -708,6 +708,78 @@ endfunction() endif()
+function(add_registry_inf) + # Add to the inf files list + foreach(_file ${ARGN}) + set(_source_file "${CMAKE_CURRENT_SOURCE_DIR}/${_file}") + set_property(GLOBAL APPEND PROPERTY REGISTRY_INF_LIST ${_source_file}) + endforeach() +endfunction() + +function(create_registry_hives) + + # Shortcut to the registry.inf file + set(_registry_inf "${CMAKE_BINARY_DIR}/boot/bootdata/registry.inf") + + # Get the list of inf files + get_property(_inf_files GLOBAL PROPERTY REGISTRY_INF_LIST) + + # Convert files to utf16le + foreach(_file ${_inf_files}) + get_filename_component(_file_name ${_file} NAME_WE) + string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _converted_file "${_file}") + string(REPLACE ${_file_name} "${_file_name}_utf16" _converted_file ${_converted_file}) + add_custom_command(OUTPUT ${_converted_file} + COMMAND native-utf16le ${_file} ${_converted_file} + DEPENDS native-utf16le ${_file}) + list(APPEND _converted_files ${_converted_file}) + endforeach() + + # Concatenate all registry files to registry.inf + concatenate_files(${_registry_inf} ${_converted_files}) + + # Add registry.inf to bootcd + add_custom_target(registry_inf DEPENDS ${_registry_inf}) + add_cd_file(TARGET registry_inf + FILE ${_registry_inf} + DESTINATION reactos + NO_CAB + FOR bootcd regtest) + + # livecd hives + list(APPEND _livecd_inf_files + ${_registry_inf} + ${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf + ${CMAKE_SOURCE_DIR}/boot/bootdata/hiveinst.inf) + + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/security + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/system + COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/ ${_livecd_inf_files} + DEPENDS native-mkhive ${_livecd_inf_files}) + + add_custom_target(livecd_hives + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/security + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/system) + + add_cd_file( + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam + ${CMAKE_BINARY_DIR}/boot/bootdata/default + ${CMAKE_BINARY_DIR}/boot/bootdata/security + ${CMAKE_BINARY_DIR}/boot/bootdata/software + ${CMAKE_BINARY_DIR}/boot/bootdata/system + TARGET livecd_hives + DESTINATION reactos/system32/config + FOR livecd) + +endfunction() + if(KDBG) set(ROSSYM_LIB "rossym") else()
Modified: trunk/reactos/drivers/base/beep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/CMakeList... ============================================================================== --- trunk/reactos/drivers/base/beep/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/beep/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -3,3 +3,4 @@ set_module_type(beep kernelmodedriver) add_importlibs(beep ntoskrnl hal) add_cd_file(TARGET beep DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(beep_reg.inf)
Added: trunk/reactos/drivers/base/beep/beep_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep_reg.... ============================================================================== --- trunk/reactos/drivers/base/beep/beep_reg.inf (added) +++ trunk/reactos/drivers/base/beep/beep_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Beep device driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000 +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","Type",0x00010001,0x00000001
Propchange: trunk/reactos/drivers/base/beep/beep_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/CMake... ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -19,3 +19,4 @@ set_module_type(ksecdd kernelmodedriver) add_importlibs(ksecdd ntoskrnl hal) add_cd_file(TARGET ksecdd DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(ksecdd_reg.inf)
Added: trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksecd... ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf (added) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Kernel Security Support Provider Interface Driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ErrorControl",0x00010001,0x00000003 +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","Type",0x00010001,0x00000001
Propchange: trunk/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/CM... ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -23,3 +23,4 @@ add_importlibs(cdfs ntoskrnl hal) add_pch(cdfs cdfs.h SOURCE) add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(cdfs_reg.inf)
Added: trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/cd... ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf (added) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Cdfs (ISO96660) filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 +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 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002
Propchange: trunk/reactos/drivers/filesystems/cdfs/cdfs_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/CM... ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -12,3 +12,4 @@ add_importlibs(msfs ntoskrnl hal) add_pch(msfs msfs.h SOURCE) add_cd_file(TARGET msfs DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(msfs_reg.inf)
Added: trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/ms... ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf (added) +++ trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,6 @@ +; Mailslot filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000 +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 +HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002
Propchange: trunk/reactos/drivers/filesystems/msfs/msfs_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/CM... ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -28,3 +28,4 @@ add_importlibs(npfs ntoskrnl hal) add_pch(npfs npfs.h SOURCE) add_cd_file(TARGET npfs DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(npfs_reg.inf)
Added: trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/np... ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf (added) +++ trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,6 @@ +; Named Pipe filesystem driver +HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000 +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 +HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Type",0x00010001,0x00000002
Propchange: trunk/reactos/drivers/filesystems/npfs/npfs_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/CMak... ============================================================================== --- trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -14,3 +14,4 @@ target_link_libraries(kbdclass ${PSEH_LIB}) add_importlibs(kbdclass ntoskrnl hal) add_cd_file(TARGET kbdclass DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(kbdclass_reg.inf)
Added: trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdc... ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf (added) +++ trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,9 @@ +; Keyboard class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000,"system32\drivers\kbdclass.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Control\Class{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass"
Propchange: trunk/reactos/drivers/input/kbdclass/kbdclass_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/CMak... ============================================================================== --- trunk/reactos/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -14,3 +14,4 @@ add_importlibs(mouclass ntoskrnl hal) add_pch(mouclass mouclass.h SOURCE) add_cd_file(TARGET mouclass DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(mouclass_reg.inf)
Added: trunk/reactos/drivers/input/mouclass/mouclass_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mouc... ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass_reg.inf (added) +++ trunk/reactos/drivers/input/mouclass/mouclass_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,9 @@ +; Mouse class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Group",0x00000000,"Pointer Class" +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000,"system32\drivers\mouclass.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMultiplePorts",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Control\Class{4D36E96F-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"mouclass"
Propchange: trunk/reactos/drivers/input/mouclass/mouclass_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/CMakeLi... ============================================================================== --- trunk/reactos/drivers/network/afd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -24,3 +24,4 @@ add_importlibs(afd ntoskrnl hal) add_pch(afd include/afd.h SOURCE) add_cd_file(TARGET afd DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(afd_reg.inf)
Added: trunk/reactos/drivers/network/afd/afd_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd_reg... ============================================================================== --- trunk/reactos/drivers/network/afd/afd_reg.inf (added) +++ trunk/reactos/drivers/network/afd/afd_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Afd driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI" +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"system32\drivers\afd.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001
Propchange: trunk/reactos/drivers/network/afd/afd_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdrom... ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -11,3 +11,4 @@ add_importlibs(cdrom class2 scsiport ntoskrnl hal) add_pch(cdrom precomp.h SOURCE) add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(cdrom_reg.inf)
Added: trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdrom... ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf (added) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Cdrom class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Group",0x00000000,"SCSI Class" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ImagePath",0x00020000,"system32\drivers\cdrom.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Type",0x00010001,0x00000001
Propchange: trunk/reactos/drivers/storage/class/cdrom/cdrom_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/storage/class/disk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk/... ============================================================================== --- trunk/reactos/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -4,3 +4,4 @@ set_module_type(disk kernelmodedriver) add_importlibs(disk class2 scsiport ntoskrnl hal) add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(disk_reg.inf)
Added: trunk/reactos/drivers/storage/class/disk/disk_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk/... ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk_reg.inf (added) +++ trunk/reactos/drivers/storage/class/disk/disk_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Disk class driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Group",0x00000000,"SCSI Class" +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\drivers\disk.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001
Propchange: trunk/reactos/drivers/storage/class/disk/disk_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/storage/floppy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/CMak... ============================================================================== --- trunk/reactos/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -13,3 +13,4 @@ set_module_type(floppy kernelmodedriver) add_importlibs(floppy hal ntoskrnl) add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(floppy_reg.inf)
Added: trunk/reactos/drivers/storage/floppy/floppy_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flop... ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy_reg.inf (added) +++ trunk/reactos/drivers/storage/floppy/floppy_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,7 @@ +; Floppy driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk" +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001
Propchange: trunk/reactos/drivers/storage/floppy/floppy_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -31,3 +31,4 @@ set_module_type(uniata kernelmodedriver) add_importlibs(uniata scsiport ntoskrnl hal) add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(uniata_reg.inf)
Added: trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata/... ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf (added) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,8 @@ +; UniATA/Atapi miniport driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010
Propchange: trunk/reactos/drivers/storage/ide/uniata/uniata_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslog... ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -4,3 +4,4 @@ set_module_type(buslogic kernelmodedriver) add_importlibs(buslogic scsiport) add_cd_file(TARGET buslogic DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(buslogic_reg.inf)
Added: trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslog... ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf (added) +++ trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,8 @@ +; BusLogic 958 miniport driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"SCSI Miniport" +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x00020000,"system32\drivers\buslogic.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00000020
Propchange: trunk/reactos/drivers/storage/port/buslogic/buslogic_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/vb... ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -10,3 +10,4 @@ add_pch(vbemp vbemp.h SOURCE) target_link_libraries(vbemp libcntpr) add_cd_file(TARGET vbemp DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(vbemp_reg.inf)
Added: trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/vb... ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf (added) +++ trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,27 @@ +; VBE SVGA driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save" +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 + +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YPanning",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeX",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Device Description",0x00020000,"Generic VESA Adapter" + +; This is not true but it allows to use 3rd party drivers while having the VBE driver installed +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1
Propchange: trunk/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/vg... ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -9,3 +9,4 @@ add_importlibs(vgamp videoprt) add_pch(vgamp vgamp.h SOURCE) add_cd_file(TARGET vgamp DESTINATION reactos/system32/drivers FOR all) +add_registry_inf(vga_reg.inf)
Added: trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/vg... ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf (added) +++ trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf [iso-8859-1] Sun Mar 29 11:38:05 2015 @@ -0,0 +1,15 @@ +; VGA miniport driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save" +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","VgaCompatible",0x00010001,1 + +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi" +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480
Propchange: trunk/reactos/win32ss/drivers/miniport/vga/vga_reg.inf ------------------------------------------------------------------------------ svn:eol-style = native