Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[hyperion] 24343: Fixed: - _InterlockedCompareExchange64 (more efficient handling of 64-bit operands) - __writecr0, __writecr3, __writecr4 (for real this time)
by hyperion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: hyperion Date: Sun Oct 1 18:49:07 2006 New Revision: 24343 URL: http://svn.reactos.org/svn/reactos?rev=24343&view=rev Log: Fixed: - _InterlockedCompareExchange64 (more efficient handling of 64-bit operands) - __writecr0, __writecr3, __writecr4 (for real this time) Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Sun Oct 1 18:49:07 2006 @@ -210,38 +210,35 @@ static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const Destination, const long long Exchange, const long long Comperand) { - /* TODO: this form of passing long long values makes GCC generate inefficient code. Use what's used elsewhere */ - union - { - long long ll; - struct + unsigned long lo32Retval = (unsigned long)((Comperand >> 0) & 0xFFFFFFFF); + long hi32Retval = (unsigned long)((Comperand >> 32) & 0xFFFFFFFF); + + unsigned long lo32Exchange = (unsigned long)((Exchange >> 0) & 0xFFFFFFFF); + long hi32Exchange = (unsigned long)((Exchange >> 32) & 0xFFFFFFFF); + + __asm__ + ( + "cmpxchg8b %[Destination]" : + "a" (lo32Retval), "d" (hi32Retval) : + [Destination] "rm" (Destination), "b" (lo32Exchange), "c" (hi32Exchange) : + "memory" + ); + + { + union u_ { - unsigned long lo32; - long hi32; - }; - } - LlRetval = { ll : Comperand }; - - union - { - long long ll; - struct - { - unsigned long lo32; - long hi32; - }; - } - LlExchange = { ll : Exchange }; - - __asm__ - ( - "cmpxchg8b %[Destination]" : - "a" (LlRetval.lo32), "d" (LlRetval.hi32) : - [Destination] "rm" (Destination), "b" (LlExchange.lo32), "c" (LlExchange.hi32) : - "memory" - ); - - return LlRetval.ll; + long long ll; + struct s_ + { + unsigned long lo32; + long hi32; + } + s; + } + u = { s : { lo32 : lo32Retval, hi32 : hi32Retval } }; + + return u.ll; + } } static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) @@ -468,7 +465,7 @@ /*** String operations ***/ -/* NOTE: we don't set a memory barrier in the __stosX functions because Visual C++ doesn't */ +/* NOTE: we don't set a memory clobber in the __stosX functions because Visual C++ doesn't */ static __inline__ __attribute__((always_inline)) void __stosb(unsigned char * Dest, const unsigned char Data, size_t Count) { __asm__ __volatile__ @@ -1006,17 +1003,17 @@ static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) { - __asm__("mov %%cr0, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %[Data], %%cr0" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) { - __asm__("mov %%cr3, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %[Data], %%cr3" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) { - __asm__("mov %%cr4, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %[Data], %%cr4" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __invlpg(void * const Address)

1 0

[weiden] 24342: Fix usage of a uninitialized variable, unnecessary goto not replaced by a if(...) statement
by weiden＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: weiden Date: Sun Oct 1 18:02:08 2006 New Revision: 24342 URL: http://svn.reactos.org/svn/reactos?rev=24342&view=rev Log: Fix usage of a uninitialized variable, unnecessary goto not replaced by a if(...) statement 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 18:02:08 2006 @@ -311,11 +311,12 @@ /* 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); @@ -347,8 +348,8 @@ do { /* Loop until execution can continue */ - while (KiFreezeExecutionLock == 1); - } while(InterlockedBitTestAndSet(&KiFreezeExecutionLock, 0)); + while ((volatile KSPIN_LOCK)KiFreezeExecutionLock == 1); + } while(InterlockedBitTestAndSet((PLONG)&KiFreezeExecutionLock, 0)); /* Setup CPU-related fields */ __writefsdword(KPCR_NUMBER, Cpu);

1 0

[weiden] 24341: fix __writecr0, __writecr3 and __writecr4
by weiden＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: weiden Date: Sun Oct 1 16:33:24 2006 New Revision: 24341 URL: http://svn.reactos.org/svn/reactos?rev=24341&view=rev Log: fix __writecr0, __writecr3 and __writecr4 Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Sun Oct 1 16:33:24 2006 @@ -1006,17 +1006,17 @@ static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) { - __asm__("mov %[value], %%cr0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %%cr0, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) { - __asm__("mov %[value], %%cr3" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %%cr3, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) { - __asm__("mov %[value], %%cr4" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); + __asm__("mov %%cr4, %0" : : "q" ((const unsigned long)(Data & 0xFFFFFFFF))); } static __inline__ __attribute__((always_inline)) void __invlpg(void * const Address)

