diff --git a/base/system/smss/smss.c b/base/system/smss/smss.c index 423f632e2e38f..74234e35b980c 100644 --- a/base/system/smss/smss.c +++ b/base/system/smss/smss.c @@ -427,6 +427,73 @@ SmpUnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) return EXCEPTION_EXECUTE_HANDLER; } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NTSTATUS __cdecl _main(IN INT argc, diff --git a/boot/bootdata/bootcd.ini b/boot/bootdata/bootcd.ini index c58b8111a6c2a..35c217d8fe0e1 100644 --- a/boot/bootdata/bootcd.ini +++ b/boot/bootdata/bootcd.ini @@ -7,64 +7,17 @@ TitleText=ReactOS Setup & Live BootCD MinimalUI=Yes [Operating Systems] -LiveCD_Macpi="LiveCD ACPI SMP (Debug)" -LiveCD_Aacpi="LiveCD ACPI APIC (Debug)" -; LiveCD_LogFile="ReactOS Live (Log file)" LiveCD_RamDisk="ReactOS Setup (Graphics Mode) & Live in RAM" LiveCD_RamDisk_Debug="ReactOS Live in RAM (Debug)" +LiveCD_RamDisk_NET="SMP NET" ;;;; HddBoot="Boot from first hard disk" -[Setup] -BootType=ReactOSSetup -SystemPath=\ - -[Setup_Debug] -BootType=ReactOSSetup -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT /SIFOPTIONSOVERRIDE - -[Setup_Aacpi] -BootType=ReactOSSetup -Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /NOGUIBOOT /SIFOPTIONSOVERRIDE - -[Setup_Screen] -BootType=ReactOSSetup -Options=/DEBUG /DEBUGPORT=SCREEN /SIFOPTIONSOVERRIDE - -[LiveCD] -BootType=Windows2003 -SystemPath=\reactos -Options=/FASTDETECT /MININT - -[LiveCD_Debug] -BootType=Windows2003 -SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT - -[LiveCD_Macpi] +[LiveCD_RamDisk_NET] BootType=Windows2003 -SystemPath=\reactos -Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT - -[LiveCD_Aacpi] -BootType=Windows2003 -SystemPath=\reactos -Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT - -[LiveCD_VBoxDebug] -BootType=Windows2003 -SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=VBOX /SOS /FASTDETECT /MININT - -[LiveCD_Screen] -BootType=Windows2003 -SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT +SystemPath=ramdisk(0)\reactos +Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=NET /HOST_IP=10.0.0.175 /HOST_PORT=50000 /ENCRYPTION_KEY=make.reactos.great.again /W2003 /CPUFREQ=3000 /SOS /FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD -; [LiveCD_LogFile] -; BootType=Windows2003 -; SystemPath=\reactos -; Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /FASTDETECT /MININT [LiveCD_RamDisk] BootType=Windows2003