Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 24416: - Guard some current cmlib includes against new cm branch - Remove NTSYSAPI from NtBuildNumber definition in NDK.
by ion＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: ion Date: Fri Oct 6 03:01:38 2006 New Revision: 24416 URL: http://svn.reactos.org/svn/reactos?rev=24416&view=rev Log: - Guard some current cmlib includes against new cm branch - Remove NTSYSAPI from NtBuildNumber definition in NDK. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Fri Oct 6 03:01:38 2006 @@ -63,7 +63,7 @@ // // Exported NT Build Number // -extern ULONG NTSYSAPI NtBuildNumber; +extern ULONG NtBuildNumber; // // Invalid Handle Value Constant Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=244… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h (original) +++ trunk/reactos/lib/cmlib/cmdata.h Fri Oct 6 03:01:38 2006 @@ -17,6 +17,8 @@ #define REG_HASH_TABLE_CELL_ID 0x666c #define REG_VALUE_CELL_ID 0x6b76 #define REG_SECURITY_CELL_ID 0x6b73 + +#ifndef _CM_ #include <pshpack1.h> @@ -147,4 +149,6 @@ #include <poppack.h> +#endif + #endif /* CMLIB_CMDATA_H */ Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2441… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Fri Oct 6 03:01:38 2006 @@ -64,7 +64,7 @@ { ULONG_PTR Bin; ULONG_PTR Block; - PCM_VIEW_OF_FILE CmHive; + struct _CM_VIEW_OF_FILE *CmHive; ULONG MemAlloc; } HMAP_ENTRY, *PHMAP_ENTRY; @@ -118,6 +118,7 @@ DUAL Storage[HvMaxStorageType]; } HHIVE, *PHHIVE; +#ifndef _CM_ typedef struct _EREGISTRY_HIVE { HHIVE Hive; @@ -129,6 +130,7 @@ HANDLE HiveHandle; HANDLE LogHandle; } EREGISTRY_HIVE, *PEREGISTRY_HIVE; +#endif /* * Public functions.

1 0

[ion] 24415: - Fix pushlock calls that were passing the pushlock directly, isntead of a pointer to it. - Half-plement CmpFlushEntireRegistry. - Fix implementation of CmpAllocateDelayItem.
by ion＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: ion Date: Fri Oct 6 02:59:58 2006 New Revision: 24415 URL: http://svn.reactos.org/svn/reactos?rev=24415&view=rev Log: - Fix pushlock calls that were passing the pushlock directly, isntead of a pointer to it. - Half-plement CmpFlushEntireRegistry. - Fix implementation of CmpAllocateDelayItem. Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Fri Oct 6 02:59:58 2006 @@ -1,11 +1,11 @@ /* -* PROJECT: ReactOS Kernel -* LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/cm/cm.h -* PURPOSE: Internal header for the Configuration Manager -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ - + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/cm/cm.h + * PURPOSE: Internal header for the Configuration Manager + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ +#define _CM_ #include "cmlib.h" // @@ -611,11 +611,21 @@ ); // +// Flush Routines +// +BOOLEAN +NTAPI +CmpFlushEntireRegistry( + IN BOOLEAN ForceFlush +); + +// // Global variables accessible from all of Cm // extern BOOLEAN CmpSpecialBootCondition; extern BOOLEAN CmpFlushOnLockRelease; - +extern EX_PUSH_LOCK CmpHiveListHeadLock; +extern LIST_ENTRY CmpHiveListHead; // // Inlined functions Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h Fri Oct 6 02:59:58 2006 @@ -64,7 +64,7 @@ // #define CmpAcquireKcbLockExclusive(k) \ { \ - ExAcquirePushLockExclusive(GET_HASH_ENTRY(CmpCacheTable, \ + ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpCacheTable, \ (k)->ConvKey).Lock); \ GET_HASH_ENTRY(CmpCacheTable, \ (k)->ConvKey).Owner = KeGetCurrentThread(); \ @@ -76,8 +76,8 @@ #define CmpReleaseKcbLock(k) \ { \ GET_HASH_ENTRY(CmpCacheTable, (k)->ConvKey).Owner = NULL; \ - ExReleasePushLock(GET_HASH_ENTRY(CmpCacheTable, \ - (k)->ConvKey).Lock); \ + ExReleasePushLock(&GET_HASH_ENTRY(CmpCacheTable, \ + (k)->ConvKey).Lock); \ } // @@ -85,7 +85,7 @@ // #define CmpAcquireNcbLockExclusive(n) \ { \ - ExAcquirePushLockExclusive(GET_HASH_ENTRY(CmpNameCacheTable, \ + ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpNameCacheTable, \ (n)->ConvKey).Lock); \ } @@ -94,6 +94,6 @@ // #define CmpReleaseNcbLock(k) \ { \ - ExReleasePushLock(GET_HASH_ENTRY(CmpNameCacheTable, \ + ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ (k)->ConvKey).Lock); \ } Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmapi.c Fri Oct 6 02:59:58 2006 @@ -12,4 +12,34 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ + +BOOLEAN CmpNoWrite; +BOOLEAN CmpForceForceFlush; + /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +CmpFlushEntireRegistry(IN BOOLEAN ForceFlush) +{ + BOOLEAN Flushed = TRUE; + + /* Make sure that the registry isn't read-only now */ + if (CmpNoWrite) return TRUE; + + /* Otherwise, acquire the hive list lock and disable force flush */ + CmpForceForceFlush = FALSE; + ExAcquirePushLockShared(&CmpHiveListHeadLock); + + /* Check if the hive list isn't empty */ + if (!IsListEmpty(&CmpHiveListHead)) + { + /* FIXME: TODO */ + ASSERT(FALSE); + } + + /* Release the lock and return the flush state */ + ExReleasePushLock(&CmpHiveListHeadLock); + return Flushed; +} Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Fri Oct 6 02:59:58 2006 @@ -211,8 +211,8 @@ { /* Convert the lock */ ASSERT(CmpIsKcbLockedExclusive(Kcb) == FALSE); - if (ExConvertPushLockSharedToExclusive(GET_HASH_ENTRY(CmpCacheTable, - Kcb->ConvKey).Lock)) + if (ExConvertPushLockSharedToExclusive(&GET_HASH_ENTRY(CmpCacheTable, + Kcb->ConvKey).Lock)) { /* Set the lock owner */ GET_HASH_ENTRY(CmpCacheTable, Kcb->ConvKey).Owner = KeGetCurrentThread(); Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Fri Oct 6 02:59:58 2006 @@ -50,7 +50,6 @@ return ExIsResourceAcquiredExclusiveLite(&CmpRegistryLock); } -// FIXME: THIS FUNCTION IS PARTIALLY FUCKED PVOID NTAPI CmpAllocateDelayItem(VOID) @@ -63,45 +62,63 @@ /* Lock the allocation buckets */ KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); - if (TRUE) + while (TRUE) { - /* Allocate an allocation page */ - AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); - if (AllocPage) + /* Get the current entry in the list */ + NextEntry = CmpFreeDelayItemsListHead.Flink; + + /* Check if we need to allocate an entry */ + if (((NextEntry) && (CmpFreeDelayItemsListHead.Blink) && + IsListEmpty(&CmpFreeDelayItemsListHead)) || + (!(NextEntry) && !(CmpFreeDelayItemsListHead.Blink))) { - /* Set default entries */ - AllocPage->FreeCount = CM_DELAYS_PER_PAGE; + /* Allocate an allocation page */ + AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + if (AllocPage) + { + /* Set default entries */ + AllocPage->FreeCount = CM_DELAYS_PER_PAGE; - /* Loop each entry */ - for (i = 0; i < CM_DELAYS_PER_PAGE; i++) + /* Loop each entry */ + for (i = 0; i < CM_DELAYS_PER_PAGE; i++) + { + /* Get this entry and link it */ + Entry = (PCM_DELAYED_CLOSE_ENTRY)(&AllocPage[i]); + InsertHeadList(&Entry->DelayedLRUList, + &CmpFreeDelayItemsListHead); + + /* Clear the KCB pointer */ + Entry->KeyControlBlock = NULL; + } + } + else { - /* Get this entry and link it */ - Entry = (PCM_DELAYED_CLOSE_ENTRY)(&AllocPage[i]); - InsertHeadList(&Entry->DelayedLRUList, - &CmpFreeDelayItemsListHead); + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return NULL; } } + } - /* Get the entry and the alloc page */ - Entry = CONTAINING_RECORD(NextEntry, - CM_DELAYED_CLOSE_ENTRY, - DelayedLRUList); - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + /* Set the next item in the list */ + CmpFreeDelayItemsListHead.Flink = NextEntry->Flink; + NextEntry->Flink->Blink = &CmpFreeDelayItemsListHead; + NextEntry->Blink = NULL; - /* Decrease free entries */ - ASSERT(AllocPage->FreeCount != 0); - AllocPage->FreeCount--; + /* Get the entry and the alloc page */ + Entry = CONTAINING_RECORD(NextEntry, + CM_DELAYED_CLOSE_ENTRY, + DelayedLRUList); + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return Entry; - } + /* Decrease free entries */ + ASSERT(AllocPage->FreeCount != 0); + AllocPage->FreeCount--; /* Release the lock */ KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); return Entry; } - VOID NTAPI

