Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[fireball] 24353: - Comment out xbox memory detection for now (until fully switched to NT-style LPB) - Fix HalpInitializePhase0() prototype - Add halxbox back to build
by fireball＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: fireball Date: Mon Oct 2 01:07:25 2006 New Revision: 24353 URL: http://svn.reactos.org/svn/reactos?rev=24353&view=rev Log: - Comment out xbox memory detection for now (until fully switched to NT-style LPB) - Fix HalpInitializePhase0() prototype - Add halxbox back to build Modified: trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/hal/halx86/xbox/display_xbox.c trunk/reactos/hal/halx86/xbox/halinit_xbox.c Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild (original) +++ trunk/reactos/hal/halx86/directory.rbuild Mon Oct 2 01:07:25 2006 @@ -7,6 +7,6 @@ <directory name="mp"> <xi:include href="mp/halmp.rbuild" /> </directory> - +</directory> Modified: trunk/reactos/hal/halx86/xbox/display_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/display_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/display_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/display_xbox.c Mon Oct 2 01:07:25 2006 @@ -301,11 +301,13 @@ if (! DisplayInitialized) { PhysBuffer.u.HighPart = 0; - if (0 != (LoaderBlock->Flags & MB_FLAGS_MEM_INFO)) + //FIXME: We always assume 64Mb Xbox for now, until switch to + // NT-style LPB is finished + /*if (0 != (LoaderBlock->Flags & MB_FLAGS_MEM_INFO)) { PhysBuffer.u.LowPart = (LoaderBlock->MemHigher + 1024) * 1024; } - else + else*/ { /* Assume a 64Mb Xbox, last 4MB for video buf */ PhysBuffer.u.LowPart = 60 * 1024 * 1024; Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halinit_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c Mon Oct 2 01:07:25 2006 @@ -19,7 +19,7 @@ /* FUNCTIONS ***************************************************************/ VOID -HalpInitPhase0(PROS_LOADER_PARAMETER_BLOCK LoaderBlock) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { HalpHooks.InitPciBus = HalpXboxInitPciBus;

1 0

[ion] 24352: - Un-optimize KeGetPcr and make it use fs:20h instead of hard-coding the 0xFF.... address, because someone decided that ROS should have a different KPCR address then NT. - This gets NTLDR working with ReactOS and I can boot all the way to MmInit1 (which fails due to missing KeMemoryMap & freeldr data). - Serial port output works with DPRINT1 as well ; -)
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Mon Oct 2 00:27:36 2006 New Revision: 24352 URL: http://svn.reactos.org/svn/reactos?rev=24352&view=rev Log: - Un-optimize KeGetPcr and make it use fs:20h instead of hard-coding the 0xFF.... address, because someone decided that ROS should have a different KPCR address then NT. - This gets NTLDR working with ReactOS and I can boot all the way to MmInit1 (which fails due to missing KeMemoryMap & freeldr data). - Serial port output works with DPRINT1 as well ;-) Modified: trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/kd/kdinit.c Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c (original) +++ trunk/reactos/hal/halx86/generic/processor.c Mon Oct 2 00:27:36 2006 @@ -20,11 +20,11 @@ /* FUNCTIONS *****************************************************************/ -VOID STDCALL -HalInitializeProcessor(ULONG ProcessorNumber, - PLOADER_PARAMETER_BLOCK LoaderBlock) +VOID +NTAPI +HalInitializeProcessor(IN ULONG ProcessorNumber, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - DPRINT("HalInitializeProcessor(%lu %p)\n", ProcessorNumber, LoaderBlock); /* Set default IDR */ KeGetPcr()->IDR = 0xFFFFFFFB; KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Mon Oct 2 00:27:36 2006 @@ -92,7 +92,11 @@ // #define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) #define PCR ((volatile KPCR * const)K0IPCR) +#ifdef _WE_USE_THE_SAME_PCR_ADDRESS #define KeGetPcr() PCR +#else +#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) +#endif // // Number of dispatch codes supported by KINTERRUPT Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c Mon Oct 2 00:27:36 2006 @@ -168,6 +168,15 @@ ULONG i; PCHAR p1, p2; +#if 0 + /* NTLDR HACK */ + KdpSerialInit(&DispatchTable[KdSerial], 0); + KdpDebugMode.Serial = TRUE; + SerialPortInfo.ComPort = 1; + KdpPort = 1; + KdDebuggerEnabled = TRUE; +#endif + /* Set Default Port Options */ if (BootPhase == 0) {

1 0