1 0

[weiden] 24340: Fix function name (fixes a redefinition error)
by weiden＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: weiden Date: Sun Oct 1 16:19:36 2006 New Revision: 24340 URL: http://svn.reactos.org/svn/reactos?rev=24340&view=rev Log: Fix function name (fixes a redefinition error) Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Sun Oct 1 16:19:36 2006 @@ -145,7 +145,7 @@ return __sync_fetch_and_and(value, mask); } -static __inline__ __attribute__((always_inline)) short _InterlockedOr16(volatile short * const value, const short mask) +static __inline__ __attribute__((always_inline)) short _InterlockedAnd16(volatile short * const value, const short mask) { return __sync_fetch_and_and(value, mask); }

1 0

[hpoussin] 24339: Add ufatx.dll, to be able to create FATX (Xbox file system) partitions
by hpoussin＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: hpoussin Date: Sun Oct 1 14:11:46 2006 New Revision: 24339 URL: http://svn.reactos.org/svn/reactos?rev=24339&view=rev Log: Add ufatx.dll, to be able to create FATX (Xbox file system) partitions Added: trunk/reactos/dll/win32/ufatx/ trunk/reactos/dll/win32/ufatx/ufatx.def (with props) trunk/reactos/dll/win32/ufatx/ufatx.rbuild (with props) trunk/reactos/dll/win32/ufatx/ufatx.rc (with props) Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Sun Oct 1 14:11:46 2006 @@ -737,6 +737,7 @@ ; Available file systems HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FAT",0x00000000,"ufat.dll" HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FAT32",0x00000000,"ufat.dll" +HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" Added: trunk/reactos/dll/win32/ufatx/ufatx.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.def?… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.def (added) +++ trunk/reactos/dll/win32/ufatx/ufatx.def Sun Oct 1 14:11:46 2006 @@ -1,0 +1,3 @@ +LIBRARY UFATX.DLL +EXPORTS +FormatEx=VfatxFormat@24 Propchange: trunk/reactos/dll/win32/ufatx/ufatx.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ufatx/ufatx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.rbui… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.rbuild (added) +++ trunk/reactos/dll/win32/ufatx/ufatx.rbuild Sun Oct 1 14:11:46 2006 @@ -1,0 +1,10 @@ +<module name="ufatx" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_UFAT}" installbase="system32" installname="ufatx.dll"> + <importlibrary definition="ufatx.def" /> + <include base="ufatx">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0600</define> + <library>vfatxlib</library> + <library>ntdll</library> + <file>ufatx.rc</file> +</module> Propchange: trunk/reactos/dll/win32/ufatx/ufatx.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ufatx/ufatx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.rc?r… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.rc (added) +++ trunk/reactos/dll/win32/ufatx/ufatx.rc Sun Oct 1 14:11:46 2006 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "FATX File System Management\0" +#define REACTOS_STR_INTERNAL_NAME "ufatx\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ufatx.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/ufatx/ufatx.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Sun Oct 1 14:11:46 2006 @@ -229,6 +229,9 @@ <directory name="ufat"> <xi:include href="ufat/ufat.rbuild" /> </directory> +<directory name="ufatx"> + <xi:include href="ufatx/ufatx.rbuild" /> +</directory> <directory name="urlmon"> <xi:include href="urlmon/urlmon.rbuild" /> </directory>

1 0