1 0

[ion] 24414: - Remove SMSS's code for signaling the "init" event. - Make ExpInitNls responsible for NLS initialization in Phase 0 as well, to clean up the code in ExpInitailizeExecutive a bit. - Initialize the system time/clock in Phase 1, not in Phase 0. - Do HAL Phase1 initialization as the first step in Phase 1 initialization, then initialize the system clock (since the HAL's RTC is now configured). - Do Ob Phase 1 init in Phase 1 initialization, not in phase 0. - Do Ke Phase 1 init after HAL
by ion＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: ion Date: Thu Oct 5 20:38:58 2006 New Revision: 24414 URL: http://svn.reactos.org/svn/reactos?rev=24414&view=rev Log: - Remove SMSS's code for signaling the "init" event. - Make ExpInitNls responsible for NLS initialization in Phase 0 as well, to clean up the code in ExpInitailizeExecutive a bit. - Initialize the system time/clock in Phase 1, not in Phase 0. - Do HAL Phase1 initialization as the first step in Phase 1 initialization, then initialize the system clock (since the HAL's RTC is now configured). - Do Ob Phase 1 init in Phase 1 initialization, not in phase 0. - Do Ke Phase 1 init after HAL, Ob and Ex phase 1 inits. - Initialize NLS for Phase 1 after Ke Phase 1, instead of much later. Modified: trunk/reactos/base/system/smss/init.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/krnlinit.c Modified: trunk/reactos/base/system/smss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/init.c?re… ============================================================================== --- trunk/reactos/base/system/smss/init.c (original) +++ trunk/reactos/base/system/smss/init.c Thu Oct 5 20:38:58 2006 @@ -31,43 +31,6 @@ /* FUNCTIONS ****************************************************************/ -static NTSTATUS -SmpSignalInitEvent(VOID) -{ - NTSTATUS Status = STATUS_SUCCESS; - OBJECT_ATTRIBUTES ObjectAttributes = {0}; - UNICODE_STRING EventName ={0}; - HANDLE ReactOSInitEvent = (HANDLE) 0; - - RtlInitUnicodeString (& EventName, L"\\ReactOSInitDone"); - InitializeObjectAttributes(&ObjectAttributes, - & EventName, - 0, - 0, - NULL); - Status = NtOpenEvent(&ReactOSInitEvent, - EVENT_ALL_ACCESS, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - LARGE_INTEGER Timeout; - /* This will cause the boot screen image to go away (if displayed) */ - NtPulseEvent(ReactOSInitEvent, NULL); - - /* Wait for the display mode to be changed (if in graphics mode) */ - Timeout.QuadPart = -50000000LL; /* 5 second timeout */ - NtWaitForSingleObject(ReactOSInitEvent, FALSE, &Timeout); - - NtClose(ReactOSInitEvent); - } - else - { - /* We don't really care if this fails */ - DPRINT1("SM: Failed to open ReactOS init notification event\n"); - } - return Status; -} - typedef NTSTATUS (* SM_INIT_ROUTINE)(VOID); struct { @@ -88,8 +51,7 @@ {TRUE, SmInitializeRegistry, "initialize the registry"}, {FALSE, SmUpdateEnvironment, "update environment variables"}, {TRUE, SmInitializeClientManagement, "initialize client management"}, - {TRUE, SmLoadSubsystems, "load subsystems"}, - {FALSE, SmpSignalInitEvent, "open ReactOS init notification event"}, + {TRUE, SmLoadSubsystems, "load subsystems"} }; NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Oct 5 20:38:58 2006 @@ -48,7 +48,7 @@ VOID NTAPI -ExpInitNls(VOID) +ExpInitNls(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { LARGE_INTEGER SectionSize; NTSTATUS Status; @@ -56,6 +56,61 @@ PVOID SectionBase = NULL; ULONG ViewSize = 0; LARGE_INTEGER SectionOffset = {{0}}; + PLIST_ENTRY ListHead, NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + + /* Check if this is boot-time phase 0 initialization */ + if (!ExpInitializationPhase) + { + /* Loop the memory descriptors */ + ListHead = &LoaderBlock->MemoryDescriptorListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the current block */ + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* Check if this is an NLS block */ + if (MdBlock->MemoryType == LoaderNlsData) + { + /* Increase the table size */ + ExpNlsTableSize += MdBlock->PageCount * PAGE_SIZE; + } + + /* Go to the next block */ + NextEntry = MdBlock->ListEntry.Flink; + } + + /* + * In NT, the memory blocks are contiguous, but in ReactOS they aren't, + * so unless someone fixes FreeLdr, we'll have to use this icky hack. + */ + ExpNlsTableSize += 2 * PAGE_SIZE; // BIAS FOR FREELDR. HACK! + + /* Allocate the a new buffer since loader memory will be freed */ + ExpNlsTableBase = ExAllocatePoolWithTag(NonPagedPool, + ExpNlsTableSize, + TAG('R', 't', 'l', 'i')); + if (!ExpNlsTableBase) KeBugCheck(PHASE0_INITIALIZATION_FAILED); + + /* Copy the codepage data in its new location. */ + RtlMoveMemory(ExpNlsTableBase, + LoaderBlock->NlsData->AnsiCodePageData, + ExpNlsTableSize); + + /* Initialize and reset the NLS TAbles */ + RtlInitNlsTables((PVOID)((ULONG_PTR)ExpNlsTableBase + + ExpAnsiCodePageDataOffset), + (PVOID)((ULONG_PTR)ExpNlsTableBase + + ExpOemCodePageDataOffset), + (PVOID)((ULONG_PTR)ExpNlsTableBase + + ExpUnicodeCaseTableDataOffset), + &ExpNlsTableInfo); + RtlResetRtlTranslations(&ExpNlsTableInfo); + return; + } /* Set the section size */ SectionSize.QuadPart = ExpNlsTableSize; @@ -619,8 +674,6 @@ CHAR Buffer[256]; ANSI_STRING AnsiPath; NTSTATUS Status; - PLIST_ENTRY NextEntry, ListHead; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; /* Validate Loader */ if (!ExpIsLoaderValid(LoaderBlock)) @@ -731,9 +784,6 @@ /* Setup bugcheck messages */ KiInitializeBugCheck(); - /* Setup system time */ - KiInitializeSystemClock(); - /* Initialize the executive at phase 0 */ if (!ExInitSystem()) KEBUGCHECK(PHASE0_INITIALIZATION_FAILED); @@ -744,53 +794,8 @@ SharedUserData->Reserved1 = (ULONG_PTR)MmHighestUserAddress; SharedUserData->Reserved3 = (ULONG_PTR)MmSystemRangeStart; - /* Loop the memory descriptors */ - ListHead = &LoaderBlock->MemoryDescriptorListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) - { - /* Get the current block */ - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Check if this is an NLS block */ - if (MdBlock->MemoryType == LoaderNlsData) - { - /* Increase the table size */ - ExpNlsTableSize += MdBlock->PageCount * PAGE_SIZE; - } - - /* Go to the next block */ - NextEntry = MdBlock->ListEntry.Flink; - } - - /* - * In NT, the memory blocks are contiguous, but in ReactOS they are not, - * so unless someone fixes FreeLdr, we'll have to use this icky hack. - */ - ExpNlsTableSize += 2 * PAGE_SIZE; // BIAS FOR FREELDR. HACK! - - /* Allocate the NLS buffer in the pool since loader memory will be freed */ - ExpNlsTableBase = ExAllocatePoolWithTag(NonPagedPool, - ExpNlsTableSize, - TAG('R', 't', 'l', 'i')); - if (!ExpNlsTableBase) KeBugCheck(PHASE0_INITIALIZATION_FAILED); - - /* Copy the codepage data in its new location. */ - RtlMoveMemory(ExpNlsTableBase, - LoaderBlock->NlsData->AnsiCodePageData, - ExpNlsTableSize); - - /* Initialize and reset the NLS TAbles */ - RtlInitNlsTables((PVOID)((ULONG_PTR)ExpNlsTableBase + - ExpAnsiCodePageDataOffset), - (PVOID)((ULONG_PTR)ExpNlsTableBase + - ExpOemCodePageDataOffset), - (PVOID)((ULONG_PTR)ExpNlsTableBase + - ExpUnicodeCaseTableDataOffset), - &ExpNlsTableInfo); - RtlResetRtlTranslations(&ExpNlsTableInfo); + /* Make a copy of the NLS Tables */ + ExpInitNls(LoaderBlock); /* Initialize the Handle Table */ ExpInitializeHandleTables(); @@ -822,9 +827,6 @@ /* Set up Region Maps, Sections and the Paging File */ MmInit2(); - - /* Call OB initialization again */ - if (!ObInit()) KEBUGCHECK(OBJECT_INITIALIZATION_FAILED); /* Initialize the Process Manager */ if (!PsInitSystem()) KEBUGCHECK(PROCESS_INITIALIZATION_FAILED); @@ -864,17 +866,26 @@ /* Set us at maximum priority */ KeSetPriorityThread(KeGetCurrentThread(), HIGH_PRIORITY); - /* Initialize the later stages of the kernel */ - KeInitSystem(); + /* Do Phase 1 HAL Initialization */ + HalInitSystem(1, KeLoaderBlock); + + /* Setup system time */ + KiInitializeSystemClock(); /* Initialize all processors */ HalAllProcessorsStarted(); - /* Do Phase 1 HAL Initialization */ - HalInitSystem(1, KeLoaderBlock); + /* Call OB initialization again */ + if (!ObInit()) KEBUGCHECK(OBJECT1_INITIALIZATION_FAILED); /* Initialize Basic System Objects and Worker Threads */ - ExInitSystem(); + if (!ExInitSystem()) KEBUGCHECK(PHASE1_INITIALIZATION_FAILED); + + /* Initialize the later stages of the kernel */ + if (!KeInitSystem()) KEBUGCHECK(PHASE1_INITIALIZATION_FAILED); + + /* Create NLS section */ + ExpInitNls(KeLoaderBlock); /* Call KD Providers at Phase 1 */ KdInitSystem(1, KeLoaderBlock); @@ -888,7 +899,7 @@ /* Initialize the Registry (Hives are NOT yet loaded!) */ CmInitializeRegistry(); - /* Unmap Low memory, initialize the Page Zeroing and the Balancer Thread */ + /* Unmap Low memory, and initialize the MPW and Balancer Thread */ MmInit3(); /* Initialize Cache Views */ @@ -911,9 +922,6 @@ /* Call KD Providers at Phase 2 */ KdInitSystem(2, KeLoaderBlock); - - /* Create NLS section */ - ExpInitNls(); /* Initialize LPC */ LpcpInitSystem(); 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 Thu Oct 5 20:38:58 2006 @@ -626,7 +626,7 @@ /* INITIALIZATION FUNCTIONS *************************************************/ -VOID +BOOLEAN NTAPI KeInitSystem(VOID); Modified: trunk/reactos/ntoskrnl/ke/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/krnlinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/krnlinit.c (original) +++ trunk/reactos/ntoskrnl/ke/krnlinit.c Thu Oct 5 20:38:58 2006 @@ -273,7 +273,7 @@ } } -VOID +BOOLEAN NTAPI KeInitSystem(VOID) { @@ -286,5 +286,6 @@ /* Initialize non-portable parts of the kernel */ KiInitMachineDependent(); -} - + return TRUE; +} +

