Author: fireball Date: Fri Apr 24 22:27:34 2009 New Revision: 40683 URL: http://svn.reactos.org/svn/reactos?rev=40683&view=rev Log: - WINLDR: Pass boot options to the kernel when booting in setup mode (it was disabled for debugging reasons).
Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c?rev=40683&r1=40682&r2=40683&view=diff ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Fri Apr 24 22:27:34 2009 @@ -157,7 +157,6 @@ CHAR SystemPath[512], SearchPath[512]; CHAR FileName[512]; CHAR BootPath[512]; - CHAR LoadOptions[512]; LPCSTR BootOptions; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; @@ -234,7 +233,7 @@ /* Construct the system path */ sprintf(SystemPath, "%s\\", SourcePath); - DPRINTM(DPRINT_WINDOWS,"SystemRoot: '%s', SystemPath: '%s'\n", BootPath, SystemPath); + DPRINTM(DPRINT_WINDOWS,"BootPath: '%s', SystemPath: '%s'\n", BootPath, SystemPath); /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); @@ -298,8 +297,7 @@ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Initialize Phase 1 - no drivers loading anymore */ - LoadOptions[0] = 0; - WinLdrInitializePhase1(LoaderBlock, LoadOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); + WinLdrInitializePhase1(LoaderBlock, (PCHAR)BootOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint;