mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
added check for bootloader config hive
svn path=/trunk/; revision=734
This commit is contained in:
parent
3c1e76b027
commit
99d62b4808
4 changed files with 36 additions and 14 deletions
|
@ -179,6 +179,7 @@ VideoPortInitialize(IN PVOID Context1,
|
|||
MPDriverObject->DriverStartIo = (PDRIVER_STARTIO) HwInitializationData->HwStartIO;
|
||||
|
||||
/* Create a unicode device name */
|
||||
Again = FALSE;
|
||||
do
|
||||
{
|
||||
/* FIXME: Need to add a device index for multiple adapters */
|
||||
|
@ -261,7 +262,7 @@ VideoPortInitialize(IN PVOID Context1,
|
|||
|
||||
}
|
||||
}
|
||||
while (&Again);
|
||||
while (Again);
|
||||
|
||||
/* FIXME: initialize timer routine for MP Driver */
|
||||
if (HwInitializationData->HwTimer != NULL)
|
||||
|
|
|
@ -85,6 +85,7 @@ VOID PsInit(VOID);
|
|||
VOID TstBegin(VOID);
|
||||
VOID KeInit(VOID);
|
||||
VOID CmInitializeRegistry(VOID);
|
||||
VOID CmImportHive(PCHAR);
|
||||
VOID DbgInit(VOID);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: registry.c,v 1.19 1999/10/07 23:33:22 ekohl Exp $
|
||||
/* $Id: registry.c,v 1.20 1999/10/26 04:52:38 rex Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -361,6 +361,12 @@ CHECKPOINT;
|
|||
#endif
|
||||
}
|
||||
|
||||
VOID
|
||||
CmImportHive(PCHAR Chunk)
|
||||
{
|
||||
/* FIXME: implemement this */
|
||||
return;
|
||||
}
|
||||
|
||||
NTSTATUS
|
||||
STDCALL
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: main.c,v 1.26 1999/10/16 21:08:07 ekohl Exp $
|
||||
/* $Id: main.c,v 1.27 1999/10/26 04:52:38 rex Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
@ -189,17 +189,31 @@ asmlinkage void _main(boot_param* _bp)
|
|||
* Initalize services loaded at boot time
|
||||
*/
|
||||
DPRINT("%d files loaded\n",bp.nr_files);
|
||||
|
||||
start = KERNEL_BASE + PAGE_ROUND_UP(bp.module_length[0]);
|
||||
// start1 = start+PAGE_ROUND_UP(bp.module_length[1]);
|
||||
start1 = start + bp.module_length[1];
|
||||
for (i=1;i<bp.nr_files;i++)
|
||||
{
|
||||
DPRINT("process module at %08lx\n", start);
|
||||
LdrProcessDriver((PVOID)start);
|
||||
// start=start+PAGE_ROUND_UP(bp.module_length[i]);
|
||||
start = start + bp.module_length[i];
|
||||
}
|
||||
|
||||
/* Pass 1: load registry chunks passed in */
|
||||
start = KERNEL_BASE + PAGE_ROUND_UP(bp.module_length[0]);
|
||||
for (i = 1; i < bp.nr_files; i++)
|
||||
{
|
||||
if (!strcmp ((PCHAR) start, "REGEDIT4"))
|
||||
{
|
||||
DPRINT("process registry chunk at %08lx\n", start);
|
||||
CmImportHive((PCHAR) start);
|
||||
}
|
||||
start = start + bp.module_length[i];
|
||||
}
|
||||
|
||||
/* Pass 2: process boot loaded drivers */
|
||||
start = KERNEL_BASE + PAGE_ROUND_UP(bp.module_length[0]);
|
||||
start1 = start + bp.module_length[1];
|
||||
for (i=1;i<bp.nr_files;i++)
|
||||
{
|
||||
if (strcmp ((PCHAR) start, "REGEDIT4"))
|
||||
{
|
||||
DPRINT("process module at %08lx\n", start);
|
||||
LdrProcessDriver((PVOID)start);
|
||||
}
|
||||
start = start + bp.module_length[i];
|
||||
}
|
||||
|
||||
/*
|
||||
* Load Auto configured drivers
|
||||
|
|
Loading…
Reference in a new issue