1 0

[ion] 24413: - Get rid of the completely convoluted way that Phase 1 initialization was being ended, with umpteen events and waits and timeouts all synchronized from user-mode and do a simple 5-second wait to determine if smss started OK or not. - Promote the Phase 1 initialization thread by jumping directly into the zero-page thread, and remove manual zero-page thread initialization code since we simply jump into its main routine. - 100 less lines of code :)
by ion＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: ion Date: Thu Oct 5 20:14:28 2006 New Revision: 24413 URL: http://svn.reactos.org/svn/reactos?rev=24413&view=rev Log: - Get rid of the completely convoluted way that Phase 1 initialization was being ended, with umpteen events and waits and timeouts all synchronized from user-mode and do a simple 5-second wait to determine if smss started OK or not. - Promote the Phase 1 initialization thread by jumping directly into the zero-page thread, and remove manual zero-page thread initialization code since we simply jump into its main routine. - 100 less lines of code :) Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Oct 5 20:14:28 2006 @@ -853,9 +853,6 @@ NTAPI ExPhase2Init(PVOID Context) { - UNICODE_STRING EventName; - HANDLE InitDoneEventHandle; - OBJECT_ATTRIBUTES ObjectAttributes; LARGE_INTEGER Timeout; HANDLE ProcessHandle; HANDLE ThreadHandle; @@ -949,113 +946,37 @@ /* Initialize shared user page. Set dos system path, dos device map, etc. */ InitSystemSharedUserPage(KeLoaderBlock); - /* Create 'ReactOSInitDone' event */ - RtlInitUnicodeString(&EventName, L"\\ReactOSInitDone"); - InitializeObjectAttributes(&ObjectAttributes, - &EventName, - 0, - NULL, - NULL); - Status = ZwCreateEvent(&InitDoneEventHandle, - EVENT_ALL_ACCESS, - &ObjectAttributes, - SynchronizationEvent, - FALSE); - - /* Check for Success */ - if (!NT_SUCCESS(Status)) { - - DPRINT1("Failed to create 'ReactOSInitDone' event (Status 0x%x)\n", Status); - InitDoneEventHandle = INVALID_HANDLE_VALUE; - } - /* Launch initial process */ Status = ExpLoadInitialProcess(&ProcessHandle, &ThreadHandle); - /* Check for success, Bugcheck if we failed */ - if (!NT_SUCCESS(Status)) { - - KEBUGCHECKEX(SESSION4_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - /* Wait on the Completion Event */ - if (InitDoneEventHandle != INVALID_HANDLE_VALUE) { - - HANDLE Handles[2]; /* Init event, Initial process */ - - /* Setup the Handles to wait on */ - Handles[0] = InitDoneEventHandle; - Handles[1] = ProcessHandle; - - /* Wait for the system to be initialized */ - Timeout.QuadPart = (LONGLONG)-1200000000; /* 120 second timeout */ - Status = ZwWaitForMultipleObjects(2, - Handles, - WaitAny, - FALSE, - &Timeout); - if (!NT_SUCCESS(Status)) { - - DPRINT1("NtWaitForMultipleObjects failed with status 0x%x!\n", Status); - - } else if (Status == STATUS_TIMEOUT) { - - DPRINT1("WARNING: System not initialized after 120 seconds.\n"); - - } else if (Status == STATUS_WAIT_0 + 1) { - - /* Crash the system if the initial process was terminated. */ - KEBUGCHECKEX(SESSION5_INITIALIZATION_FAILED, Status, 0, 0, 0); - } + /* Wait 5 seconds for it to initialize */ + Timeout.QuadPart = Int32x32To64(5, -10000000); + Status = ZwWaitForSingleObject(ProcessHandle, FALSE, &Timeout); + if (Status == STATUS_SUCCESS) + { + /* Bugcheck the system if SMSS couldn't initialize */ + KeBugCheck(SESSION5_INITIALIZATION_FAILED); + } + else + { + /* Close process handles */ + ZwClose(ThreadHandle); + ZwClose(ProcessHandle); /* - * FIXME: FILIP! - * Disable the Boot Logo - */ + * FIXME: FILIP! + * Disable the Boot Logo + */ if (!NoGuiBoot) InbvEnableBootDriver(FALSE); - /* Signal the Event and close the handle */ - ZwSetEvent(InitDoneEventHandle, NULL); - ZwClose(InitDoneEventHandle); - - } else { - - /* On failure to create 'ReactOSInitDone' event, go to text mode ASAP */ - if (!NoGuiBoot) InbvEnableBootDriver(FALSE); - - /* Crash the system if the initial process terminates within 5 seconds. */ - Timeout.QuadPart = (LONGLONG)-50000000; /* 5 second timeout */ - Status = ZwWaitForSingleObject(ProcessHandle, - FALSE, - &Timeout); - - /* Check for timeout, crash if the initial process didn't initalize */ - if (Status != STATUS_TIMEOUT) KEBUGCHECKEX(SESSION5_INITIALIZATION_FAILED, Status, 1, 0, 0); - } - - /* Enable the Clock, close remaining handles */ - ZwClose(ThreadHandle); - ZwClose(ProcessHandle); - - DPRINT1("System initialization complete\n"); - { - /* FIXME: We should instead jump to zero-page thread */ - /* Free initial kernel memory */ - MiFreeInitMemory(); - - /* Set our priority to 0 */ - KeGetCurrentThread()->BasePriority = 0; - KeSetPriorityThread(KeGetCurrentThread(), 0); - - /* Wait ad-infinitum */ - for (;;) - { - LARGE_INTEGER Timeout; - Timeout.QuadPart = 0x7fffffffffffffffLL; - KeDelayExecutionThread(KernelMode, FALSE, &Timeout); - } - } -} - + /* FIXME: We should free the initial process' memory!*/ + + /* Increase init phase */ + ExpInitializationPhase += 1; + + /* Jump into zero page thread */ + MmZeroPageThreadMain(NULL); + } +} /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Oct 5 20:14:28 2006 @@ -974,7 +974,9 @@ NTSTATUS NTAPI -MmInitZeroPageThread(VOID); +MmZeroPageThreadMain( + PVOID Context +); /* i386/page.c *********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Oct 5 20:14:28 2006 @@ -17,7 +17,6 @@ #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageList) -#pragma alloc_text(INIT, MmInitZeroPageThread) #endif @@ -62,8 +61,6 @@ static LIST_ENTRY FreeUnzeroedPageListHead; static LIST_ENTRY BiosPageListHead; -static PETHREAD ZeroPageThread; -static CLIENT_ID ZeroPageThreadId; static KEVENT ZeroPageThreadEvent; static BOOLEAN ZeroPageThreadShouldTerminate = FALSE; @@ -1139,7 +1136,8 @@ return NumberOfPagesFound; } -VOID STDCALL +NTSTATUS +NTAPI MmZeroPageThreadMain(PVOID Ignored) { NTSTATUS Status; @@ -1148,6 +1146,13 @@ PPHYSICAL_PAGE PageDescriptor; PFN_TYPE Pfn; ULONG Count; + + /* Free initial kernel memory */ + MiFreeInitMemory(); + + /* Set our priority to 0 */ + KeGetCurrentThread()->BasePriority = 0; + KeSetPriorityThread(KeGetCurrentThread(), 0); while(1) { @@ -1160,13 +1165,12 @@ { DbgPrint("ZeroPageThread: Wait failed\n"); KEBUGCHECK(0); - return; } if (ZeroPageThreadShouldTerminate) { DbgPrint("ZeroPageThread: Terminating\n"); - return; + return STATUS_SUCCESS; } Count = 0; KeAcquireSpinLock(&PageListLock, &oldIrql); @@ -1201,46 +1205,11 @@ } } - DPRINT("Zeroed %d pages.\n", Count); + DPRINT1("Zeroed %d pages.\n", Count); KeResetEvent(&ZeroPageThreadEvent); KeReleaseSpinLock(&PageListLock, oldIrql); } -} - -NTSTATUS -INIT_FUNCTION -NTAPI -MmInitZeroPageThread(VOID) -{ - NTSTATUS Status; - HANDLE ThreadHandle; - - ZeroPageThreadShouldTerminate = FALSE; - Status = PsCreateSystemThread(&ThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &ZeroPageThreadId, - MmZeroPageThreadMain, - NULL); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_ALL_ACCESS, - PsThreadType, - KernelMode, - (PVOID*)&ZeroPageThread, - NULL); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(0); - } - - KeSetPriorityThread(&ZeroPageThread->Tcb, LOW_PRIORITY); - NtClose(ThreadHandle); + return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Oct 5 20:14:28 2006 @@ -455,7 +455,6 @@ MmDeletePageTable(NULL, 0); #endif - MmInitZeroPageThread(); MmCreatePhysicalMemorySection(); MiInitBalancerThread();