[hpoussin] 24338: Rewrite SetupDiGetClassImageListExW and SetupDiGetClassImageIndex which were completly wrong Add stub for SetupDiDestroyClassImageList Now, you can see some icons in device manager
by hpoussin＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: hpoussin Date: Sun Oct 1 13:05:19 2006 New Revision: 24338 URL: http://svn.reactos.org/svn/reactos?rev=24338&view=rev Log: Rewrite SetupDiGetClassImageListExW and SetupDiGetClassImageIndex which were completly wrong Add stub for SetupDiDestroyClassImageList Now, you can see some icons in device manager Modified: trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Sun Oct 1 13:05:19 2006 @@ -670,6 +670,38 @@ } /*********************************************************************** + * SetupDiDestroyClassImageList(SETUPAPI.@) + */ +BOOL WINAPI +SetupDiDestroyClassImageList( + IN PSP_CLASSIMAGELIST_DATA ClassImageListData) +{ + struct ClassImageList *list; + BOOL ret = FALSE; + + TRACE("%p\n", ClassImageListData); + + if (!ClassImageListData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (ClassImageListData->cbSize != sizeof(SP_CLASSIMAGELIST_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if ((list = (struct ClassImageList *)ClassImageListData->Reserved) == NULL) + SetLastError(ERROR_INVALID_USER_BUFFER); + else if (list->magic != SETUP_CLASS_IMAGE_LIST_MAGIC) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + //DestroyIcon() + //ImageList_Destroy(); + FIXME("Stub %p\n", ClassImageListData); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/*********************************************************************** * SetupDiGetClassDescriptionA (SETUPAPI.@) */ BOOL WINAPI @@ -1302,28 +1334,21 @@ SetLastError(ERROR_INVALID_PARAMETER); else { - HKEY hKey = INVALID_HANDLE_VALUE; - INT iconIndex; - - /* Read Icon registry entry into Buffer */ - hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_QUERY_VALUE, DIOCR_INTERFACE, list->MachineName, NULL); - if (hKey == INVALID_HANDLE_VALUE) - goto cleanup; - if (!SETUP_GetIconIndex(hKey, &iconIndex)) - goto cleanup; - - if (iconIndex >= 0) - { - SetLastError(ERROR_INVALID_INDEX); - goto cleanup; - } - - *ImageIndex = -iconIndex; - ret = TRUE; - -cleanup: - if (hKey != INVALID_HANDLE_VALUE) - RegCloseKey(hKey); + DWORD i; + + for (i = 0; i < list->NumberOfGuids; i++) + { + if (IsEqualIID(ClassGuid, &list->Guids[i])) + break; + } + + if (i == list->NumberOfGuids || list->IconIndexes[i] < 0) + SetLastError(ERROR_FILE_NOT_FOUND); + else + { + *ImageIndex = list->IconIndexes[i]; + ret = TRUE; + } } TRACE("Returning %d\n", ret); @@ -1388,11 +1413,24 @@ else { struct ClassImageList *list = NULL; + DWORD RequiredSize; + HICON hIcon; DWORD size; - - size = FIELD_OFFSET(struct ClassImageList, szData); - if (MachineName) - size += (strlenW(MachineName) + 3) * sizeof(WCHAR); + INT i; + + /* Get list of all class GUIDs in given computer */ + ret = SetupDiBuildClassInfoListExW( + 0, + NULL, + 0, + &RequiredSize, + MachineName, + NULL); + if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) + goto cleanup; + + size = sizeof(struct ClassImageList) + + (sizeof(GUID) + sizeof(INT)) * RequiredSize; list = HeapAlloc(GetProcessHeap(), 0, size); if (!list) { @@ -1400,23 +1438,60 @@ goto cleanup; } list->magic = SETUP_CLASS_IMAGE_LIST_MAGIC; - if (MachineName) - { - list->szData[0] = list->szData[1] = '\\'; - strcpyW(list->szData + 2, MachineName); - list->MachineName = list->szData; - } - else - { - list->MachineName = NULL; - } + list->NumberOfGuids = RequiredSize; + list->Guids = (GUID*)(list + 1); + list->IconIndexes = (INT*)((ULONG_PTR)(list + 1) + sizeof(GUID) * RequiredSize); + + ret = SetupDiBuildClassInfoListExW( + 0, + list->Guids, + list->NumberOfGuids, + &RequiredSize, + MachineName, + NULL); + if (!ret) + goto cleanup; + else if (RequiredSize != list->NumberOfGuids) + { + /* Hm. Class list changed since last call. Ignore + * this case as it should be very rare */ + SetLastError(ERROR_GEN_FAILURE); + ret = FALSE; + goto cleanup; + } + + /* Prepare a HIMAGELIST */ + InitCommonControls(); + ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR, 100, 10); + if (!ClassImageListData->ImageList) + goto cleanup; ClassImageListData->Reserved = (ULONG_PTR)list; + + /* Now, we "simply" need to load icons associated with all class guids, + * and put their index in the image list in the IconIndexes array */ + for (i = 0; i < list->NumberOfGuids; i++) + { + ret = SetupDiLoadClassIcon( + &list->Guids[i], + &hIcon, + NULL); + if (ret) + list->IconIndexes[i] = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); + else + list->IconIndexes[i] = -1; /* Special value to tell that icon is unavailable */ + } + ret = TRUE; cleanup: if (!ret) - MyFree(list); + { + if (ClassImageListData->Reserved) + SetupDiDestroyClassImageList(ClassImageListData); + else if (list) + MyFree(list); + } } TRACE("Returning %d\n", ret); Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild Sun Oct 1 13:05:19 2006 @@ -17,6 +17,7 @@ <library>uuid</library> <library>wine</library> <library>ntdll</library> + <library>comctl32</library> <library>kernel32</library> <library>advapi32</library> <library>user32</library> Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Sun Oct 1 13:05:19 2006 @@ -201,13 +201,14 @@ { DWORD magic; /* SETUP_CLASS_IMAGE_LIST_MAGIC */ - /* Contains the name of the remote computer ('\\COMPUTERNAME' for example), - * or NULL if related to local machine. Points into szData field at the - * end of the structure */ - PCWSTR MachineName; - - /* Variable size array (contains data for MachineName) */ - WCHAR szData[ANYSIZE_ARRAY]; + /* Number of GUIDs contained in Guids and IconIndexes arrays */ + DWORD NumberOfGuids; + /* Array of GUIDs associated to icons of the image list. Its size + * is NumberOfGuids and is pointing after the end this structure */ + GUID* Guids; + /* Array of corresponding icons index in the image list. Its size + * is NumberOfGuids and is pointing after the end this structure */ + INT* IconIndexes; }; extern HINSTANCE hInstance; Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c Sun Oct 1 13:05:19 2006 @@ -155,18 +155,6 @@ return TRUE; } - -/*********************************************************************** - * SetupDiDestroyClassImageList(SETUPAPI.@) - */ -BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassImageListData) -{ - FIXME ("Stub %p\n", ClassImageListData); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return TRUE; -} - - /*********************************************************************** * SetupDiRegisterDeviceInfo(SETUPAPI.@) */