[ion] 24351: - Do MmInit1 in KiInitializeKernel so we can access SharedUserData from it (we'll need to setup the CPU Features there). - Cleanup some external/prototype mess and put them nicely into headers.
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Sun Oct 1 23:43:18 2006 New Revision: 24351 URL: http://svn.reactos.org/svn/reactos?rev=24351&view=rev Log: - Do MmInit1 in KiInitializeKernel so we can access SharedUserData from it (we'll need to setup the CPU Features there). - Cleanup some external/prototype mess and put them nicely into headers. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=243… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Oct 1 23:43:18 2006 @@ -24,35 +24,18 @@ ULONG NtBuildNumber = KERNEL_VERSION_BUILD; ULONG NtGlobalFlag = 0; -ULONG InitSafeBootMode = 0; /* KB83764 */ - extern ULONG MmCoreDumpType; -extern CHAR KiTimerSystemAuditing; -extern PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS]; -extern ADDRESS_RANGE KeMemoryMap[64]; -extern ULONG KeMemoryMapRangeCount; -extern ULONG_PTR FirstKrnlPhysAddr; -extern ULONG_PTR LastKrnlPhysAddr; -extern ULONG_PTR LastKernelAddress; extern LOADER_MODULE KeLoaderModules[64]; extern ULONG KeLoaderModuleCount; extern PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; - BOOLEAN NoGuiBoot = FALSE; -static BOOLEAN BootLog = FALSE; -static ULONG MaxMem = 0; static BOOLEAN ForceAcpiDisable = FALSE; - -BOOLEAN -NTAPI -PspInitPhase0( - VOID -); /* Init flags and settings */ ULONG ExpInitializationPhase; BOOLEAN ExpInTextModeSetup; BOOLEAN IoRemoteBootClient; +ULONG InitSafeBootMode; /* Boot NLS information */ PVOID ExpNlsTableBase; @@ -251,9 +234,7 @@ __inline VOID STDCALL -ParseCommandLine(PULONG MaxMem, - PBOOLEAN NoGuiBoot, - PBOOLEAN BootLog, +ParseCommandLine(PBOOLEAN NoGuiBoot, PBOOLEAN ForceAcpiDisable) { PCHAR p1, p2; @@ -262,26 +243,7 @@ while(*p1 && (p2 = strchr(p1, '/'))) { p2++; - if (!_strnicmp(p2, "MAXMEM", 6)) { - - p2 += 6; - while (isspace(*p2)) p2++; - - if (*p2 == '=') { - - p2++; - - while(isspace(*p2)) p2++; - - if (isdigit(*p2)) { - while (isdigit(*p2)) { - *MaxMem = *MaxMem * 10 + *p2 - '0'; - p2++; - } - break; - } - } - } else if (!_strnicmp(p2, "NOGUIBOOT", 9)) { + if (!_strnicmp(p2, "NOGUIBOOT", 9)) { p2 += 9; *NoGuiBoot = TRUE; @@ -301,10 +263,6 @@ MmCoreDumpType = MM_CORE_DUMP_TYPE_NONE; } } - } else if (!_strnicmp(p2, "BOOTLOG", 7)) { - - p2 += 7; - *BootLog = TRUE; } else if (!_strnicmp(p2, "NOACPI", 6)) { p2 += 6; @@ -514,19 +472,8 @@ { PNLS_DATA_BLOCK NlsData; - /* Initialize Kernel Memory Address Space */ - MmInit1(FirstKrnlPhysAddr, - LastKrnlPhysAddr, - LastKernelAddress, - (PADDRESS_RANGE)&KeMemoryMap, - KeMemoryMapRangeCount, - MaxMem > 8 ? MaxMem : 4096); - - /* Sets up the Text Sections of the Kernel and HAL for debugging */ - LdrInit1(); - /* Parse Command Line Settings */ - ParseCommandLine(&MaxMem, &NoGuiBoot, &BootLog, &ForceAcpiDisable); + ParseCommandLine(&NoGuiBoot, &ForceAcpiDisable); /* FIXME: Deprecate soon */ ParseAndCacheLoadedModules(); @@ -726,7 +673,7 @@ DbgBreakPoint(); /* Setup Drivers and Root Device Node */ - IoInit2(BootLog); + IoInit2(FALSE); /* Display the boot screen image if not disabled */ if (!NoGuiBoot) InbvEnableBootDriver(TRUE); @@ -826,7 +773,6 @@ } /* Enable the Clock, close remaining handles */ - KiTimerSystemAuditing = 1; ZwClose(ThreadHandle); ZwClose(ProcessHandle); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Sun Oct 1 23:43:18 2006 @@ -66,6 +66,12 @@ struct _KPCR; struct _KPRCB; struct _KEXCEPTION_FRAME; + +extern ADDRESS_RANGE KeMemoryMap[64]; +extern ULONG KeMemoryMapRangeCount; +extern ULONG_PTR FirstKrnlPhysAddr; +extern ULONG_PTR LastKrnlPhysAddr; +extern ULONG_PTR LastKernelAddress; extern PVOID KeUserApcDispatcher; extern PVOID KeUserCallbackDispatcher; Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Sun Oct 1 23:43:18 2006 @@ -76,6 +76,12 @@ VOID NTAPI PspShutdownProcessManager( + VOID +); + +BOOLEAN +NTAPI +PspInitPhase0( VOID ); Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=24… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Sun Oct 1 23:43:18 2006 @@ -35,7 +35,6 @@ LARGE_INTEGER SystemBootTime = { 0 }; #endif -CHAR KiTimerSystemAuditing = 0; KDPC KiExpireTimerDpc; BOOLEAN KiClockSetupComplete = FALSE; Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 23:43:18 2006 @@ -11,7 +11,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> -#include <intrin.h> /* GLOBALS *******************************************************************/ @@ -164,6 +163,17 @@ DPRINT1("SMP Boot support not yet present\n"); } + /* Initialize Kernel Memory Address Space */ + MmInit1(FirstKrnlPhysAddr, + LastKrnlPhysAddr, + LastKernelAddress, + (PADDRESS_RANGE)&KeMemoryMap, + KeMemoryMapRangeCount, + 4096); + + /* Sets up the Text Sections of the Kernel and HAL for debugging */ + LdrInit1(); + /* Setup the Idle Thread */ KeInitializeThread(InitProcess, InitThread,

1 0

[fireball] 24350: - Add new type of debug print for windows loader - Add address conversion routines for windows loader - Add stubs for PE loading, memory operations - Add some code to the LoadAndBootWindows() Some notes: - The windows loader is going to become some kind of a library in future, shared at least between freeldr and EFI loader. - The code in windows loader is specific to i386 architecture for now, but I add it to the "freeldr_base". I better separate it a bit later, after discussio
by fireball＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: fireball Date: Sun Oct 1 23:39:49 2006 New Revision: 24350 URL: http://svn.reactos.org/svn/reactos?rev=24350&view=rev Log: - Add new type of debug print for windows loader - Add address conversion routines for windows loader - Add stubs for PE loading, memory operations - Add some code to the LoadAndBootWindows() Some notes: - The windows loader is going to become some kind of a library in future, shared at least between freeldr and EFI loader. - The code in windows loader is specific to i386 architecture for now, but I add it to the "freeldr_base". I better separate it a bit later, after discussion with arty (because I hardly want compatibility with loading windows on PPC). Added: trunk/reactos/boot/freeldr/freeldr/windows/conversion.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c Sun Oct 1 23:39:49 2006 @@ -38,7 +38,8 @@ #elif defined (DEBUG_REACTOS) ULONG DebugPrintMask = DPRINT_REACTOS | DPRINT_REGISTRY; #elif defined (DEBUG_CUSTOM) -ULONG DebugPrintMask = DPRINT_WARNING|DPRINT_FILESYSTEM|DPRINT_MEMORY|DPRINT_LINUX; +ULONG DebugPrintMask = DPRINT_WARNING | DPRINT_MEMORY | + DPRINT_REACTOS | DPRINT_WINDOWS | DPRINT_HWDETECT; #else //#elif defined (DEBUG_NONE) ULONG DebugPrintMask = 0; #endif @@ -203,6 +204,16 @@ DebugPrintChar(':'); DebugPrintChar(' '); break; + case DPRINT_WINDOWS: + DebugPrintChar('W'); + DebugPrintChar('I'); + DebugPrintChar('N'); + DebugPrintChar('L'); + DebugPrintChar('D'); + DebugPrintChar('R'); + DebugPrintChar(':'); + DebugPrintChar(' '); + break; case DPRINT_HWDETECT: DebugPrintChar('H'); DebugPrintChar('W'); Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Sun Oct 1 23:39:49 2006 @@ -8,6 +8,7 @@ <define name="DEBUG" /> --> <define name="_NTHAL_" /> + <define name="_NTSYSTEM_" /> <compilerflag>-ffreestanding</compilerflag> <compilerflag>-fno-builtin</compilerflag> <compilerflag>-fno-inline</compilerflag> @@ -67,7 +68,10 @@ <file>video.c</file> </directory> <directory name="windows"> + <file>conversion.c</file> + <file>peloader.c</file> <file>winldr.c</file> + <file>wlmemory.c</file> </directory> <file>freeldr.c</file> <file>debug.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Sun Oct 1 23:39:49 2006 @@ -35,6 +35,7 @@ #define DPRINT_REACTOS 0x00000100 // OR this with DebugPrintMask to enable ReactOS messages #define DPRINT_LINUX 0x00000200 // OR this with DebugPrintMask to enable Linux messages #define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages + #define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader VOID DebugInit(VOID); VOID DebugPrint(ULONG Mask, char *format, ...); Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h Sun Oct 1 23:39:49 2006 @@ -29,5 +29,49 @@ /////////////////////////////////////////////////////////////////////////////////////// VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion); +/* Entry-point to kernel */ +typedef +VOID +NTAPI +(*KERNEL_ENTRY_POINT) (PLOADER_PARAMETER_BLOCK LoaderBlock); + + +// Some definitions +#define SECTOR_SIZE 512 + +// Descriptors +#define NUM_GDT 28 //15. The kernel wants 0xD8 as a last GDT entry offset +#define NUM_IDT 0x100 // only 16 are used though + +// conversion.c +PVOID VaToPa(PVOID Va); +PVOID PaToVa(PVOID Pa); +VOID List_PaToVa(LIST_ENTRY *ListEntry); +VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); + +// peloader.c +BOOLEAN +WinLdrLoadImage(IN PCHAR FileName, + OUT PVOID *ImageBasePA); + + +BOOLEAN +WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH BaseDllName, + IN PCCH FullDllName, + IN PVOID BasePA, + OUT PLDR_DATA_TABLE_ENTRY *NewEntry); + +BOOLEAN +WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH DirectoryPath, + IN PLDR_DATA_TABLE_ENTRY ScanDTE); + +// wlmemory.c +BOOLEAN +WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + ULONG PcrBasePage, + ULONG TssBasePage, + PVOID GdtIdt); #endif // defined __WINLDR_H Added: trunk/reactos/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/conversion.c (added) +++ trunk/reactos/boot/freeldr/freeldr/windows/conversion.c Sun Oct 1 23:39:49 2006 @@ -1,0 +1,123 @@ +/* + * PROJECT: EFI Windows Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: freeldr/winldr/conversion.c + * PURPOSE: Physical <-> Virtual addressing mode conversions + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <freeldr.h> + +//#include <ndk/ldrtypes.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS **************************************************************/ + +/* Arch-specific addresses translation implementation */ +PVOID +VaToPa(PVOID Va) +{ + return (PVOID)((ULONG_PTR)Va & ~KSEG0_BASE); +} + +PVOID +PaToVa(PVOID Pa) +{ + return (PVOID)((ULONG_PTR)Pa | KSEG0_BASE); +} + +VOID +List_PaToVa(LIST_ENTRY *ListEntry) +{ + LIST_ENTRY *ListHead = ListEntry; + LIST_ENTRY *Next = ListEntry->Flink; + LIST_ENTRY *NextPA; + + //Print(L"\n\nList_Entry: %X, First Next: %X\n", ListEntry, Next); + // + // Walk through the whole list + // + if (Next != NULL) + { + while (Next != PaToVa(ListHead)) + { + NextPA = VaToPa(Next); + //Print(L"Current: %X, Flink: %X, Blink: %X\n", Next, NextPA->Flink, NextPA->Blink); + + NextPA->Flink = PaToVa((PVOID)NextPA->Flink); + NextPA->Blink = PaToVa((PVOID)NextPA->Blink); + + //Print(L"After converting Flink: %X, Blink: %X\n", NextPA->Flink, NextPA->Blink); + + Next = NextPA->Flink; + } + + // + // Finally convert first Flink/Blink + // + ListEntry->Flink = PaToVa((PVOID)ListEntry->Flink); + if (ListEntry->Blink) + ListEntry->Blink = PaToVa((PVOID)ListEntry->Blink); + } +} + +// This function converts only Child->Child, and calls itself for each Sibling +VOID +ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start) +{ + PCONFIGURATION_COMPONENT_DATA Child; + PCONFIGURATION_COMPONENT_DATA Sibling; + + DbgPrint((DPRINT_WINDOWS, "ConvertConfigToVA(Start 0x%X)", Start)); + Child = Start; + + while (Child != NULL) + { + if (Child->ConfigurationData) + Child->ConfigurationData = PaToVa(Child->ConfigurationData); + + if (Child->Child) + Child->Child = PaToVa(Child->Child); + + if (Child->Parent) + Child->Parent = PaToVa(Child->Parent); + + if (Child->Sibling) + Child->Sibling = PaToVa(Child->Sibling); + + DbgPrint((DPRINT_WINDOWS, "Device 0x%X class %d", Child, Child->ComponentEntry.Class)); + + // If the child has a sibling list, then search the sibling list + // for an entry that matches the specified class, type, and key. + Sibling = Child->Sibling; + while (Sibling != NULL) + { + if (Sibling->ConfigurationData) + Sibling->ConfigurationData = PaToVa(Sibling->ConfigurationData); + + if (Sibling->Child) + Sibling->Child = PaToVa(Sibling->Child); + + if (Sibling->Parent) + Sibling->Parent = PaToVa(Sibling->Parent); + + if (Sibling->Sibling) + Sibling->Sibling = PaToVa(Sibling->Sibling); + + DbgPrint((DPRINT_WINDOWS, "Device 0x%X class %d", Sibling, Sibling->ComponentEntry.Class)); + + // If the sibling has a child tree, then search the child tree + // for an entry that matches the specified class, type, and key. + if (VaToPa(Sibling->Child) != NULL) + ConvertConfigToVA(VaToPa(Sibling->Child)); + + Sibling = VaToPa(Sibling->Sibling); + } + + Child = VaToPa(Child->Child); + } +} Added: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c (added) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c Sun Oct 1 23:39:49 2006 @@ -1,0 +1,55 @@ +/* + * PROJECT: WinLoader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: freeldr/winldr/peloader.c + * PURPOSE: Provides routines for loading PE files. To be merged with + * arch/i386/loader.c in future + * This article was very handy during development: + * http://msdn.microsoft.com/msdnmag/issues/02/03/PE2/ + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * The source code in this file is based on the work of respective + * authors of PE loading code in ReactOS and Brian Palmer and + * Alex Ionescu's arch/i386/loader.c, and my research project + * (creating a native EFI loader for Windows) + */ + +/* INCLUDES ***************************************************************/ +#include <freeldr.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS **************************************************************/ + +BOOLEAN +WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH DirectoryPath, + IN PLDR_DATA_TABLE_ENTRY ScanDTE) +{ + return FALSE; +} + +BOOLEAN +WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, + IN PCCH BaseDllName, + IN PCCH FullDllName, + IN PVOID BasePA, + OUT PLDR_DATA_TABLE_ENTRY *NewEntry) +{ + return FALSE; +} + +/* WinLdrLoadImage loads the specified image from the file (it doesn't + perform any additional operations on the filename, just directly + calls the file I/O routines), and relocates it so that it's ready + to be used when paging is enabled. + Addressing mode: physical + */ +BOOLEAN +WinLdrLoadImage(IN PCHAR FileName, + OUT PVOID *ImageBasePA) +{ + return FALSE; +} + +/* PRIVATE FUNCTIONS *******************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Sun Oct 1 23:39:49 2006 @@ -24,13 +24,178 @@ #define NDEBUG #include <debug.h> +VOID DumpMemoryAllocMap(VOID); +VOID WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock); + VOID LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion) { CHAR MsgBuffer[256]; - - sprintf(MsgBuffer,"Booting Microsoft(R) Windows(R) OS version '%04x' is not implemented yet", OperatingSystemVersion); - UiMessageBox(MsgBuffer); + CHAR SystemPath[1024], SearchPath[1024]; + CHAR FileName[1024]; + CHAR BootPath[256]; + PVOID NtosBase = NULL, HalBase = NULL; + BOOLEAN Status; + ULONG SectionId; + ULONG BootDevice; + PLOADER_PARAMETER_BLOCK LoaderBlock=NULL, LoaderBlockVA; + PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE; + KERNEL_ENTRY_POINT KiSystemStartup; + // Mm-related things + PVOID GdtIdt=NULL; + ULONG PcrBasePage=0; + ULONG TssBasePage=0; + + //sprintf(MsgBuffer,"Booting Microsoft(R) Windows(R) OS version '%04x' is not implemented yet", OperatingSystemVersion); + //UiMessageBox(MsgBuffer); + + // + // Open the operating system section + // specified in the .ini file + // + if (!IniOpenSection(OperatingSystemName, &SectionId)) + { + sprintf(MsgBuffer,"Operating System section '%s' not found in freeldr.ini", OperatingSystemName); + UiMessageBox(MsgBuffer); + return; + } + + /* + * Make sure the system path is set in the .ini file + */ + if (!IniReadSettingByName(SectionId, "SystemPath", SystemPath, sizeof(SystemPath))) + { + UiMessageBox("System path not specified for selected operating system."); + return; + } + + if (!MachDiskNormalizeSystemPath(SystemPath, + sizeof(SystemPath))) + { + UiMessageBox("Invalid system path"); + return; + } + + UiDrawStatusText("Loading..."); + + /* + * Try to open system drive + */ + BootDevice = 0xffffffff; + if (!FsOpenSystemVolume(SystemPath, BootPath, &BootDevice)) + { + UiMessageBox("Failed to open boot drive."); + return; + } + + /* append a backslash */ + if ((strlen(BootPath)==0) || + BootPath[strlen(BootPath)] != '\\') + strcat(BootPath, "\\"); + + DbgPrint((DPRINT_WINDOWS,"SystemRoot: '%s'\n", BootPath)); + + /* Allocate and minimalistic-initialize LPB */ + //AllocateAndInitLPB(&LoaderBlock); + + // Load kernel + strcpy(FileName, BootPath); + strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE"); + Status = WinLdrLoadImage(FileName, &NtosBase); + DbgPrint((DPRINT_WINDOWS, "Ntos loaded with status %d\n", Status)); + + // Load HAL + strcpy(FileName, BootPath); + strcat(FileName, "SYSTEM32\\HAL.DLL"); + Status = WinLdrLoadImage(FileName, &HalBase); + DbgPrint((DPRINT_WINDOWS, "HAL loaded with status %d\n", Status)); + + WinLdrAllocateDataTableEntry(LoaderBlock, "ntoskrnl.exe", + "WINNT\\SYSTEM32\\NTOSKRNL.EXE", NtosBase, &KernelDTE); + WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", + "WINNT\\SYSTEM32\\HAL.EXE", HalBase, &HalDTE); + + /* Load all referenced DLLs for kernel and HAL */ + strcpy(SearchPath, BootPath); + strcat(SearchPath, "SYSTEM32\\"); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); + WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); + + /* Initialize Phase 1 - before NLS */ + //WinLdrInitializePhase1(LoaderBlock); + + /* Load SYSTEM hive and its LOG file */ + strcpy(SearchPath, BootPath); + strcat(SearchPath, "SYSTEM32\\CONFIG\\"); + //Status = WinLdrLoadSystemHive(LoaderBlock, SearchPath, "SYSTEM"); + DbgPrint((DPRINT_WINDOWS, "SYSTEM hive loaded with status %d\n", Status)); + + /* Load NLS data */ + strcpy(SearchPath, BootPath); + strcat(SearchPath, "SYSTEM32\\"); + //Status = WinLdrLoadNLSData(LoaderBlock, SearchPath, + // "c_1252.nls", "c_437.nls", "l_intl.nls"); + DbgPrint((DPRINT_WINDOWS, "NLS data loaded with status %d\n", Status)); + + /* Load OEM HAL font */ + + /* Load boot drivers */ + + /* Alloc PCR, TSS, do magic things with the GDT/IDT */ + //WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); + + /* Save entry-point pointer (VA) */ + KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; + LoaderBlockVA = PaToVa(LoaderBlock); + + /* Debugging... */ + //DumpMemoryAllocMap(); + + /* Turn on paging mode of CPU*/ + WinLdrTurnOnPaging(LoaderBlock, PcrBasePage, TssBasePage, GdtIdt); + + DbgPrint((DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", + KiSystemStartup, LoaderBlockVA)); + + WinLdrpDumpMemoryDescriptors(LoaderBlockVA); + + /*__asm + { + or esp, KSEG0_BASE; + or ebp, KSEG0_BASE; + }*/ + + /* + { + ULONG *trrr = (ULONG *)(512*1024*1024); + + *trrr = 0x13131414; + } + + //FIXME! + while (1) {};*/ + + (KiSystemStartup)(LoaderBlockVA); return; } + +VOID +WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextMd; + PMEMORY_ALLOCATION_DESCRIPTOR MemoryDescriptor; + + NextMd = LoaderBlock->MemoryDescriptorListHead.Flink; + + while (NextMd != &LoaderBlock->MemoryDescriptorListHead) + { + MemoryDescriptor = CONTAINING_RECORD(NextMd, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); + + + DbgPrint((DPRINT_WINDOWS, "BP %08X PC %04X MT %d\n", MemoryDescriptor->BasePage, + MemoryDescriptor->PageCount, MemoryDescriptor->MemoryType)); + + NextMd = MemoryDescriptor->ListEntry.Flink; + } +} Added: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (added) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Sun Oct 1 23:39:49 2006 @@ -1,0 +1,35 @@ +/* + * PROJECT: EFI Windows Loader + * LICENSE: GPL - See COPYING in the top level directory + * FILE: freeldr/winldr/wlmemory.c + * PURPOSE: Memory related routines + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + */ + +/* INCLUDES ***************************************************************/ + +#include <freeldr.h> + +#include <ndk/asm.h> + +#define NDEBUG +#include <debug.h> + +// This is needed because headers define wrong one for ReactOS +#undef KIP0PCRADDRESS +#define KIP0PCRADDRESS 0xffdff000 + +#define HYPER_SPACE_ENTRY 0x300 + +/* GLOBALS ***************************************************************/ + +/* FUNCTIONS **************************************************************/ + +BOOLEAN +WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + ULONG PcrBasePage, + ULONG TssBasePage, + PVOID GdtIdt) +{ + return FALSE; +}

1 0

[amunger] 24349: Merge the one line fix from 24273 v. 24276.
by amunger＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: amunger Date: Sun Oct 1 23:29:03 2006 New Revision: 24349 URL: http://svn.reactos.org/svn/reactos?rev=24349&view=rev Log: Merge the one line fix from 24273 v. 24276. Modified: branches/ros-branch-0_3_1/reactos/lib/rtl/i386/rtlmem.s Modified: branches/ros-branch-0_3_1/reactos/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/lib/rt… ============================================================================== --- branches/ros-branch-0_3_1/reactos/lib/rtl/i386/rtlmem.s (original) +++ branches/ros-branch-0_3_1/reactos/lib/rtl/i386/rtlmem.s Sun Oct 1 23:29:03 2006 @@ -249,7 +249,7 @@ ByteMove: /* Move what's left */ - rep stosb + rep movsb DoneMove: /* Restore volatiles */

1 0

[ion] 24348: - Do MmInit1 much earlier in the boot phase (right at the beginning of ExpInitalizeExecutive). This gives us access to things like SharedUserData, which NT has since NTLDR. Will try moving it up even higher. - Also move some ROS-specific/Freeldr hacks on top of the file so they'll be easier to remove later when needed. - Fix a bug in ExInitPoolLookasidePointers which was making us overwrite low-memory. - Initialize NLS tables during Phase 0, so that the associated APIs can work earl
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Sun Oct 1 23:27:10 2006 New Revision: 24348 URL: http://svn.reactos.org/svn/reactos?rev=24348&view=rev Log: - Do MmInit1 much earlier in the boot phase (right at the beginning of ExpInitalizeExecutive). This gives us access to things like SharedUserData, which NT has since NTLDR. Will try moving it up even higher. - Also move some ROS-specific/Freeldr hacks on top of the file so they'll be easier to remove later when needed. - Fix a bug in ExInitPoolLookasidePointers which was making us overwrite low-memory. - Initialize NLS tables during Phase 0, so that the associated APIs can work earlier. - Bugcheck if HAL Phase 0 initialization failed, and force interrupts enabled after the HAL is ready. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/lookas.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/rtl/nls.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=243… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Oct 1 23:27:10 2006 @@ -49,9 +49,16 @@ VOID ); +/* Init flags and settings */ ULONG ExpInitializationPhase; BOOLEAN ExpInTextModeSetup; BOOLEAN IoRemoteBootClient; + +/* Boot NLS information */ +PVOID ExpNlsTableBase; +ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; +ULONG ExpUnicodeCaseTableDataOffset; +NLSTABLEINFO ExpNlsTableInfo; /* FUNCTIONS ****************************************************************/ @@ -244,53 +251,6 @@ __inline VOID STDCALL -ParseAndCacheLoadedModules(VOID) -{ - ULONG i; - PCHAR Name; - - /* Loop the Module List and get the modules we want */ - for (i = 1; i < KeLoaderModuleCount; i++) { - - /* Get the Name of this Module */ - if (!(Name = strrchr((PCHAR)KeLoaderModules[i].String, '\\'))) { - - /* Save the name */ - Name = (PCHAR)KeLoaderModules[i].String; - - } else { - - /* No name, skip */ - Name++; - } - - /* Now check for any of the modules we will need later */ - if (!_stricmp(Name, "ansi.nls")) { - - CachedModules[AnsiCodepage] = &KeLoaderModules[i]; - - } else if (!_stricmp(Name, "oem.nls")) { - - CachedModules[OemCodepage] = &KeLoaderModules[i]; - - } else if (!_stricmp(Name, "casemap.nls")) { - - CachedModules[UnicodeCasemap] = &KeLoaderModules[i]; - - } else if (!_stricmp(Name, "system") || !_stricmp(Name, "system.hiv")) { - - CachedModules[SystemRegistry] = &KeLoaderModules[i]; - - } else if (!_stricmp(Name, "hardware") || !_stricmp(Name, "hardware.hiv")) { - - CachedModules[HardwareRegistry] = &KeLoaderModules[i]; - } - } -} - -__inline -VOID -STDCALL ParseCommandLine(PULONG MaxMem, PBOOLEAN NoGuiBoot, PBOOLEAN BootLog, @@ -354,7 +314,53 @@ p1 = p2; } } - + +VOID +FORCEINLINE +ParseAndCacheLoadedModules(VOID) +{ + ULONG i; + PCHAR Name; + + /* Loop the Module List and get the modules we want */ + for (i = 1; i < KeLoaderModuleCount; i++) + { + /* Get the Name of this Module */ + if (!(Name = strrchr((PCHAR)KeLoaderModules[i].String, '\\'))) + { + /* Save the name */ + Name = (PCHAR)KeLoaderModules[i].String; + } + else + { + /* No name, skip */ + Name++; + } + + /* Now check for any of the modules we will need later */ + if (!_stricmp(Name, "ansi.nls")) + { + CachedModules[AnsiCodepage] = &KeLoaderModules[i]; + } + else if (!_stricmp(Name, "oem.nls")) + { + CachedModules[OemCodepage] = &KeLoaderModules[i]; + } + else if (!_stricmp(Name, "casemap.nls")) + { + CachedModules[UnicodeCasemap] = &KeLoaderModules[i]; + } + else if (!_stricmp(Name, "system") || !_stricmp(Name, "system.hiv")) + { + CachedModules[SystemRegistry] = &KeLoaderModules[i]; + } + else if (!_stricmp(Name, "hardware") || !_stricmp(Name, "hardware.hiv")) + { + CachedModules[HardwareRegistry] = &KeLoaderModules[i]; + } + } +} + VOID INIT_FUNCTION ExpDisplayNotice(VOID) @@ -506,6 +512,25 @@ ExpInitializeExecutive(IN ULONG Cpu, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + PNLS_DATA_BLOCK NlsData; + + /* Initialize Kernel Memory Address Space */ + MmInit1(FirstKrnlPhysAddr, + LastKrnlPhysAddr, + LastKernelAddress, + (PADDRESS_RANGE)&KeMemoryMap, + KeMemoryMapRangeCount, + MaxMem > 8 ? MaxMem : 4096); + + /* Sets up the Text Sections of the Kernel and HAL for debugging */ + LdrInit1(); + + /* Parse Command Line Settings */ + ParseCommandLine(&MaxMem, &NoGuiBoot, &BootLog, &ForceAcpiDisable); + + /* FIXME: Deprecate soon */ + ParseAndCacheLoadedModules(); + /* Validate Loader */ if (!ExpIsLoaderValid(LoaderBlock)) { @@ -558,31 +583,37 @@ /* Set phase to 0 */ ExpInitializationPhase = 0; - /* Initialize HAL */ - HalInitSystem (0, KeLoaderBlock); - - /* Sets up the Text Sections of the Kernel and HAL for debugging */ - LdrInit1(); + /* Setup NLS Base and offsets */ + NlsData = LoaderBlock->NlsData; + ExpNlsTableBase = NlsData->AnsiCodePageData; + ExpAnsiCodePageDataOffset = 0; + ExpOemCodePageDataOffset = ((ULONG_PTR)NlsData->OemCodePageData - + (ULONG_PTR)NlsData->AnsiCodePageData); + ExpUnicodeCaseTableDataOffset = ((ULONG_PTR)NlsData->UnicodeCodePageData - + (ULONG_PTR)NlsData->AnsiCodePageData); + + /* Initialize the NLS Tables */ + RtlInitNlsTables((PVOID)((ULONG_PTR)ExpNlsTableBase + + ExpAnsiCodePageDataOffset), + (PVOID)((ULONG_PTR)ExpNlsTableBase + + ExpOemCodePageDataOffset), + (PVOID)((ULONG_PTR)ExpNlsTableBase + + ExpUnicodeCaseTableDataOffset), + &ExpNlsTableInfo); + RtlResetRtlTranslations(&ExpNlsTableInfo); + + /* Now initialize the HAL */ + if (!HalInitSystem(ExpInitializationPhase, LoaderBlock)) + { + /* HAL failed to initialize, bugcheck */ + KeBugCheck(HAL_INITIALIZATION_FAILED); + } + + /* Make sure interrupts are active now */ + _enable(); /* Setup bugcheck messages */ KiInitializeBugCheck(); - - /* Sets up the VDM Data */ - NtEarlyInitVdm(); - - /* Parse Command Line Settings */ - ParseCommandLine(&MaxMem, &NoGuiBoot, &BootLog, &ForceAcpiDisable); - - /* Initialize Kernel Memory Address Space */ - MmInit1(FirstKrnlPhysAddr, - LastKrnlPhysAddr, - LastKernelAddress, - (PADDRESS_RANGE)&KeMemoryMap, - KeMemoryMapRangeCount, - MaxMem > 8 ? MaxMem : 4096); - - /* Parse the Loaded Modules (by FreeLoader) and cache the ones we'll need */ - ParseAndCacheLoadedModules(); /* Setup system time */ KiInitializeSystemClock(); Modified: trunk/reactos/ntoskrnl/ex/lookas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/lookas.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/lookas.c (original) +++ trunk/reactos/ntoskrnl/ex/lookas.c Sun Oct 1 23:27:10 2006 @@ -24,8 +24,8 @@ KSPIN_LOCK ExpNonPagedLookasideListLock; LIST_ENTRY ExpPagedLookasideListHead; KSPIN_LOCK ExpPagedLookasideListLock; -PNPAGED_LOOKASIDE_LIST ExpSmallNPagedPoolLookasideLists; -PPAGED_LOOKASIDE_LIST ExpSmallPagedPoolLookasideLists; +NPAGED_LOOKASIDE_LIST ExpSmallNPagedPoolLookasideLists[MAXIMUM_PROCESSORS]; +PAGED_LOOKASIDE_LIST ExpSmallPagedPoolLookasideLists[MAXIMUM_PROCESSORS]; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Oct 1 23:27:10 2006 @@ -431,6 +431,9 @@ (PVOID)DriverBase, &DriverSize); + /* Sets up the VDM Data */ + NtEarlyInitVdm(); + /* Convert the loader block */ KiRosFrldrLpbToNtLpb(&KeRosLoaderBlock, &NtLoaderBlock); Modified: trunk/reactos/ntoskrnl/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/nls.c?rev=243… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/nls.c (original) +++ trunk/reactos/ntoskrnl/rtl/nls.c Sun Oct 1 23:27:10 2006 @@ -64,9 +64,6 @@ RtlpImportUnicodeCasemap((PUSHORT)BaseAddress, CachedModules[UnicodeCasemap]->ModEnd - BaseAddress); - /* Create initial NLS tables */ - RtlpCreateInitialNlsTables(); - /* Create the NLS section */ RtlpCreateNlsSection(); } @@ -101,29 +98,6 @@ { NlsUnicodeCasemapTable = TableBase; NlsUnicodeCasemapTableSize = Size; -} - - -VOID -NTAPI -INIT_FUNCTION -RtlpCreateInitialNlsTables(VOID) -{ - NLSTABLEINFO NlsTable; - - if (NlsAnsiCodePageTable == NULL || NlsAnsiCodePageTableSize == 0 || - NlsOemCodePageTable == NULL || NlsOemCodePageTableSize == 0 || - NlsUnicodeCasemapTable == NULL || NlsUnicodeCasemapTableSize == 0) - { - KEBUGCHECKEX (0x32, STATUS_UNSUCCESSFUL, 1, 0, 0); - } - - RtlInitNlsTables (NlsAnsiCodePageTable, - NlsOemCodePageTable, - NlsUnicodeCasemapTable, - &NlsTable); - - RtlResetRtlTranslations (&NlsTable); } VOID

1 0

[ion] 24347: - Add setupblk.h from TinyKRNL with all the definitions for NT's SETUPLDR structures (SETUP_LOADER_BLOCK and hardware configuration stuff). Update KiRosFrldrLpbToNtLpb to setup the Flags field of this block to "Text-Mode Setup Active" when we know that we're in ROS text mode. - Update ExpInitializeExecutive to check for a valid setup block and detect text-mode and network installation modes. Use ExpInTextModeSetup instead of SetupMode variable, to make detection compatible with NTLD
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Sun Oct 1 22:27:59 2006 New Revision: 24347 URL: http://svn.reactos.org/svn/reactos?rev=24347&view=rev Log: - Add setupblk.h from TinyKRNL with all the definitions for NT's SETUPLDR structures (SETUP_LOADER_BLOCK and hardware configuration stuff). Update KiRosFrldrLpbToNtLpb to setup the Flags field of this block to "Text-Mode Setup Active" when we know that we're in ROS text mode. - Update ExpInitializeExecutive to check for a valid setup block and detect text-mode and network installation modes. Use ExpInTextModeSetup instead of SetupMode variable, to make detection compatible with NTLDR. Added: trunk/reactos/include/reactos/arc/setupblk.h Modified: trunk/reactos/include/reactos/arc/arc.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h (original) +++ trunk/reactos/include/reactos/arc/arc.h Sun Oct 1 22:27:59 2006 @@ -23,20 +23,6 @@ MemoryClass, MaximumClass } CONFIGURATION_CLASS; - -typedef enum -{ - HwFileDriver, - HwFilePort, - HwFileClass, - HwFileInf, - HwFileDll, - HwFileDetect, - HwFileHal, - HwFileCatalog, - HwFileMax, - HwFileDynUpdt = 31, -} HwFileType; typedef enum _TYPE_OF_MEMORY { Added: trunk/reactos/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/setupb… ============================================================================== --- trunk/reactos/include/reactos/arc/setupblk.h (added) +++ trunk/reactos/include/reactos/arc/setupblk.h Sun Oct 1 22:27:59 2006 @@ -1,0 +1,152 @@ +#ifndef _SETUPBLK_ +#define _SETUPBLK_ + +// +// Type of file described in DETECTED_DEVICE_FILE +// +typedef enum +{ + HwFileDriver, + HwFilePort, + HwFileClass, + HwFileInf, + HwFileDll, + HwFileDetect, + HwFileHal, + HwFileCatalog, + HwFileMax, + HwFileDynUpdt = 31, +} HwFileType; + +// +// Hardware ID for the detected device +// +typedef struct _PNP_HARDWARE_ID +{ + struct _PNP_HARDWARE_ID *Next; + PCHAR Id; + PCHAR DriverName; + PCHAR ClassGuid; +} PNP_HARDWARE_ID, *PPNP_HARDWARE_ID; + +// +// Structures for detected device data (file/registry) +// +typedef struct _DETECTED_DEVICE_REGISTRY +{ + struct _DETECTED_DEVICE_REGISTRY *Next; + PCHAR KeyName; + PCHAR ValueName; + ULONG ValueType; + PVOID Buffer; + ULONG BufferSize; +} DETECTED_DEVICE_REGISTRY, *PDETECTED_DEVICE_REGISTRY; + +typedef struct _DETECTED_DEVICE_FILE +{ + struct _DETECTED_DEVICE_FILE *Next; + PCHAR FileName; + HwFileType FileType; + PCHAR ConfigName; + PDETECTED_DEVICE_REGISTRY RegistryValueList; + PCHAR DiskDescription; + PCHAR DiskTagfile; + PCHAR Directory; + PCHAR ArcDeviceName; +} DETECTED_DEVICE_FILE, *PDETECTED_DEVICE_FILE; + +// +// Structure for any detected device +// +typedef struct _DETECTED_DEVICE +{ + struct _DETECTED_DEVICE *Next; + PCHAR IdString; + ULONG Ordinal; + PCHAR Description; + BOOLEAN ThirdPartyOptionSelected; + ULONG FileTypeBits; + PDETECTED_DEVICE_FILE Files; + PCHAR BasedllName; + BOOLEAN MigratedDriver; + PPNP_HARDWARE_ID HardwareIds; +} DETECTED_DEVICE, *PDETECTED_DEVICE; + +typedef struct _DETECTED_OEM_SOURCE_DEVICE +{ + struct _DETECTED_OEM_SOURCE_DEVICE *Next; + PCHAR ArcDeviceName; + ULONG ImageBase; + ULONGLONG ImageSize; +} DETECTED_OEM_SOURCE_DEVICE, *PDETECTED_OEM_SOURCE_DEVICE; + +// +// Setup Loader Parameter Block +// +typedef struct _SETUP_LOADER_BLOCK_SCALARS +{ + ULONG SetupOperation; + union + { + struct + { + UCHAR SetupFromCdRom:1; + UCHAR LoadedScsi:1; + UCHAR LoadedFloppyDrivers:1; + UCHAR LoadedDiskDrivers:1; + UCHAR LoadedCdRomDrivers:1; + UCHAR LoadedFileSystems:1; + }; + ULONG AsULong; + }; +} SETUP_LOADER_BLOCK_SCALARS, *PSETUP_LOADER_BLOCK_SCALARS; + +typedef struct _SETUP_LOADER_BLOCK +{ + PCHAR ArcSetupDeviceName; + DETECTED_DEVICE VideoDevice; + PDETECTED_DEVICE KeyboardDevices; + DETECTED_DEVICE ComputerDevice; + PDETECTED_DEVICE ScsiDevices; + PDETECTED_OEM_SOURCE_DEVICE OemSourceDevices; + SETUP_LOADER_BLOCK_SCALARS ScalarValues; + PCHAR IniFile; + ULONG IniFileLength; + PCHAR WinntSifFile; + ULONG WinntSifFileLength; + PCHAR MigrateInfFile; + ULONG MigrateInfFileLength; + PCHAR UnsupDriversInfFile; + ULONG UnsupDriversInfFileLength; + PVOID BootFontFile; + ULONG BootFontFileLength; + MONITOR_CONFIGURATION_DATA Monitor; + PCHAR MonitorId; + PDETECTED_DEVICE BootBusExtenders; + PDETECTED_DEVICE BusExtenders; + PDETECTED_DEVICE InputDevicesSupport; + PPNP_HARDWARE_ID HardwareIdDatabase; + WCHAR ComputerName[64]; + ULONG IpAddress; + ULONG SubnetMask; + ULONG ServerIpAddress; + ULONG DefaultRouter; + ULONG DnsNameServer; + WCHAR NetbootCardHardwareId[64]; + WCHAR NetbootCardDriverName[24]; + WCHAR NetbootCardServiceName[24]; + PCHAR NetbootCardRegistry; + ULONG NetbootCardRegistryLength; + PCHAR NetbootCardInfo; + ULONG NetbootCardInfoLength; + ULONG Flags; + PCHAR MachineDirectoryPath; + PCHAR NetBootSifPath; + PVOID NetBootSecret; + CHAR NetBootIMirrorFilePath[26]; + PCHAR ASRPnPSifFile; + ULONG ASRPnPSifFileLength; + CHAR NetBootAdministratorPassword[64]; +} SETUP_LOADER_BLOCK, *PSETUP_LOADER_BLOCK; + +#endif Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=243… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Oct 1 22:27:59 2006 @@ -41,7 +41,6 @@ BOOLEAN NoGuiBoot = FALSE; static BOOLEAN BootLog = FALSE; static ULONG MaxMem = 0; -BOOLEAN SetupMode = TRUE; static BOOLEAN ForceAcpiDisable = FALSE; BOOLEAN @@ -51,6 +50,8 @@ ); ULONG ExpInitializationPhase; +BOOLEAN ExpInTextModeSetup; +BOOLEAN IoRemoteBootClient; /* FUNCTIONS ****************************************************************/ @@ -279,7 +280,6 @@ } else if (!_stricmp(Name, "system") || !_stricmp(Name, "system.hiv")) { CachedModules[SystemRegistry] = &KeLoaderModules[i]; - SetupMode = FALSE; } else if (!_stricmp(Name, "hardware") || !_stricmp(Name, "hardware.hiv")) { @@ -361,7 +361,7 @@ { CHAR str[50]; - if (SetupMode) + if (ExpInTextModeSetup) { HalDisplayString( "\n\n\n ReactOS " KERNEL_VERSION_STR " Setup \n"); @@ -534,6 +534,30 @@ return; } + /* Assume no text-mode or remote boot */ + ExpInTextModeSetup = FALSE; + IoRemoteBootClient = FALSE; + + /* Check if we have a setup loader block */ + if (LoaderBlock->SetupLdrBlock) + { + /* Check if this is text-mode setup */ + if (LoaderBlock->SetupLdrBlock->Flags & 1) ExpInTextModeSetup = TRUE; + + /* Check if this is network boot */ + if (LoaderBlock->SetupLdrBlock->Flags & 2) + { + /* Set variable */ + IoRemoteBootClient = TRUE; + + /* Make sure we're actually booting off the network */ + ASSERT(!_memicmp(LoaderBlock->ArcBootDeviceName, "net(0)", 6)); + } + } + + /* Set phase to 0 */ + ExpInitializationPhase = 0; + /* Initialize HAL */ HalInitSystem (0, KeLoaderBlock); @@ -658,7 +682,7 @@ RtlpInitNls(); /* Import and Load Registry Hives */ - CmInitHives(SetupMode); + CmInitHives(ExpInTextModeSetup); /* Initialize VDM support */ KeI386VdmInitialize(); Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h Sun Oct 1 22:27:59 2006 @@ -44,6 +44,9 @@ #define ExRaiseStatus RtlRaiseStatus #include <reactos/probe.h> +/* SetupLDR Support */ +#include <arc/setupblk.h> + /* PNP GUIDs */ #include <umpnpmgr/sysguid.h> Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Sun Oct 1 22:27:59 2006 @@ -29,7 +29,7 @@ POBJECT_TYPE IoDriverObjectType = NULL; -extern BOOLEAN SetupMode; +extern BOOLEAN ExpInTextModeSetup; extern BOOLEAN NoGuiBoot; /* DECLARATIONS ***************************************************************/ @@ -311,7 +311,7 @@ BOOLEAN Unicode) { CHAR TextBuffer[256]; - if (SetupMode || !NoGuiBoot) return; + if (ExpInTextModeSetup || !NoGuiBoot) return; if (Unicode) { sprintf(TextBuffer, "Loading %S...\n", (PWCHAR)ServiceName); Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c Sun Oct 1 22:27:59 2006 @@ -41,7 +41,6 @@ LIST_ENTRY GroupListHead = {NULL, NULL}; LIST_ENTRY ServiceListHead = {NULL, NULL}; -extern BOOLEAN SetupMode; extern BOOLEAN NoGuiBoot; VOID Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Oct 1 22:27:59 2006 @@ -47,6 +47,7 @@ MEMORY_ALLOCATION_DESCRIPTOR BldrMemoryDescriptors[64]; WCHAR BldrModuleStrings[64][260]; NLS_DATA_BLOCK BldrNlsDataBlock; +SETUP_LOADER_BLOCK BldrSetupBlock; /* FUNCTIONS *****************************************************************/ @@ -78,8 +79,8 @@ /* Set the NLS Data block */ LoaderBlock->NlsData = &BldrNlsDataBlock; - /* Set an invalid pointer, but used as a flag (SetupBoot) */ - LoaderBlock->SetupLdrBlock = (PVOID)1; + /* Assume this is from FreeLDR's SetupLdr */ + LoaderBlock->SetupLdrBlock = &BldrSetupBlock; /* Setup the list heads */ InitializeListHead(&LoaderBlock->LoadOrderListHead); @@ -248,6 +249,13 @@ LoaderBlock->Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); LoaderBlock->Extension->MajorVersion = 5; LoaderBlock->Extension->MinorVersion = 2; + + /* Now setup the setup block if we have one */ + if (LoaderBlock->SetupLdrBlock) + { + /* All we'll setup right now is the flag for text-mode setup */ + LoaderBlock->SetupLdrBlock->Flags = 1; + } } VOID

1 0

[ion] 24346: - Implement ExpIsLoaderValid to validate the LOADER_PARAMETER_BLOCK's extension for the right size and version (we currently support 5.2 and over). - Add code in KiRosFrldrLpbToNtLpb to setup a LOADER_PARAMETER_EXTENSION and set the right version and size. - Initialize the per-CPU PRCB Paged/NPaged lookaslide pool lists. - Add code to support application CPUs booting in ExpInitializeExecutive, and pass the loaderblock as a parameter.
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Sun Oct 1 22:01:38 2006 New Revision: 24346 URL: http://svn.reactos.org/svn/reactos?rev=24346&view=rev Log: - Implement ExpIsLoaderValid to validate the LOADER_PARAMETER_BLOCK's extension for the right size and version (we currently support 5.2 and over). - Add code in KiRosFrldrLpbToNtLpb to setup a LOADER_PARAMETER_EXTENSION and set the right version and size. - Initialize the per-CPU PRCB Paged/NPaged lookaslide pool lists. - Add code to support application CPUs booting in ExpInitializeExecutive, and pass the loaderblock as a parameter. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/lookas.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=243… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Oct 1 22:01:38 2006 @@ -44,19 +44,13 @@ BOOLEAN SetupMode = TRUE; static BOOLEAN ForceAcpiDisable = FALSE; -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, InitSystemSharedUserPage) -#pragma alloc_text(INIT, ExpDisplayNotice) -#pragma alloc_text(INIT, ExpLoadInitialProcess) -#pragma alloc_text(INIT, ExpInitializeExecutive) -#pragma alloc_text(INIT, ExInit2) -#endif - BOOLEAN NTAPI PspInitPhase0( VOID ); + +ULONG ExpInitializationPhase; /* FUNCTIONS ****************************************************************/ @@ -482,10 +476,64 @@ ExpInitUuids(); } +BOOLEAN +NTAPI +ExpIsLoaderValid(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLOADER_PARAMETER_EXTENSION Extension; + + /* Get the loader extension */ + Extension = LoaderBlock->Extension; + + /* Validate the size (larger structures are OK, we'll just ignore them) */ + if (Extension->Size < sizeof(LOADER_PARAMETER_EXTENSION)) return FALSE; + + /* Don't validate upper versions */ + if (Extension->MajorVersion > 5) return TRUE; + + /* Fail if this is NT 4 */ + if (Extension->MajorVersion < 5) return FALSE; + + /* Fail if this is XP */ + if (Extension->MinorVersion < 2) return FALSE; + + /* This is 2003 or newer, aprove it */ + return TRUE; +} + VOID NTAPI -ExpInitializeExecutive(VOID) -{ +ExpInitializeExecutive(IN ULONG Cpu, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + /* Validate Loader */ + if (!ExpIsLoaderValid(LoaderBlock)) + { + /* Invalid loader version */ + KeBugCheckEx(MISMATCHED_HAL, + 3, + LoaderBlock->Extension->Size, + LoaderBlock->Extension->MajorVersion, + LoaderBlock->Extension->MinorVersion); + } + + /* Initialize PRCB pool lookaside pointers */ + ExInitPoolLookasidePointers(); + + /* Check if this is an application CPU */ + if (Cpu) + { + /* Then simply initialize it with HAL */ + if (!HalInitSystem(ExpInitializationPhase, LoaderBlock)) + { + /* Initialization failed */ + KEBUGCHECK(HAL_INITIALIZATION_FAILED); + } + + /* We're done */ + return; + } + /* Initialize HAL */ HalInitSystem (0, KeLoaderBlock); Modified: trunk/reactos/ntoskrnl/ex/lookas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/lookas.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/lookas.c (original) +++ trunk/reactos/ntoskrnl/ex/lookas.c Sun Oct 1 22:01:38 2006 @@ -24,9 +24,42 @@ KSPIN_LOCK ExpNonPagedLookasideListLock; LIST_ENTRY ExpPagedLookasideListHead; KSPIN_LOCK ExpPagedLookasideListLock; +PNPAGED_LOOKASIDE_LIST ExpSmallNPagedPoolLookasideLists; +PPAGED_LOOKASIDE_LIST ExpSmallPagedPoolLookasideLists; /* FUNCTIONS *****************************************************************/ +VOID +NTAPI +ExInitPoolLookasidePointers(VOID) +{ + ULONG i; + PPP_LOOKASIDE_LIST Entry; + PNPAGED_LOOKASIDE_LIST ListEntry; + PPAGED_LOOKASIDE_LIST PagedListEntry; + + /* Loop for all CPUs */ + for (i = 0; i < MAXIMUM_PROCESSORS; i++) + { + /* Initialize the non-paged list */ + ListEntry = &ExpSmallNPagedPoolLookasideLists[i]; + InitializeSListHead(&ListEntry->L.ListHead); + + /* Bind to PRCB */ + Entry = &KeGetCurrentPrcb()->PPPagedLookasideList[i]; + Entry->L = &ListEntry->L; + Entry->P = &ListEntry->L; + + /* Initialize the paged list */ + PagedListEntry = &ExpSmallPagedPoolLookasideLists[i]; + InitializeSListHead(&PagedListEntry->L.ListHead); + + /* Bind to PRCB */ + Entry = &KeGetCurrentPrcb()->PPNPagedLookasideList[i]; + Entry->L = &PagedListEntry->L; + Entry->P = &PagedListEntry->L; + } +} VOID INIT_FUNCTION STDCALL Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Sun Oct 1 22:01:38 2006 @@ -76,7 +76,10 @@ VOID NTAPI -ExpInitializeExecutive(VOID); +ExpInitializeExecutive( + IN ULONG Cpu, + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); VOID NTAPI @@ -109,6 +112,10 @@ VOID NTAPI ExpResourceInitialization(VOID); + +VOID +NTAPI +ExInitPoolLookasidePointers(VOID); /* Rundown Functions ********************************************************/ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Sun Oct 1 22:01:38 2006 @@ -310,8 +310,8 @@ C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, SavedExceptionStack) == TF_SAVED_EXCEPTION_STACK); C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS); C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); -C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); -C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); +//C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); +//C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); C_ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR); C_ASSERT(FIELD_OFFSET(KPCR, Irql) == KPCR_IRQL); Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Sun Oct 1 22:01:38 2006 @@ -41,6 +41,7 @@ /* NT Loader Data */ LOADER_PARAMETER_BLOCK BldrLoaderBlock; +LOADER_PARAMETER_EXTENSION BldrExtensionBlock; CHAR BldrCommandLine[256]; LDR_DATA_TABLE_ENTRY BldrModules[64]; MEMORY_ALLOCATION_DESCRIPTOR BldrMemoryDescriptors[64]; @@ -241,6 +242,12 @@ /* Setup command line */ LoaderBlock->LoadOptions = BldrCommandLine; strcpy(BldrCommandLine, KeLoaderCommandLine); + + /* Setup the extension block */ + LoaderBlock->Extension = &BldrExtensionBlock; + LoaderBlock->Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); + LoaderBlock->Extension->MajorVersion = 5; + LoaderBlock->Extension->MinorVersion = 2; } VOID Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 22:01:38 2006 @@ -189,7 +189,7 @@ Prcb->IdleThread = InitThread; /* Initialize the Kernel Executive */ - ExpInitializeExecutive(); + ExpInitializeExecutive(Number, LoaderBlock); /* Only do this on the boot CPU */ if (!Number)

1 0

[ion] 24345: - Implement static compile-time assertions and use them for structure field checks. Thanks to Thomas and KJK.
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Sun Oct 1 19:52:10 2006 New Revision: 24345 URL: http://svn.reactos.org/svn/reactos?rev=24345&view=rev Log: - Implement static compile-time assertions and use them for structure field checks. Thanks to Thomas and KJK. Modified: trunk/reactos/include/psdk/ntdef.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h (original) +++ trunk/reactos/include/psdk/ntdef.h Sun Oct 1 19:52:10 2006 @@ -106,4 +106,7 @@ #define MAXUCHAR 0xff #define MAXUSHORT 0xffff #define MAXULONG 0xffffffff + +#define C_ASSERT(e) extern char __C_ASSERT__[(e)?1:-1] + #endif /* _NTDEF_H */ Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=243… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sun Oct 1 19:52:10 2006 @@ -249,44 +249,6 @@ __inline VOID STDCALL -ExecuteRuntimeAsserts(VOID) -{ - /* - * Fail at runtime if someone has changed various structures without - * updating the offsets used for the assembler code. - */ - ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, SystemCall) == 0x300); - ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK); - ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB); - ASSERT(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK); - ASSERT(FIELD_OFFSET(KTHREAD, NpxState) == KTHREAD_NPX_STATE); - ASSERT(FIELD_OFFSET(KTHREAD, ServiceTable) == KTHREAD_SERVICE_TABLE); - ASSERT(FIELD_OFFSET(KTHREAD, PreviousMode) == KTHREAD_PREVIOUS_MODE); - ASSERT(FIELD_OFFSET(KTHREAD, TrapFrame) == KTHREAD_TRAP_FRAME); - ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK); - ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); - ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); - ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET); - ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0); - ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, SavedExceptionStack) == TF_SAVED_EXCEPTION_STACK); - ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS); - ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); - ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); - ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); - ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); - ASSERT(KeGetPcr()->IRR == 0); - ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR); - ASSERT(FIELD_OFFSET(KPCR, Irql) == KPCR_IRQL); - ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); - ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); - ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); - ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); - ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); -} - -__inline -VOID -STDCALL ParseAndCacheLoadedModules(VOID) { ULONG i; @@ -524,9 +486,6 @@ NTAPI ExpInitializeExecutive(VOID) { - /* Check if the structures match the ASM offset constants */ - ExecuteRuntimeAsserts(); - /* Initialize HAL */ HalInitSystem (0, KeLoaderBlock); Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Sun Oct 1 19:52:10 2006 @@ -294,4 +294,31 @@ #endif +C_ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, SystemCall) == 0x300); +C_ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK); +C_ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB); +C_ASSERT(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK); +C_ASSERT(FIELD_OFFSET(KTHREAD, NpxState) == KTHREAD_NPX_STATE); +C_ASSERT(FIELD_OFFSET(KTHREAD, ServiceTable) == KTHREAD_SERVICE_TABLE); +C_ASSERT(FIELD_OFFSET(KTHREAD, PreviousMode) == KTHREAD_PREVIOUS_MODE); +C_ASSERT(FIELD_OFFSET(KTHREAD, TrapFrame) == KTHREAD_TRAP_FRAME); +C_ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK); +C_ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); +C_ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); +C_ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET); +C_ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0); +C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, SavedExceptionStack) == TF_SAVED_EXCEPTION_STACK); +C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS); +C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); +C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); +C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); +C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); +C_ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR); +C_ASSERT(FIELD_OFFSET(KPCR, Irql) == KPCR_IRQL); +C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); +C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); +C_ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); +C_ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); +C_ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); + #endif /* INCLUDE_INTERNAL_NTOSKRNL_H */

1 0

[ion] 24344: - Use __readfsdword instead of de-referencing the Boot PCR, which is not queried for Application CPUs. (And put the Goto back where it was). Thanks to Thomas Weidenmueller for noticing.
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Sun Oct 1 19:22:42 2006 New Revision: 24344 URL: http://svn.reactos.org/svn/reactos?rev=24344&view=rev Log: - Use __readfsdword instead of de-referencing the Boot PCR, which is not queried for Application CPUs. (And put the Goto back where it was). Thanks to Thomas Weidenmueller for noticing. Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Sun Oct 1 19:22:42 2006 @@ -311,12 +311,11 @@ /* Initialize the machine type */ KiInitializeMachineType(); + /* Skip initial setup if this isn't the Boot CPU */ + if (Cpu) goto AppCpuInit; + /* Get GDT, IDT, PCR and TSS pointers */ KiGetMachineBootPointers(&Gdt, &Idt, &Pcr, &Tss); - - /* Skip initial setup if this isn't the Boot CPU */ - if (Cpu) - goto AppCpuInit; /* Setup the TSS descriptors and entries */ Ki386InitializeTss(Tss, Idt, Gdt); @@ -361,7 +360,7 @@ HalInitializeProcessor(Cpu, KeLoaderBlock); /* Set active processors */ - KeActiveProcessors |= Pcr->SetMember; + KeActiveProcessors |= __readfsdword(KPCR_SET_MEMBER); KeNumberProcessors++; /* Check if this is the boot CPU */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2006