1 0

[ion] 24412: - Put all Phase 1 Ex* Initialization in ExpInitSystemPhase1 and clean up associated deprecated calls. - Call ExpInitializePushLocks since we weren't doing this before.
by ion＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: ion Date: Thu Oct 5 19:13:59 2006 New Revision: 24412 URL: http://svn.reactos.org/svn/reactos?rev=24412&view=rev Log: - Put all Phase 1 Ex* Initialization in ExpInitSystemPhase1 and clean up associated deprecated calls. - Call ExpInitializePushLocks since we weren't doing this before. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Oct 5 19:13:59 2006 @@ -327,10 +327,10 @@ } -INIT_FUNCTION NTSTATUS -ExpLoadInitialProcess(PHANDLE ProcessHandle, - PHANDLE ThreadHandle) +NTAPI +ExpLoadInitialProcess(IN PHANDLE ProcessHandle, + IN PHANDLE ThreadHandle) { PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; NTSTATUS Status; @@ -469,21 +469,6 @@ return STATUS_SUCCESS; } -VOID -NTAPI -ExInit3(VOID) -{ - ExpInitializeEventImplementation(); - ExpInitializeEventPairImplementation(); - ExpInitializeMutantImplementation(); - ExpInitializeSemaphoreImplementation(); - ExpInitializeTimerImplementation(); - LpcpInitSystem(); - ExpInitializeProfileImplementation(); - ExpWin32kInit(); - ExpInitUuids(); -} - ULONG NTAPI ExComputeTickCountMultiplier(IN ULONG ClockIncrement) @@ -542,8 +527,37 @@ NTAPI ExpInitSystemPhase1(VOID) { - /* Not yet done */ - return FALSE; + /* Initialize worker threads */ + ExpInitializeWorkerThreads(); + + /* Initialize pushlocks */ + ExpInitializePushLocks(); + + /* Initialize events and event pairs */ + ExpInitializeEventImplementation(); + ExpInitializeEventPairImplementation(); + + /* Initialize callbacks */ + ExpInitializeCallbacks(); + + /* Initialize mutants */ + ExpInitializeMutantImplementation(); + + /* Initialize semaphores */ + ExpInitializeSemaphoreImplementation(); + + /* Initialize timers */ + ExpInitializeTimerImplementation(); + + /* Initialize profiling */ + ExpInitializeProfileImplementation(); + + /* Initialize UUIDs */ + ExpInitUuids(); + + /* Initialize Win32K */ + ExpWin32kInit(); + return TRUE; } BOOLEAN @@ -847,6 +861,9 @@ HANDLE ThreadHandle; NTSTATUS Status; + /* Set to phase 1 */ + ExpInitializationPhase = 1; + /* Set us at maximum priority */ KeSetPriorityThread(KeGetCurrentThread(), HIGH_PRIORITY); @@ -860,13 +877,7 @@ HalInitSystem(1, KeLoaderBlock); /* Initialize Basic System Objects and Worker Threads */ - ExInit3(); - - /* initialize the worker threads */ - ExpInitializeWorkerThreads(); - - /* initialize callbacks */ - ExpInitializeCallbacks(); + ExInitSystem(); /* Call KD Providers at Phase 1 */ KdInitSystem(1, KeLoaderBlock); @@ -906,6 +917,9 @@ /* Create NLS section */ ExpInitNls(); + + /* Initialize LPC */ + LpcpInitSystem(); /* Import and Load Registry Hives */ CmInitHives(ExpInTextModeSetup); 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 Thu Oct 5 19:13:59 2006 @@ -63,6 +63,10 @@ VOID NTAPI +ExpInitializePushLocks(VOID); + +VOID +NTAPI ExpInitTimeZoneInfo(VOID); VOID