1 0

[ion] 24337: - Fix Ki386InitializeTss to use dynamic GDT calculated from KiGetMachineBootPointers instead of static internal address. Now NTLDR boots us all the way to HalInitializeProcessor.
by ion＠svn.reactos.org 01 Oct '06

01 Oct '06

Author: ion Date: Sun Oct 1 11:31:33 2006 New Revision: 24337 URL: http://svn.reactos.org/svn/reactos?rev=24337&view=rev Log: - Fix Ki386InitializeTss to use dynamic GDT calculated from KiGetMachineBootPointers instead of static internal address. Now NTLDR boots us all the way to HalInitializeProcessor. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Sun Oct 1 11:31:33 2006 @@ -61,7 +61,8 @@ FASTCALL Ki386InitializeTss( IN PKTSS Tss, - IN PKIDTENTRY Idt + IN PKIDTENTRY Idt, + IN PKGDTENTRY Gdt ); VOID Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Sun Oct 1 11:31:33 2006 @@ -552,12 +552,13 @@ VOID FASTCALL Ki386InitializeTss(IN PKTSS Tss, - IN PKIDTENTRY Idt) + IN PKIDTENTRY Idt, + IN PKGDTENTRY Gdt) { PKGDTENTRY TssEntry, TaskGateEntry; /* Initialize the boot TSS. */ - TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; + TssEntry = &Gdt[KGDT_TSS / sizeof(KGDTENTRY)]; TssEntry->HighWord.Bits.Type = I386_TSS; TssEntry->HighWord.Bits.Pres = 1; TssEntry->HighWord.Bits.Dpl = 0; @@ -587,7 +588,7 @@ Tss->Ds = KGDT_R3_DATA | RPL_MASK; /* Setup the Double Trap TSS entry in the GDT */ - TssEntry = &KiBootGdt[KGDT_DF_TSS / sizeof(KGDTENTRY)]; + TssEntry = &Gdt[KGDT_DF_TSS / sizeof(KGDTENTRY)]; TssEntry->HighWord.Bits.Type = I386_TSS; TssEntry->HighWord.Bits.Pres = 1; TssEntry->HighWord.Bits.Dpl = 0; @@ -616,7 +617,7 @@ Tss->Ds = KGDT_R3_DATA | RPL_MASK; /* And its associated TSS Entry */ - TssEntry = &KiBootGdt[KGDT_NMI_TSS / sizeof(KGDTENTRY)]; + TssEntry = &Gdt[KGDT_NMI_TSS / sizeof(KGDTENTRY)]; TssEntry->HighWord.Bits.Type = I386_TSS; TssEntry->HighWord.Bits.Pres = 1; TssEntry->HighWord.Bits.Dpl = 0; 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 11:31:33 2006 @@ -318,7 +318,7 @@ KiGetMachineBootPointers(&Gdt, &Idt, &Pcr, &Tss); /* Setup the TSS descriptors and entries */ - Ki386InitializeTss(Tss, Idt); + Ki386InitializeTss(Tss, Idt, Gdt); /* Initialize the PCR */ RtlZeroMemory(Pcr, PAGE_SIZE);

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