Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 22:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

added check for bootloader config hive

Browse source 
svn path=/trunk/; revision=734
This commit is contained in:
Rex Jolliff 1999-10-26 04:52:39 +00:00
parent 3c1e76b027
commit 99d62b4808
4 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/drivers/dd/vidport/vidport.c
View file

@ -179,6 +179,7 @@ VideoPortInitialize(IN PVOID Context1,
MPDriverObject->DriverStartIo = (PDRIVER_STARTIO) HwInitializationData->HwStartIO; MPDriverObject->DriverStartIo = (PDRIVER_STARTIO) HwInitializationData->HwStartIO;
/* Create a unicode device name */ /* Create a unicode device name */
Again = FALSE;
do do
{ {
/* FIXME: Need to add a device index for multiple adapters */ /* 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 */ /* FIXME: initialize timer routine for MP Driver */
if (HwInitializationData->HwTimer != NULL) if (HwInitializationData->HwTimer != NULL)

1
reactos/include/internal/ntoskrnl.h
View file

@ -85,6 +85,7 @@ VOID PsInit(VOID);
VOID TstBegin(VOID); VOID TstBegin(VOID);
VOID KeInit(VOID); VOID KeInit(VOID);
VOID CmInitializeRegistry(VOID); VOID CmInitializeRegistry(VOID);
VOID CmImportHive(PCHAR);
VOID DbgInit(VOID); VOID DbgInit(VOID);
#endif #endif

8
reactos/ntoskrnl/cm/registry.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -361,6 +361,12 @@ CHECKPOINT;
#endif #endif
} }
VOID
CmImportHive(PCHAR Chunk)
{
/* FIXME: implemement this */
return;
}
NTSTATUS NTSTATUS
STDCALL STDCALL

38
reactos/ntoskrnl/ke/main.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -189,17 +189,31 @@ asmlinkage void _main(boot_param* _bp)
* Initalize services loaded at boot time * Initalize services loaded at boot time
*/ */
DPRINT("%d files loaded\n",bp.nr_files); DPRINT("%d files loaded\n",bp.nr_files);
start = KERNEL_BASE + PAGE_ROUND_UP(bp.module_length[0]); /* Pass 1: load registry chunks passed in */
// start1 = start+PAGE_ROUND_UP(bp.module_length[1]); start = KERNEL_BASE + PAGE_ROUND_UP(bp.module_length[0]);
start1 = start + bp.module_length[1]; for (i = 1; i < bp.nr_files; i++)
for (i=1;i<bp.nr_files;i++) {
{ if (!strcmp ((PCHAR) start, "REGEDIT4"))
DPRINT("process module at %08lx\n", start); {
LdrProcessDriver((PVOID)start); DPRINT("process registry chunk at %08lx\n", start);
// start=start+PAGE_ROUND_UP(bp.module_length[i]); CmImportHive((PCHAR) start);
start = start + bp.module_length[i]; }
} 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 * Load Auto configured drivers