1 0

[ion] 24411: - Rewrite ExpLoadInitialProcess by inlining and simplifying what the call to RtlCreateProcsesParameters should do, and also create our own custom environment with the same arguments that NT's smss gets. - This optimizes booting as well as gets use the differnet SESSIONY_INITIALIZATION_FAILED, where Y is a number representing which step of the process parameter/envieonment creation failed.
by ion＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: ion Date: Thu Oct 5 18:49:20 2006 New Revision: 24411 URL: http://svn.reactos.org/svn/reactos?rev=24411&view=rev Log: - Rewrite ExpLoadInitialProcess by inlining and simplifying what the call to RtlCreateProcsesParameters should do, and also create our own custom environment with the same arguments that NT's smss gets. - This optimizes booting as well as gets use the differnet SESSIONY_INITIALIZATION_FAILED, where Y is a number representing which step of the process parameter/envieonment creation failed. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Oct 5 18:49:20 2006 @@ -332,60 +332,140 @@ ExpLoadInitialProcess(PHANDLE ProcessHandle, PHANDLE ThreadHandle) { - UNICODE_STRING CurrentDirectory; - UNICODE_STRING ImagePath = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\smss.exe"); + PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; NTSTATUS Status; - PRTL_USER_PROCESS_PARAMETERS Params=NULL; - RTL_USER_PROCESS_INFORMATION Info; - - RtlInitUnicodeString(&CurrentDirectory, - SharedUserData->NtSystemRoot); - - /* Create the Parameters */ - Status = RtlCreateProcessParameters(&Params, - &ImagePath, - NULL, - &CurrentDirectory, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL); - if(!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create ppb!\n"); - return Status; - } - - DPRINT("Creating process\n"); - Status = RtlCreateUserProcess(&ImagePath, + ULONG Size; + RTL_USER_PROCESS_INFORMATION ProcessInformation; + PWSTR p; + UNICODE_STRING NullString = RTL_CONSTANT_STRING(L""); + UNICODE_STRING SmssName, Environment, SystemDriveString; + + /* Allocate memory for the process parameters */ + Size = sizeof(RTL_USER_PROCESS_PARAMETERS) + + ((MAX_PATH * 4) * sizeof(WCHAR)); + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + (PVOID)&ProcessParameters, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + KeBugCheckEx(SESSION1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* Setup the basic header, and give the process the low 1MB to itself */ + ProcessParameters->Length = Size; + ProcessParameters->MaximumLength = Size; + ProcessParameters->Flags = RTL_USER_PROCESS_PARAMETERS_NORMALIZED | + RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB; + + /* Allocate a page for the environment */ + Size = PAGE_SIZE; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + (PVOID)&ProcessParameters->Environment, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE + ); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + KeBugCheckEx(SESSION2_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* Make a buffer for the DOS path */ + p = (PWSTR)(ProcessParameters + 1); + ProcessParameters->CurrentDirectory.DosPath.Buffer = p; + ProcessParameters-> + CurrentDirectory.DosPath.MaximumLength = MAX_PATH * sizeof(WCHAR); + + /* Copy the DOS path */ + RtlCopyUnicodeString(&ProcessParameters->CurrentDirectory.DosPath, + &NtSystemRoot); + + /* Make a buffer for the DLL Path */ + p = (PWSTR)((PCHAR)ProcessParameters->CurrentDirectory.DosPath.Buffer + + ProcessParameters->CurrentDirectory.DosPath.MaximumLength); + ProcessParameters->DllPath.Buffer = p; + ProcessParameters->DllPath.MaximumLength = MAX_PATH * sizeof(WCHAR); + + /* Copy the DLL path and append the system32 directory */ + RtlCopyUnicodeString(&ProcessParameters->DllPath, + &ProcessParameters->CurrentDirectory.DosPath); + RtlAppendUnicodeToString(&ProcessParameters->DllPath, L"\\System32"); + + /* Make a buffer for the image name */ + p = (PWSTR)((PCHAR)ProcessParameters->DllPath.Buffer + + ProcessParameters->DllPath.MaximumLength); + ProcessParameters->ImagePathName.Buffer = p; + ProcessParameters->ImagePathName.MaximumLength = MAX_PATH * sizeof(WCHAR); + + /* Append the system path and session manager name */ + RtlAppendUnicodeToString(&ProcessParameters->ImagePathName, + L"\\SystemRoot\\System32"); + RtlAppendUnicodeToString(&ProcessParameters->ImagePathName, + L"\\smss.exe"); + + /* Create the environment string */ + RtlInitEmptyUnicodeString(&Environment, + ProcessParameters->Environment, + Size); + + /* Append the DLL path to it */ + RtlAppendUnicodeToString(&Environment, L"Path=" ); + RtlAppendUnicodeStringToString(&Environment, &ProcessParameters->DllPath); + RtlAppendUnicodeStringToString(&Environment, &NullString ); + + /* Create the system drive string */ + SystemDriveString = NtSystemRoot; + SystemDriveString.Length = 2 * sizeof(WCHAR); + + /* Append it to the environment */ + RtlAppendUnicodeToString(&Environment, L"SystemDrive="); + RtlAppendUnicodeStringToString(&Environment, &SystemDriveString); + RtlAppendUnicodeStringToString(&Environment, &NullString); + + /* Append the system root to the environment */ + RtlAppendUnicodeToString(&Environment, L"SystemRoot="); + RtlAppendUnicodeStringToString(&Environment, &NtSystemRoot); + RtlAppendUnicodeStringToString(&Environment, &NullString); + + /* Get and set the command line equal to the image path */ + ProcessParameters->CommandLine = ProcessParameters->ImagePathName; + SmssName = ProcessParameters->ImagePathName; + + /* Create SMSS process */ + Status = RtlCreateUserProcess(&SmssName, OBJ_CASE_INSENSITIVE, - Params, + RtlDeNormalizeProcessParams( + ProcessParameters), NULL, NULL, NULL, FALSE, NULL, NULL, - &Info); - - /* Close the handle and free the params */ - RtlDestroyProcessParameters(Params); - + &ProcessInformation); if (!NT_SUCCESS(Status)) { - DPRINT1("NtCreateProcess() failed (Status %lx)\n", Status); - return(Status); - } - - /* Start it up */ - ZwResumeThread(Info.ThreadHandle, NULL); + /* Failed */ + KeBugCheckEx(SESSION3_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* Resume the thread */ + Status = ZwResumeThread(ProcessInformation.ThreadHandle, NULL); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + KeBugCheckEx(SESSION4_INITIALIZATION_FAILED, Status, 0, 0, 0); + } /* Return Handles */ - *ProcessHandle = Info.ProcessHandle; - *ThreadHandle = Info.ThreadHandle; - DPRINT("Process created successfully\n"); + *ProcessHandle = ProcessInformation.ProcessHandle; + *ThreadHandle = ProcessInformation.ThreadHandle; return STATUS_SUCCESS; }

