Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 04:26:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP]: Add an entry in freeldr.ini for EMS testing.

Browse source 
[HIVESYS]: Fix double-addition of "nmidebug". One of those should have been "sacdrv".
[FREELDR]: Fix bugs in WinLdrSetupEms which caused an invalid HEADLESS_LOADER_BLOCK to be created.
[FERELDR]: Move WinLdrSetupEms in LoadWindowsCommon, so that setupldr can use EMS too.

svn path=/trunk/; revision=59716
This commit is contained in:
Alex Ionescu 2013-08-13 03:11:02 +00:00
parent 8bbf3b5415
commit f762bc3a74
4 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/base/setup/usetup/bootsup.c
View file

@ -501,8 +501,14 @@ CreateFreeLoaderIniForReactos(
/* ReactOS_Ram */
CreateFreeLoaderEntry(IniCache, IniSection,
L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"",
L"ReactOS", L"ramdisk(0)\\ReactOS",
L"Windows2003", L"ramdisk(0)\\ReactOS",
L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256");
/* ReactOS_EMS */
CreateFreeLoaderEntry(IniCache, IniSection,
L"ReactOS_EMS", L"\"ReactOS (Emergency Management Services)\"",
L"Windows2003", ArcPath,
L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /redirect=com2 /redirectbaudrate=115200");
#endif
/* Save the ini file */

10
reactos/boot/bootdata/hivesys.inf
View file

@ -1345,11 +1345,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000020
HKLM,"SYSTEM\CurrentControlSet\Services\DHCP\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll"
; EMS Serial Administration Console Driver
HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","ErrorControl",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Group",0x00000000,"EMS"
HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","ImagePath",0x00020000,"system32\drivers\sacdrv.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Type",0x00010001,0x00000001
HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Group",0x00000000,"EMS"
HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ImagePath",0x00020000,"system32\drivers\sacdrv.sys"
HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Start",0x00010001,0x00000000
HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Type",0x00010001,0x00000001
; Event logging service
HKLM,"SYSTEM\CurrentControlSet\Services\EventLog",,0x00000010

4
reactos/boot/freeldr/freeldr/windows/headless.c
View file

@ -246,7 +246,8 @@ WinLdrSetupEms(IN PCHAR BootOptions)
/* Start fresh */
RtlZeroMemory(&LoaderRedirectionInformation, sizeof(HEADLESS_LOADER_BLOCK));
LoaderRedirectionInformation.PciDeviceId = PCI_INVALID_VENDORID;
/* Use a direction port if one was given, or use ACPI to detect one instead */
RedirectPort = strstr(BootOptions, "/redirect=");
@ -257,6 +258,7 @@ WinLdrSetupEms(IN PCHAR BootOptions)
{
RedirectPort += sizeof("com") - 1;
LoaderRedirectionInformation.PortNumber = atoi(RedirectPort);
LoaderRedirectionInformation.TerminalType = 1; //HeadlessSerialPort
}
else
{

10
reactos/boot/freeldr/freeldr/windows/winldr.c
View file

@ -673,11 +673,6 @@ LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem,
/* Allocate and minimalistic-initialize LPB */
AllocateAndInitLPB(&LoaderBlock);
#ifdef _M_IX86
/* Setup redirection support */
WinLdrSetupEms(BootOptions);
#endif
/* Load Hive */
UiDrawBackdrop();
UiDrawProgressBarCenter(15, 100, "Loading system hive...");
@ -711,6 +706,11 @@ LoadAndBootWindowsCommon(
LPCSTR SystemRoot;
TRACE("LoadAndBootWindowsCommon()\n");
#ifdef _M_IX86
/* Setup redirection support */
WinLdrSetupEms((PCHAR)BootOptions);
#endif
/* Convert BootPath to SystemRoot */
SystemRoot = strstr(BootPath, "\\");