diff --git a/reactos/bootcd.bat b/reactos/bootcd.bat index 1cee5e4de30..95553ec86a3 100755 --- a/reactos/bootcd.bat +++ b/reactos/bootcd.bat @@ -34,9 +34,13 @@ copy /Y hal\halx86\hal.dll %BOOTCD_DIR%\disk\install copy /Y drivers\fs\vfat\vfatfs.sys %BOOTCD_DIR%\disk\install copy /Y drivers\fs\cdfs\cdfs.sys %BOOTCD_DIR%\disk\install copy /Y drivers\fs\ntfs\ntfs.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\dd\floppy\floppy.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\fs\fs_rec\fs_rec.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\dd\beep\beep.sys %BOOTCD_DIR%\disk\install copy /Y drivers\dd\blue\blue.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\dd\floppy\floppy.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\dd\null\null.sys %BOOTCD_DIR%\disk\install copy /Y drivers\input\keyboard\keyboard.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\input\psaux\psaux.sys %BOOTCD_DIR%\disk\install copy /Y drivers\storage\atapi\atapi.sys %BOOTCD_DIR%\disk\install copy /Y drivers\storage\scsiport\scsiport.sys %BOOTCD_DIR%\disk\install copy /Y drivers\storage\cdrom\cdrom.sys %BOOTCD_DIR%\disk\install @@ -53,3 +57,6 @@ copy /Y subsys\csrss\csrss.exe %BOOTCD_DIR%\disk\install copy /Y subsys\system\services\services.exe %BOOTCD_DIR%\disk\install copy /Y subsys\system\shell\shell.exe %BOOTCD_DIR%\disk\install copy /Y subsys\system\winlogon\winlogon.exe %BOOTCD_DIR%\disk\install + +rem copy temporary files +copy /Y system.hiv %BOOTCD_DIR%\disk\install diff --git a/reactos/system.hiv b/reactos/system.hiv index 51d1db45ddc..db1ffd6d809 100644 --- a/reactos/system.hiv +++ b/reactos/system.hiv @@ -127,14 +127,14 @@ REGEDIT4 "ErrorControl"=dword:00000000 "Group"="Event log" "ImagePath"=expand:"%SystemRoot%\system32\eventlog.exe" -"Start"=dword:00000004 +"Start"=dword:00000002 "Type"=dword:00000010 [\Registry\Machine\SYSTEM\ControlSet001\Services\Floppy] "ErrorControl"=dword:00000000 "Group"="Primary Disk" "ImagePath"=expand:"system32\drivers\floppy.sys" -"Start"=dword:00000004 +"Start"=dword:00000001 "Type"=dword:00000001 [\Registry\Machine\SYSTEM\ControlSet001\Services\Fs_Rec] @@ -158,6 +158,13 @@ REGEDIT4 "Start"=dword:00000001 "Type"=dword:00000001 +[\Registry\Machine\SYSTEM\ControlSet001\Services\Mouse] +"ErrorControl"=dword:00000000 +"Group"="Pointer Class" +"ImagePath"=expand:"system32\drivers\mouclass.sys" +"Start"=dword:00000001 +"Type"=dword:00000001 + [\Registry\Machine\SYSTEM\ControlSet001\Services\Msfs] "ErrorControl"=dword:00000000 "Group"="File System" @@ -207,6 +214,17 @@ REGEDIT4 "Start"=dword:00000001 "Type"=dword:00000001 +[\Registry\Machine\SYSTEM\ControlSet001\Services\Packet] +"ErrorControl"=dword:00000001 +"Group"="PNP_TDI" +"ImagePath"=expand:"system32\drivers\packet.sys" +"Start"=dword:00000002 +"Type"=dword:00000001 + +[\Registry\Machine\SYSTEM\ControlSet001\Services\Packet\Linkage] +"Bind"=expand:"\Device\ne2000" +"Export"=expand:"\Device\packet" + [\Registry\Machine\SYSTEM\ControlSet001\Services\Pice] "ErrorControl"=dword:00000000 "Group"="Debug" @@ -214,6 +232,13 @@ REGEDIT4 "Start"=dword:00000004 "Type"=dword:00000001 +[\Registry\Machine\SYSTEM\ControlSet001\Services\Psaux] +"ErrorControl"=dword:00000000 +"Group"="Pointer Port" +"ImagePath"=expand:"system32\drivers\psaux.sys" +"Start"=dword:00000001 +"Type"=dword:00000001 + [\Registry\Machine\SYSTEM\ControlSet001\Services\RpcSs] "ErrorControl"=dword:00000001 "ImagePath"=expand:"%SystemRoot%\system32\rpcss.exe" @@ -234,12 +259,22 @@ REGEDIT4 "Start"=dword:00000002 "Type"=dword:00000001 -[\Registry\Machine\SYSTEM\ControlSet001\Services\Packet] -"ErrorControl"=dword:00000001 -"Group"="PNP_TDI" -"ImagePath"=expand:"system32\drivers\packet.sys" -"Start"=dword:00000002 -"Type"=dword:00000001 +[\Registry\Machine\SYSTEM\ControlSet001\Services\Tcpip\Linkage] +"Bind"=expand:"\Device\ne2000" +"Export"=expand:"\Device\tcpip" +"Route"=expand:"" + +[\Registry\Machine\SYSTEM\ControlSet001\Services\Tcpip\Parameters] +"DataBasePath"="DataBasePath" +"Domain"="" +"Hostname"="ROSHost" +"NameServer"="203.13.174.1" +"ForwardBroadcasts"=dword:00000000 +"IPEnableRouter"=dword:00000000 +"SearchList"="" +"EnableSecurityFilters"=dword:00000000 + +[\Registry\Machine\SYSTEM\ControlSet001\Services\Tcpip\Parameters\PersistentRoutes] [\Registry\Machine\SYSTEM\ControlSet001\Services\Vfatfs] "ErrorControl"=dword:00000000 @@ -255,42 +290,6 @@ REGEDIT4 "Start"=dword:00000001 "Type"=dword:00000001 -[\Registry\Machine\SYSTEM\ControlSet001\Services\Mouse] -"ErrorControl"=dword:00000000 -"Group"="Pointer Class" -"ImagePath"=expand:"system32\drivers\mouclass.sys" -"Start"=dword:00000001 -"Type"=dword:00000001 - -[\Registry\Machine\SYSTEM\ControlSet001\Services\Psaux] -"ErrorControl"=dword:00000000 -"Group"="Pointer Port" -"ImagePath"=expand:"system32\drivers\psaux.sys" -"Start"=dword:00000001 -"Type"=dword:00000001 - -[\Registry\Machine\SYSTEM\ControlSet001\Services\Tcpip\Linkage] -"Bind"=expand:"\Device\ne2000" -"Export"=expand:"\Device\tcpip" -"Route"=expand:"" - -[\Registry\Machine\SYSTEM\ControlSet001\Services\Tcpip\Parameters] -"DataBasePath"="DataBasePath" -"Domain"="" -"Hostname"="ROSHost" -"NameServer"="203.13.174.1" -"ForwardBroadcasts"=dword:00000000 -"IPEnableRouter"=dword:00000000 -"Address"=dword:6400A8C0 -"SearchList"="" -"EnableSecurityFilters"=dword:00000000 - -[\Registry\Machine\SYSTEM\ControlSet001\Services\Packet\Linkage] -"Bind"=expand:"\Device\ne2000" -"Export"=expand:"\Device\packet" - -[\Registry\Machine\SYSTEM\ControlSet001\Services\Tcpip\Parameters\PersistentRoutes] - [\Registry\Machine\SYSTEM\ControlSet002] [\Registry\Machine\SYSTEM\Select] @@ -304,6 +303,7 @@ REGEDIT4 "OsLoaderPath"="\" "SetupType"=dword:00000000 "SystemPartition"="\Device\HarddiskVolume1" +"SystemSetupInProgress"=dword:00000000 [\Registry\Machine\SOFTWARE] diff --git a/reactos/txtsetup.sif b/reactos/txtsetup.sif index 398428f622f..7597c4d0ab8 100644 --- a/reactos/txtsetup.sif +++ b/reactos/txtsetup.sif @@ -1,21 +1,39 @@ [Version] -Signature = "$ReactOS$" +Signature = $ReactOS$ [Directories] -1 = "\" +1 = \ 2 = system32 3 = system32\drivers 4 = system32\config [SourceFiles] +advapi32.dll = 2 atapi.sys = 3 +beep.sys = 3 +blue.sys = 3 +cdfs.sys = 3 cdrom.sys = 3 class2.sys = 3 +csrss.exe = 2 disk.sys = 3 +floppy.sys = 3 +fs_rec.sys = 3 hal.dll = 2 -scsiport.sys = 3 +kernel32.dll = 2 +msvcrt.dll = 2 +ntdll.dll = 2 +ntfs.sys = 3 ntoskrnl.exe = 2 +null.sys = 3 +psaux.sys = 3 +scsiport.sys = 3 +services.exe = 2 +shell.exe = 2 +smss.exe = 2 +system.hiv = 4 vfatfs.sys = 3 +winlogon.exe = 2 [SetupData] DefaultPath = \reactos