1 0

[fireball] 24410: - Add #ifdef DEBUG / #endif to fix compile. FreeLdr's debug macros needs some improvement in the future...
by fireball＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: fireball Date: Thu Oct 5 13:15:44 2006 New Revision: 24410 URL: http://svn.reactos.org/svn/reactos?rev=24410&view=rev Log: - Add #ifdef DEBUG / #endif to fix compile. FreeLdr's debug macros needs some improvement in the future... Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: 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 (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Thu Oct 5 13:15:44 2006 @@ -491,6 +491,7 @@ DbgPrint((DPRINT_WINDOWS, "Memory Descriptor List prepared, printing PDE\n")); List_PaToVa(&LoaderBlock->MemoryDescriptorListHead); + #if DEBUG { ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000; int j; @@ -509,6 +510,7 @@ DbgPrint((DPRINT_WINDOWS, "\n")); } } + #endif // Enable paging

1 0

[ion] 24409: - Use KeLoaderBlock for registry hive loading. - Get rid of the CACHED_MODULE array and associated structures and stop using them, get rid of ParseAndCacheLoadedModules. Stop using KeLoadedModules and KeLoadedModuleCount outside of freeldr.c. - Except for MmInit1, the kernel should now be totally isolated from FreeLDR-specific data.
by ion＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: ion Date: Thu Oct 5 06:02:27 2006 New Revision: 24409 URL: http://svn.reactos.org/svn/reactos?rev=24409&view=rev Log: - Use KeLoaderBlock for registry hive loading. - Get rid of the CACHED_MODULE array and associated structures and stop using them, get rid of ParseAndCacheLoadedModules. Stop using KeLoadedModules and KeLoadedModuleCount outside of freeldr.c. - Except for MmInit1, the kernel should now be totally isolated from FreeLDR-specific data. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Oct 5 06:02:27 2006 @@ -27,10 +27,9 @@ // Ke: // // - FIXES: -// * Stop using CachedModules. -// * Try to make MmInit1 NTLDR compatible. // * Sanitize some context fields during conversions. // * Figure out why the DPC stack doesn't really work. +// * Try to make MmInit1 NTLDR compatible. // * Add DR macro/save and VM macro/save. // - FEATURES: // * New optimized table-based tick-hashed timer implementation. Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Thu Oct 5 06:02:27 2006 @@ -136,18 +136,48 @@ CmInitHives(BOOLEAN SetupBoot) { PCHAR BaseAddress; + PLIST_ENTRY ListHead, NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock = NULL; /* Load Registry Hives. This one can be missing. */ - if (CachedModules[SystemRegistry]) { - BaseAddress = (PCHAR)CachedModules[SystemRegistry]->ModStart; + BaseAddress = KeLoaderBlock->RegistryBase; + if (BaseAddress) + { CmImportSystemHive(BaseAddress, - CachedModules[SystemRegistry]->ModEnd - (ULONG_PTR)BaseAddress); - } - - BaseAddress = (PCHAR)CachedModules[HardwareRegistry]->ModStart; + KeLoaderBlock->RegistryLength); + } + + /* Loop the memory descriptors */ + ListHead = &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the current block */ + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* Check if this is an registry block */ + if (MdBlock->MemoryType == LoaderRegistryData) + { + /* Check if it's not the SYSTEM hive that we already initialized */ + if ((MdBlock->BasePage) != ((ULONG_PTR)BaseAddress >> PAGE_SHIFT)) + { + /* Hardware hive break out */ + break; + } + } + + /* Go to the next block */ + NextEntry = MdBlock->ListEntry.Flink; + } + + /* We need a hardware hive */ + ASSERT(MdBlock); + + BaseAddress = (PCHAR)(MdBlock->BasePage << PAGE_SHIFT); CmImportHardwareHive(BaseAddress, - CachedModules[HardwareRegistry]->ModEnd - (ULONG_PTR)BaseAddress); - + MdBlock->PageCount << PAGE_SHIFT); /* Create dummy keys if no hardware hive was found */ CmImportHardwareHive (NULL, 0); Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Oct 5 06:02:27 2006 @@ -25,16 +25,13 @@ ULONG NtGlobalFlag; ULONG ExSuiteMask; -extern LOADER_MODULE KeLoaderModules[64]; -extern ULONG KeLoaderModuleCount; -extern ULONG KiServiceLimit; -BOOLEAN NoGuiBoot = FALSE; - /* Init flags and settings */ ULONG ExpInitializationPhase; BOOLEAN ExpInTextModeSetup; BOOLEAN IoRemoteBootClient; ULONG InitSafeBootMode; + +BOOLEAN NoGuiBoot = FALSE; /* NT Boot Path */ UNICODE_STRING NtSystemRoot; @@ -291,52 +288,6 @@ DbgPrint("No system drive found!\n"); KEBUGCHECK (NO_BOOT_DEVICE); - } -} - -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]; - } } } @@ -577,9 +528,6 @@ PLIST_ENTRY NextEntry, ListHead; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - /* FIXME: Deprecate soon */ - ParseAndCacheLoadedModules(); - /* Validate Loader */ if (!ExpIsLoaderValid(LoaderBlock)) { 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 Thu Oct 5 06:02:27 2006 @@ -17,18 +17,6 @@ KPROFILE_SOURCE Source; LIST_ENTRY ListEntry; } KPROFILE_SOURCE_OBJECT, *PKPROFILE_SOURCE_OBJECT; - -/* Cached modules from the loader block */ -typedef enum _CACHED_MODULE_TYPE -{ - AnsiCodepage, - OemCodepage, - UnicodeCasemap, - SystemRegistry, - HardwareRegistry, - MaximumCachedModuleType, -} CACHED_MODULE_TYPE, *PCACHED_MODULE_TYPE; -extern PLOADER_MODULE CachedModules[MaximumCachedModuleType]; typedef enum _CONNECT_TYPE { @@ -122,6 +110,7 @@ extern LARGE_INTEGER KiTimeIncrementReciprocal; extern UCHAR KiTimeIncrementShiftCount; extern ULONG KiTimeLimitIsrMicroseconds; +extern ULONG KiServiceLimit; extern LIST_ENTRY BugcheckCallbackListHead, BugcheckReasonCallbackListHead; extern KSPIN_LOCK BugCheckCallbackLock; extern KDPC KiExpireTimerDpc; 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 Thu Oct 5 06:02:27 2006 @@ -18,7 +18,6 @@ LOADER_MODULE KeLoaderModules[64]; ULONG KeLoaderModuleCount; static CHAR KeLoaderModuleStrings[64][256]; -PLOADER_MODULE CachedModules[MaximumCachedModuleType]; /* FreeLDR Memory Data */ ADDRESS_RANGE KeMemoryMap[64]; @@ -171,10 +170,6 @@ if (!(_stricmp(DriverName, "hardware")) || !(_stricmp(DriverName, "hardware.hiv"))) { - /* Save registry data */ - LoaderBlock->RegistryBase = ModStart; - LoaderBlock->RegistryLength = ModSize; - /* Create an MD for it */ MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderRegistryData;

1 0

