Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Detect hardware before ntoskrnl.exe will be loaded.

Browse source 
svn path=/trunk/; revision=4662
This commit is contained in:
Eric Kohl 2003-05-10 09:26:59 +00:00
parent 7f6db59b55
commit 3e708e6c79
1 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
freeldr/freeldr/reactos/reactos.c
View file

@ -493,6 +493,11 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
DbgPrint((DPRINT_REACTOS, "low_mem = %d\n", mb_info.mem_lower));
DbgPrint((DPRINT_REACTOS, "high_mem = %d\n", mb_info.mem_upper));
/*
* Initialize the registry
*/
RegInitializeRegistry();
/*
* Make sure the system path is set in the .ini file
*/
@ -561,7 +566,16 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
DbgPrint((DPRINT_REACTOS,"SystemRoot: '%s'\n", szBootPath));
UiDrawBackdrop();
UiDrawStatusText("Detecting Hardware...");
/*
* Detect hardware
*/
DetectHardware();
UiDrawStatusText("Loading...");
UiDrawProgressBarCenter(0, 100, "Loading ReactOS...");
@ -655,7 +669,7 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
FilePointer = FsOpenFile(szFileName);
if (FilePointer == NULL)
{
UiMessageBox("Could not find the system hive!");
UiMessageBox("Could not find the System hive!");
return;
}
else
@ -674,11 +688,19 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
UiDrawStatusText(name);
/*
* Load the system hive
* Load the System hive
*/
Base = MultiBootLoadModule(FilePointer, szFileName, &Size);
RegInitializeRegistry();
if (Base == NULL || Size == 0)
{
UiMessageBox("Could not load the System hive!\n");
return;
}
DbgPrint((DPRINT_REACTOS, "SystemHive loaded at 0x%x size %u", (unsigned)Base, (unsigned)Size));
/*
* Import the loaded system hive
*/
if (TextHive)
{
RegImportTextHive(Base, Size);
@ -688,13 +710,12 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
RegImportBinaryHive(Base, Size);
}
UiDrawProgressBarCenter(15, 100, "Loading ReactOS...");
DbgPrint((DPRINT_REACTOS, "SystemHive loaded at 0x%x size %u", (unsigned)Base, (unsigned)Size));
/*
* Detect hardware
* Initialize the 'CurrentControlSet' link
*/
DetectHardware();
RegInitCurrentControlSet(FALSE);
UiDrawProgressBarCenter(15, 100, "Loading ReactOS...");
/*
* Export the hardware hive
@ -705,18 +726,13 @@ LoadAndBootReactOS(PUCHAR OperatingSystemName)
UiDrawProgressBarCenter(20, 100, "Loading ReactOS...");
/*
* Initialize the 'currentControlSet' link
*/
RegInitCurrentControlSet(FALSE);
/*
* Load NLS files
*/
#if 0
if (!LoadNlsFiles(szBootPath))
{
MessageBox("Failed to load NLS files\n");
UiMessageBox("Failed to load NLS files\n");
return;
}
#endif