[hbelusca] 74769: [BOOTDATA]: This commit is a HACK! Due to strange PnP drivers disconnections(*) happening, in particular those concerning keyboard drivers, thus making 1st-stage unusable, I fork ...
Author: hbelusca Date: Sat Jun 3 16:53:02 2017 New Revision: 74769
URL: http://svn.reactos.org/svn/reactos?rev=74769&view=rev Log: [BOOTDATA]: This commit is a HACK! Due to strange PnP drivers disconnections(*) happening, in particular those concerning keyboard drivers, thus making 1st-stage unusable, I fork off hivesys.inf into hivesetup.inf, remove the listed PnP devices that seem to cause problems, and use it (instead of hivesys.inf) to build the 1st-stage setup SYSTEM registry hive. 2nd-stage and regular installations on the contrary use the normal hivesys.inf.
(*): disconnections mentioning (this refers to the 'i8042prt.sys' driver): "Removal vetoed by Root*PNP0303\0000" [...] "Warning: PnP Start failed (Root*PNP0303\0000) [Status: 0xc0000010]" and "A reboot is required for the current driver for 'Root*PNP0303\0000' to be replaced"
Added: branches/setup_improvements/boot/bootdata/hivesetup.inf - copied, changed from r74767, branches/setup_improvements/boot/bootdata/hivesys.inf Modified: branches/setup_improvements/sdk/cmake/CMakeMacros.cmake
Copied: branches/setup_improvements/boot/bootdata/hivesetup.inf (from r74767, branches/setup_improvements/boot/bootdata/hivesys.inf) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdata... ============================================================================== --- branches/setup_improvements/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ branches/setup_improvements/boot/bootdata/hivesetup.inf [iso-8859-1] Sat Jun 3 16:53:02 2017 @@ -23,45 +23,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0C08","Service",0x00000000,"acpi" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}"
-HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","Service",0x00000000,"usbuhci" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","Service",0x00000000,"usbohci" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0320","Service",0x00000000,"usbehci" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0320","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_06&Prot_50","Service",0x00000000,"usbstor" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_06&Prot_50","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","Service",0x00000000,"usbccgp" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" - -;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub" -;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","Service",0x00000000,"usbhub" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","Service",0x00000000,"usbhub" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" - HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk","Service",0x00000000,"disk" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk","ClassGUID",0x00000000,"{4D36E967-E325-11CE-BFC1-08002BE10318}"
-HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_03","Service",0x00000000,"hidusb" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_03","ClassGUID",0x00000000,"{745a17a0-74d3-11d0-b6fe-00a0c90f57da}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GENERIC_HID_DEVICE","Service",0x00000000,"hidusb" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GENERIC_HID_DEVICE","ClassGUID",0x00000000,"{745a17a0-74d3-11d0-b6fe-00a0c90f57da}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_KEYBOARD","Service",0x00000000,"kbdhid" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_KEYBOARD","ClassGUID",0x00000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","Service",0x00000000,"mouhid" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" - HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","Service",0x00000000,"VBE" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0000","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}"
@@ -73,33 +37,6 @@
HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","Service",0x00000000,"VBE" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0301","ClassGUID",0x00000000,"{4D36E968-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0303","Service",0x00000000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0303","ClassGUID",0x00000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F0E","Service",0x00000000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F0E","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F19","Service",0x00000000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F19","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PS2_MOUSE","Service",0x00000000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PS2_MOUSE","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F13","Service",0x00000000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F13","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*IBM3780","Service",0x00000000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*IBM3780","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F12","Service",0x00000000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F12","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F03","Service",0x00000000,"i8042prt" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase*PNP0F03","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\ROOT#SWENUM","Service",0x00000000,"swenum" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\ROOT#SWENUM","ClassGUID",0x00000000,"{4d36e97d-e325-11ce-bfc1-08002be10318}"
HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot","AlternateShell",2,"cmd.exe"
Modified: branches/setup_improvements/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/cmake/CMa... ============================================================================== --- branches/setup_improvements/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/setup_improvements/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Sat Jun 3 16:53:02 2017 @@ -763,10 +763,11 @@ FOR bootcd regtest)
# bootcd setup system hive + # FIXME: Should use hivesys_utf16.inf instead! add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV - COMMAND native-mkhive -h:SETUPREG -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf - DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf) + COMMAND native-mkhive -h:SETUPREG -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivesetup_utf16.inf + DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivesetup_utf16.inf)
add_custom_target(bootcd_hives DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV)
-
hbelusca＠svn.reactos.org