[ion] 24408: - Implement ExpInitNls to initialize the NLS Section using the new semantics recently implemented. Works pretty much like the previous code in rtl/nls.c except it uses the new variable names as well as maps a view of the NLS Table into the system process.c - Delete rtl/nls.c and all the associated deprecated code. - Do MmInit1 and SharedUserData stuff *after* initializing the initial thread, to avoid an ASSERT during bootup.
by ion＠svn.reactos.org 05 Oct '06

05 Oct '06

Author: ion Date: Thu Oct 5 05:44:54 2006 New Revision: 24408 URL: http://svn.reactos.org/svn/reactos?rev=24408&view=rev Log: - Implement ExpInitNls to initialize the NLS Section using the new semantics recently implemented. Works pretty much like the previous code in rtl/nls.c except it uses the new variable names as well as maps a view of the NLS Table into the system process.c - Delete rtl/nls.c and all the associated deprecated code. - Do MmInit1 and SharedUserData stuff *after* initializing the initial thread, to avoid an ASSERT during bootup. Removed: trunk/reactos/ntoskrnl/rtl/nls.c Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/rtl.h trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/mm/process.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Oct 5 05:44:54 2006 @@ -45,8 +45,103 @@ ULONG ExpUnicodeCaseTableDataOffset; NLSTABLEINFO ExpNlsTableInfo; ULONG ExpNlsTableSize; +PVOID ExpNlsSectionPointer; /* FUNCTIONS ****************************************************************/ + +VOID +NTAPI +ExpInitNls(VOID) +{ + LARGE_INTEGER SectionSize; + NTSTATUS Status; + HANDLE NlsSection; + PVOID SectionBase = NULL; + ULONG ViewSize = 0; + LARGE_INTEGER SectionOffset = {{0}}; + + /* Set the section size */ + SectionSize.QuadPart = ExpNlsTableSize; + + /* Create the NLS Section */ + Status = ZwCreateSection(&NlsSection, + SECTION_ALL_ACCESS, + NULL, + &SectionSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 1, 0, 0); + } + + /* Get a pointer to the section */ + Status = ObReferenceObjectByHandle(NlsSection, + SECTION_ALL_ACCESS, + MmSectionObjectType, + KernelMode, + &ExpNlsSectionPointer, + NULL); + ZwClose(NlsSection); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 2, 0, 0); + } + + /* Map the NLS Section in system space */ + Status = MmMapViewInSystemSpace(ExpNlsSectionPointer, + &SectionBase, + &ExpNlsTableSize); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 3, 0, 0); + } + + /* Copy the codepage data in its new location. */ + RtlMoveMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize); + + /* Free the previously allocated buffer and set the new location */ + ExFreePool(ExpNlsTableBase); + ExpNlsTableBase = SectionBase; + + /* Initialize the NLS Tables */ + RtlInitNlsTables((PVOID)((ULONG_PTR)ExpNlsTableBase + + ExpAnsiCodePageDataOffset), + (PVOID)((ULONG_PTR)ExpNlsTableBase + + ExpOemCodePageDataOffset), + (PVOID)((ULONG_PTR)ExpNlsTableBase + + ExpUnicodeCaseTableDataOffset), + &ExpNlsTableInfo); + RtlResetRtlTranslations(&ExpNlsTableInfo); + + /* Reset the base to 0 */ + SectionBase = NULL; + + /* Map the section in the system process */ + Status = MmMapViewOfSection(ExpNlsSectionPointer, + PsGetCurrentProcess(), + &SectionBase, + 0L, + 0L, + &SectionOffset, + &ViewSize, + ViewShare, + 0L, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 5, 0, 0); + } + + /* Copy the table into the system process and set this as the base */ + RtlMoveMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize); + ExpNlsTableBase = SectionBase; +} static VOID @@ -781,8 +876,8 @@ /* Call KD Providers at Phase 2 */ KdInitSystem(2, KeLoaderBlock); - /* Import and create NLS Data and Sections */ - RtlpInitNls(); + /* Create NLS section */ + ExpInitNls(); /* Import and Load Registry Hives */ CmInitHives(ExpInTextModeSetup); 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 Thu Oct 5 05:44:54 2006 @@ -14,6 +14,9 @@ extern FAST_MUTEX ExpEnvironmentLock; extern ERESOURCE ExpFirmwareTableResource; extern LIST_ENTRY ExpFirmwareTableProviderListHead; +ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; +ULONG ExpUnicodeCaseTableDataOffset; +PVOID ExpNlsSectionPointer; #define MAX_FAST_REFS 7 Modified: trunk/reactos/ntoskrnl/include/internal/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/rtl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/rtl.h Thu Oct 5 05:44:54 2006 @@ -1,47 +1,5 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_NLS_H #define __NTOSKRNL_INCLUDE_INTERNAL_NLS_H - -extern PVOID NlsSectionObject; - -extern ULONG NlsAnsiTableOffset; -extern ULONG NlsOemTableOffset; -extern ULONG NlsUnicodeTableOffset; - -extern PUSHORT NlsUnicodeUpcaseTable; -extern PUSHORT NlsUnicodeLowercaseTable; - -VOID -NTAPI -RtlpInitNls(VOID); - -VOID -NTAPI -RtlpImportAnsiCodePage( - PUSHORT TableBase, - ULONG Size -); - -VOID -NTAPI -RtlpImportOemCodePage( - PUSHORT TableBase, - ULONG Size -); - -VOID -NTAPI -RtlpImportUnicodeCasemap( - PUSHORT TableBase, - ULONG Size -); - -VOID -NTAPI -RtlpCreateInitialNlsTables(VOID); - -VOID -NTAPI -RtlpCreateNlsSection(VOID); NTSTATUS NTAPI 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 Thu Oct 5 05:44:54 2006 @@ -407,34 +407,6 @@ 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(); - - /* Set the NX Support policy */ - SharedUserData->NXSupportPolicy = NXSupportPolicy; - - /* Set basic CPU Features that user mode can read */ - SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = - (KeFeatureBits & KF_MMX); - SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = - (KeFeatureBits & KF_CMPXCHG8B); - SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = - ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI)); - SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = - ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI64)); - SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - (KeFeatureBits & KF_3DNOW); - SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = - (KeFeatureBits & KF_RDTSC); - /* Setup the Idle Thread */ KeInitializeThread(InitProcess, InitThread, @@ -454,6 +426,34 @@ /* HACK for MmUpdatePageDir */ ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess; + /* 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(); + + /* Set the NX Support policy */ + SharedUserData->NXSupportPolicy = NXSupportPolicy; + + /* Set basic CPU Features that user mode can read */ + SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = + (KeFeatureBits & KF_MMX); + SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = + (KeFeatureBits & KF_CMPXCHG8B); + SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = + ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI)); + SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = + ((KeFeatureBits & KF_FXSR) && (KeFeatureBits & KF_XMMI64)); + SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = + (KeFeatureBits & KF_3DNOW); + SharedUserData->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = + (KeFeatureBits & KF_RDTSC); + /* Set up the thread-related fields in the PRCB */ Prcb->CurrentThread = InitThread; Prcb->NextThread = NULL; Modified: trunk/reactos/ntoskrnl/mm/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/process.c (original) +++ trunk/reactos/ntoskrnl/mm/process.c Thu Oct 5 05:44:54 2006 @@ -291,7 +291,7 @@ /* Map NLS Tables */ DPRINT("Mapping NLS\n"); - Status = MmMapViewOfSection(NlsSectionObject, + Status = MmMapViewOfSection(ExpNlsSectionPointer, (PEPROCESS)Process, &TableBase, 0, @@ -322,9 +322,9 @@ Peb->Mutant = NULL; /* NLS */ - Peb->AnsiCodePageData = (char*)TableBase + NlsAnsiTableOffset; - Peb->OemCodePageData = (char*)TableBase + NlsOemTableOffset; - Peb->UnicodeCaseTableData = (char*)TableBase + NlsUnicodeTableOffset; + Peb->AnsiCodePageData = (PCHAR)TableBase + ExpAnsiCodePageDataOffset; + Peb->OemCodePageData = (PCHAR)TableBase + ExpOemCodePageDataOffset; + Peb->UnicodeCaseTableData = (PCHAR)TableBase + ExpUnicodeCaseTableDataOffset; /* Default Version Data (could get changed below) */ Peb->OSMajorVersion = NtMajorVersion; Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Oct 5 05:44:54 2006 @@ -315,7 +315,6 @@ </if> <file>libsupp.c</file> <file>misc.c</file> - <file>nls.c</file> <file>regio.c</file> <file>strtok.c</file> </directory> Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Thu Oct 5 05:44:54 2006 @@ -197,9 +197,6 @@ PKTHREAD Thread = KeGetCurrentThread(); /* FIXME: Super native implementation */ - - /* FIXME: ROS HACK */ - if (!Thread) return FALSE; /* Start with defaults */ *StackBegin = Thread->StackLimit; Removed: trunk/reactos/ntoskrnl/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/nls.c?rev=244… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/nls.c (original) +++ trunk/reactos/ntoskrnl/rtl/nls.c (removed) @@ -1,178 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/rtl/nls.c - * PURPOSE: Bitmap functions - * - * PROGRAMMERS: Eric Kohl - */ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, RtlpInitNls) -#pragma alloc_text(INIT, RtlpImportAnsiCodePage) -#pragma alloc_text(INIT, RtlpImportOemCodePage) -#pragma alloc_text(INIT, RtlpImportUnicodeCasemap) -#pragma alloc_text(INIT, RtlpCreateInitialNlsTables) -#pragma alloc_text(INIT, RtlpCreateNlsSection) -#endif - - -/* GLOBALS *******************************************************************/ - - -static PUSHORT NlsAnsiCodePageTable = NULL; -static ULONG NlsAnsiCodePageTableSize = 0; - -static PUSHORT NlsOemCodePageTable = NULL; -static ULONG NlsOemCodePageTableSize = 0; - -static PUSHORT NlsUnicodeCasemapTable = NULL; -static ULONG NlsUnicodeCasemapTableSize = 0; - -PVOID NlsSectionObject = NULL; -static PVOID NlsSectionBase = NULL; -static ULONG NlsSectionViewSize = 0; - -ULONG NlsAnsiTableOffset = 0; -ULONG NlsOemTableOffset = 0; -ULONG NlsUnicodeTableOffset = 0; - - -/* FUNCTIONS *****************************************************************/ - -VOID -INIT_FUNCTION -STDCALL -RtlpInitNls(VOID) -{ - ULONG_PTR BaseAddress; - - /* Import NLS Data */ - BaseAddress = CachedModules[AnsiCodepage]->ModStart; - RtlpImportAnsiCodePage((PUSHORT)BaseAddress, - CachedModules[AnsiCodepage]->ModEnd - BaseAddress); - - BaseAddress = CachedModules[OemCodepage]->ModStart; - RtlpImportOemCodePage((PUSHORT)BaseAddress, - CachedModules[OemCodepage]->ModEnd - BaseAddress); - - BaseAddress = CachedModules[UnicodeCasemap]->ModStart; - RtlpImportUnicodeCasemap((PUSHORT)BaseAddress, - CachedModules[UnicodeCasemap]->ModEnd - BaseAddress); - - /* Create the NLS section */ - RtlpCreateNlsSection(); -} - -VOID -INIT_FUNCTION -NTAPI -RtlpImportAnsiCodePage(PUSHORT TableBase, - ULONG Size) -{ - NlsAnsiCodePageTable = TableBase; - NlsAnsiCodePageTableSize = Size; -} - - -VOID -INIT_FUNCTION -NTAPI -RtlpImportOemCodePage(PUSHORT TableBase, - ULONG Size) -{ - NlsOemCodePageTable = TableBase; - NlsOemCodePageTableSize = Size; -} - - -VOID -NTAPI -INIT_FUNCTION -RtlpImportUnicodeCasemap(PUSHORT TableBase, - ULONG Size) -{ - NlsUnicodeCasemapTable = TableBase; - NlsUnicodeCasemapTableSize = Size; -} - -VOID -NTAPI -INIT_FUNCTION -RtlpCreateNlsSection(VOID) -{ - NLSTABLEINFO NlsTable; - LARGE_INTEGER SectionSize; - NTSTATUS Status; - - DPRINT("RtlpCreateNlsSection() called\n"); - - NlsSectionViewSize = ROUND_UP(NlsAnsiCodePageTableSize, PAGE_SIZE) + - ROUND_UP(NlsOemCodePageTableSize, PAGE_SIZE) + - ROUND_UP(NlsUnicodeCasemapTableSize, PAGE_SIZE); - - DPRINT("NlsSectionViewSize %lx\n", NlsSectionViewSize); - - SectionSize.QuadPart = (LONGLONG)NlsSectionViewSize; - Status = MmCreateSection(&NlsSectionObject, - SECTION_ALL_ACCESS, - NULL, - &SectionSize, - PAGE_READWRITE, - SEC_COMMIT, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmCreateSection() failed\n"); - KEBUGCHECKEX(0x32, Status, 1, 1, 0); - } - Status = ObInsertObject(NlsSectionObject, - NULL, - SECTION_ALL_ACCESS, - 0, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(NlsSectionObject); - } - Status = MmMapViewInSystemSpace(NlsSectionObject, - &NlsSectionBase, - &NlsSectionViewSize); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmMapViewInSystemSpace() failed\n"); - KEBUGCHECKEX(0x32, Status, 1, 3, 0); - } - - DPRINT("NlsSection: Base %p Size %lx\n", - NlsSectionBase, - NlsSectionViewSize); - - NlsAnsiTableOffset = 0; - RtlCopyMemory((PVOID)((ULONG)NlsSectionBase + NlsAnsiTableOffset), - NlsAnsiCodePageTable, - NlsAnsiCodePageTableSize); - - NlsOemTableOffset = NlsAnsiTableOffset + ROUND_UP(NlsAnsiCodePageTableSize, PAGE_SIZE); - RtlCopyMemory((PVOID)((ULONG)NlsSectionBase + NlsOemTableOffset), - NlsOemCodePageTable, - NlsOemCodePageTableSize); - - NlsUnicodeTableOffset = NlsOemTableOffset + ROUND_UP(NlsOemCodePageTableSize, PAGE_SIZE); - RtlCopyMemory((PVOID)((ULONG)NlsSectionBase + NlsUnicodeTableOffset), - NlsUnicodeCasemapTable, - NlsUnicodeCasemapTableSize); - - RtlInitNlsTables ((PVOID)((ULONG)NlsSectionBase + NlsAnsiTableOffset), - (PVOID)((ULONG)NlsSectionBase + NlsOemTableOffset), - (PVOID)((ULONG)NlsSectionBase + NlsUnicodeTableOffset), - &NlsTable); - - RtlResetRtlTranslations (&NlsTable); -}

1 0

[gedmurphy] 24407: add a few more icons to the device imagelist
by gedmurphy＠svn.reactos.org 04 Oct '06

04 Oct '06

Author: gedmurphy Date: Thu Oct 5 02:29:18 2006 New Revision: 24407 URL: http://svn.reactos.org/svn/reactos?rev=24407&view=rev Log: add a few more icons to the device imagelist Modified: trunk/reactos/dll/win32/setupapi/res/icons/10.ico trunk/reactos/dll/win32/setupapi/res/icons/20.ico trunk/reactos/dll/win32/setupapi/res/icons/28.ico trunk/reactos/dll/win32/setupapi/res/icons/501.ico Modified: trunk/reactos/dll/win32/setupapi/res/icons/10.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/20.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/28.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/setupapi/res/icons/501.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/ico… ============================================================================== Binary files - no diff available.

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