Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 35549: Implement KiSetProcessorType, KiGetCpuVendor, KiGetFeatureBits, KiGetCacheInformation, KiSetCr0Bits and KiInitializeTss based on x86 implementation. Fix and enable Code in KiInitalizeKernel, enable call to HalInitializeProcessor.
by tkreuzer＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: tkreuzer Date: Fri Aug 22 21:11:09 2008 New Revision: 35549 URL: http://svn.reactos.org/svn/reactos?rev=35549&view=rev Log: Implement KiSetProcessorType, KiGetCpuVendor, KiGetFeatureBits, KiGetCacheInformation, KiSetCr0Bits and KiInitializeTss based on x86 implementation. Fix and enable Code in KiInitalizeKernel, enable call to HalInitializeProcessor. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Fri Aug 22 21:11:09 2008 @@ -75,7 +75,8 @@ Ki386InitializeTss( IN PKTSS Tss, IN PKIDTENTRY Idt, - IN PKGDTENTRY Gdt + IN PKGDTENTRY Gdt, + IN UINT64 Stack ); VOID KiDivideErrorFault(); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Fri Aug 22 21:11:09 2008 @@ -12,32 +12,475 @@ #define NDEBUG #include <debug.h> +/* FIXME: Local EFLAGS defines not used anywhere else */ +#define EFLAGS_IOPL 0x3000 +#define EFLAGS_NF 0x4000 +#define EFLAGS_RF 0x10000 +#define EFLAGS_ID 0x200000 + /* GLOBALS *******************************************************************/ /* The Boot TSS */ KTSS64 KiBootTss; -/* The TSS to use for Double Fault Traps (INT 0x9) */ -UCHAR KiDoubleFaultTSS[KTSS_IO_MAPS]; - -/* The TSS to use for NMI Fault Traps (INT 0x2) */ -UCHAR KiNMITSS[KTSS_IO_MAPS]; - /* CPU Features and Flags */ +ULONG KeI386CpuType; +ULONG KeI386CpuStep; ULONG KeI386MachineType; - +ULONG KeI386NpxPresent = 1; +ULONG KeI386XMMIPresent = 0; +ULONG KeI386FxsrPresent = 0; CHAR KeNumberProcessors = 0; +BOOLEAN KiI386PentiumLockErrataPresent; +BOOLEAN KiSMTProcessorsPresent; + +/* CPU Signatures */ +static const CHAR CmpIntelID[] = "GenuineIntel"; +static const CHAR CmpAmdID[] = "AuthenticAMD"; +static const CHAR CmpCyrixID[] = "CyrixInstead"; +static const CHAR CmpTransmetaID[] = "GenuineTMx86"; +static const CHAR CmpCentaurID[] = "CentaurHauls"; +static const CHAR CmpRiseID[] = "RiseRiseRise"; /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KiSetProcessorType(VOID) +{ + ULONG64 EFlags; + int Reg[4]; + ULONG Stepping, Type; + + /* Start by assuming no CPUID data */ + KeGetCurrentPrcb()->CpuID = 0; + + /* Save EFlags */ + Ke386SaveFlags(EFlags); + + /* Do CPUID 1 now */ + __cpuid(Reg, 1); + + /* + * Get the Stepping and Type. The stepping contains both the + * Model and the Step, while the Type contains the returned Type. + * We ignore the family. + * + * For the stepping, we convert this: zzzzzzxy into this: x0y + */ + Stepping = Reg[0] & 0xF0; + Stepping <<= 4; + Stepping += (Reg[0] & 0xFF); + Stepping &= 0xF0F; + Type = Reg[0] & 0xF00; + Type >>= 8; + + /* Save them in the PRCB */ + KeGetCurrentPrcb()->CpuID = TRUE; + KeGetCurrentPrcb()->CpuType = (UCHAR)Type; + KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; + + /* Restore EFLAGS */ + Ke386RestoreFlags(EFlags); +} + +ULONG +NTAPI +KiGetCpuVendor(VOID) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + ULONG Vendor[5]; + ULONG Temp; + + /* Assume no Vendor ID and fail if no CPUID Support. */ + Prcb->VendorString[0] = 0; + if (!Prcb->CpuID) return 0; + + /* Get the Vendor ID and null-terminate it */ + __cpuid(Vendor, 0); + Vendor[4] = 0; + + /* Re-arrange vendor string */ + Temp = Vendor[2]; + Vendor[2] = Vendor[3]; + Vendor[3] = Temp; + + /* Copy it to the PRCB and null-terminate it again */ + RtlCopyMemory(Prcb->VendorString, + &Vendor[1], + sizeof(Prcb->VendorString) - sizeof(CHAR)); + Prcb->VendorString[sizeof(Prcb->VendorString) - sizeof(CHAR)] = ANSI_NULL; + + /* Now check the CPU Type */ + if (!strcmp(Prcb->VendorString, CmpIntelID)) + { + return CPU_INTEL; + } + else if (!strcmp(Prcb->VendorString, CmpAmdID)) + { + return CPU_AMD; + } + else if (!strcmp(Prcb->VendorString, CmpCyrixID)) + { + DPRINT1("Cyrix CPUs not fully supported\n"); + return 0; + } + else if (!strcmp(Prcb->VendorString, CmpTransmetaID)) + { + DPRINT1("Transmeta CPUs not fully supported\n"); + return 0; + } + else if (!strcmp(Prcb->VendorString, CmpCentaurID)) + { + DPRINT1("VIA CPUs not fully supported\n"); + return 0; + } + else if (!strcmp(Prcb->VendorString, CmpRiseID)) + { + DPRINT1("Rise CPUs not fully supported\n"); + return 0; + } + + /* Invalid CPU */ + return 0; +} + +ULONG +NTAPI +KiGetFeatureBits(VOID) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + ULONG Vendor; + ULONG FeatureBits = KF_WORKING_PTE; + ULONG Reg[4]; + BOOLEAN ExtendedCPUID = TRUE; + ULONG CpuFeatures = 0; + + /* Get the Vendor ID */ + Vendor = KiGetCpuVendor(); + + /* Make sure we got a valid vendor ID at least. */ + if (!Vendor) return FeatureBits; + + /* Get the CPUID Info. Features are in Reg[3]. */ + __cpuid(Reg, 1); + + /* Set the initial APIC ID */ + Prcb->InitialApicId = (UCHAR)(Reg[1] >> 24); + + /* Check for AMD CPU */ + if (Vendor == CPU_AMD) + { + /* Check if this is a K5 or higher. */ + if ((Reg[0] & 0x0F00) >= 0x0500) + { + /* Check if this is a K5 specifically. */ + if ((Reg[0] & 0x0F00) == 0x0500) + { + /* Get the Model Number */ + switch (Reg[0] & 0x00F0) + { + /* Check if this is the Model 1 */ + case 0x0010: + + /* Check if this is Step 0 or 1. They don't support PGE */ + if ((Reg[0] & 0x000F) > 0x03) break; + + case 0x0000: + + /* Model 0 doesn't support PGE at all. */ + Reg[3] &= ~0x2000; + break; + + case 0x0080: + + /* K6-2, Step 8 and over have support for MTRR. */ + if ((Reg[0] & 0x000F) >= 0x8) FeatureBits |= KF_AMDK6MTRR; + break; + + case 0x0090: + + /* As does the K6-3 */ + FeatureBits |= KF_AMDK6MTRR; + break; + + default: + break; + } + } + } + else + { + /* Families below 5 don't support PGE, PSE or CMOV at all */ + Reg[3] &= ~(0x08 | 0x2000 | 0x8000); + + /* They also don't support advanced CPUID functions. */ + ExtendedCPUID = FALSE; + } + + /* Set the current features */ + CpuFeatures = Reg[3]; + } + + /* Now check if this is Intel */ + if (Vendor == CPU_INTEL) + { + /* Check if it's a P6 */ + if (Prcb->CpuType == 6) + { + /* Perform the special sequence to get the MicroCode Signature */ + __writemsr(0x8B, 0); + __writemsr(Reg, 1); + Prcb->UpdateSignature.QuadPart = __readmsr(0x8B); + } + else if (Prcb->CpuType == 5) + { + /* On P5, enable workaround for the LOCK errata. */ + KiI386PentiumLockErrataPresent = TRUE; + } + + /* Check for broken P6 with bad SMP PTE implementation */ + if (((Reg[0] & 0x0FF0) == 0x0610 && (Reg[0] & 0x000F) <= 0x9) || + ((Reg[0] & 0x0FF0) == 0x0630 && (Reg[0] & 0x000F) <= 0x4)) + { + /* Remove support for correct PTE support. */ + FeatureBits &= ~KF_WORKING_PTE; + } + + /* Check if the CPU is too old to support SYSENTER */ + if ((Prcb->CpuType < 6) || + ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) + { + /* Disable it */ + Reg[3] &= ~0x800; + } + + /* Set the current features */ + CpuFeatures = Reg[3]; + } + + /* Convert all CPUID Feature bits into our format */ + if (CpuFeatures & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4; + if (CpuFeatures & 0x00000008) FeatureBits |= KF_LARGE_PAGE | KF_CR4; + if (CpuFeatures & 0x00000010) FeatureBits |= KF_RDTSC; + if (CpuFeatures & 0x00000100) FeatureBits |= KF_CMPXCHG8B; + if (CpuFeatures & 0x00000800) FeatureBits |= KF_FAST_SYSCALL; + if (CpuFeatures & 0x00001000) FeatureBits |= KF_MTRR; + if (CpuFeatures & 0x00002000) FeatureBits |= KF_GLOBAL_PAGE | KF_CR4; + if (CpuFeatures & 0x00008000) FeatureBits |= KF_CMOV; + if (CpuFeatures & 0x00010000) FeatureBits |= KF_PAT; + if (CpuFeatures & 0x00200000) FeatureBits |= KF_DTS; + if (CpuFeatures & 0x00800000) FeatureBits |= KF_MMX; + if (CpuFeatures & 0x01000000) FeatureBits |= KF_FXSR; + if (CpuFeatures & 0x02000000) FeatureBits |= KF_XMMI; + if (CpuFeatures & 0x04000000) FeatureBits |= KF_XMMI64; + + /* Check if the CPU has hyper-threading */ + if (CpuFeatures & 0x10000000) + { + /* Set the number of logical CPUs */ + Prcb->LogicalProcessorsPerPhysicalProcessor = (UCHAR)(Reg[1] >> 16); + if (Prcb->LogicalProcessorsPerPhysicalProcessor > 1) + { + /* We're on dual-core */ + KiSMTProcessorsPresent = TRUE; + } + } + else + { + /* We only have a single CPU */ + Prcb->LogicalProcessorsPerPhysicalProcessor = 1; + } + + /* Check if CPUID 0x80000000 is supported */ + if (ExtendedCPUID) + { + /* Do the call */ + __cpuid(Reg, 0x80000000); + if ((Reg[0] & 0xffffff00) == 0x80000000) + { + /* Check if CPUID 0x80000001 is supported */ + if (Reg[0] >= 0x80000001) + { + /* Check which extended features are available. */ + __cpuid(Reg, 0x80000001); + + /* Check if NX-bit is supported */ + if (Reg[3] & 0x00100000) FeatureBits |= KF_NX_BIT; + + /* Now handle each features for each CPU Vendor */ + switch (Vendor) + { + case CPU_AMD: + if (Reg[3] & 0x80000000) FeatureBits |= KF_3DNOW; + break; + } + } + } + } + + /* Return the Feature Bits */ + return FeatureBits; +} + +VOID +NTAPI +KiGetCacheInformation(VOID) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + ULONG Vendor; + ULONG Data[4]; + ULONG CacheRequests = 0, i; + ULONG CurrentRegister; + UCHAR RegisterByte; + BOOLEAN FirstPass = TRUE; + + /* Set default L2 size */ + Pcr->SecondLevelCacheSize = 0; + + /* Get the Vendor ID and make sure we support CPUID */ + Vendor = KiGetCpuVendor(); + if (!Vendor) return; + + /* Check the Vendor ID */ + switch (Vendor) + { + /* Handle Intel case */ + case CPU_INTEL: + + /*Check if we support CPUID 2 */ + __cpuid(Data, 0); + if (Data[0] >= 2) + { + /* We need to loop for the number of times CPUID will tell us to */ + do + { + /* Do the CPUID call */ + __cpuid(Data, 2); + + /* Check if it was the first call */ + if (FirstPass) + { + /* + * The number of times to loop is the first byte. Read + * it and then destroy it so we don't get confused. + */ + CacheRequests = Data[0] & 0xFF; + Data[0] &= 0xFFFFFF00; + + /* Don't go over this again */ + FirstPass = FALSE; + } + + /* Loop all 4 registers */ + for (i = 0; i < 4; i++) + { + /* Get the current register */ + CurrentRegister = Data[i]; + + /* + * If the upper bit is set, then this register should + * be skipped. + */ + if (CurrentRegister & 0x80000000) continue; + + /* Keep looping for every byte inside this register */ + while (CurrentRegister) + { + /* Read a byte, skip a byte. */ + RegisterByte = (UCHAR)(CurrentRegister & 0xFF); + CurrentRegister >>= 8; + if (!RegisterByte) continue; + + /* + * Valid values are from 0x40 (0 bytes) to 0x49 + * (32MB), or from 0x80 to 0x89 (same size but + * 8-way associative. + */ + if (((RegisterByte > 0x40) && + (RegisterByte <= 0x49)) || + ((RegisterByte > 0x80) && + (RegisterByte <= 0x89))) + { + /* Mask out only the first nibble */ + RegisterByte &= 0x0F; + + /* Set the L2 Cache Size */ + Pcr->SecondLevelCacheSize = 0x10000 << + RegisterByte; + } + } + } + } while (--CacheRequests); + } + break; + + case CPU_AMD: + + /* Check if we support CPUID 0x80000006 */ + __cpuid(Data, 0x80000000); + if (Data[0] >= 6) + { + /* Get 2nd level cache and tlb size */ + __cpuid(Data, 0x80000006); + + /* Set the L2 Cache Size */ + Pcr->SecondLevelCacheSize = (Data[2] & 0xFFFF0000) >> 6; + } + break; + } +} + + +VOID +NTAPI +KiSetCR0Bits(VOID) +{ + ULONG64 Cr0; + + /* Save current CR0 */ + Cr0 = __readcr0(); + + /* If this is a 486, enable Write-Protection */ + if (KeGetCurrentPrcb()->CpuType > 3) Cr0 |= CR0_WP; + + /* Set new Cr0 */ + __writecr0(Cr0); +} VOID FASTCALL -Ki386InitializeTss(IN PKTSS Tss, +Ki386InitializeTss(IN PKTSS64 Tss, IN PKIDTENTRY Idt, - IN PKGDTENTRY Gdt) -{ - // UNIMPLEMENTED; + IN PKGDTENTRY Gdt, + IN UINT64 Stack) +{ + PKGDTENTRY TssEntry; + + /* Initialize the boot TSS entry */ + TssEntry = &Gdt[KGDT_TSS / sizeof(KGDTENTRY)]; + TssEntry->Bits.Type = I386_TSS; + TssEntry->Bits.Present = 1; + TssEntry->Bits.Dpl = 0; + + /* FIXME: I/O Map */ + + /* Load the task register */ + Ke386SetTr(KGDT_TSS); + + /* Setup stack pointer */ + Tss->Rsp0 = Stack; + + /* Setup a stack for Double Fault Traps */ + Tss->Ist[1] = PtrToUlong(KiDoubleFaultStack); + + /* Setup a stack for CheckAbort Traps */ + Tss->Ist[2] = PtrToUlong(KiDoubleFaultStack); + + /* Setup a stack for NMI Traps */ + Tss->Ist[3] = PtrToUlong(KiDoubleFaultStack); + } VOID Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Fri Aug 22 21:11:09 2008 @@ -374,6 +374,8 @@ Pcr->TssBase = Tss; Pcr->Prcb.DpcStack = DpcStack; + Pcr->Prcb.RspBase = Tss->Rsp0; + /* Setup the processor set */ Pcr->Prcb.MultiThreadProcessorSet = Pcr->Prcb.SetMember; } @@ -387,13 +389,10 @@ IN CCHAR Number, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - FrLdrDbgPrint("Enter KiInitializeKernel\n"); -#if 0 BOOLEAN NpxPresent; ULONG FeatureBits; - LARGE_INTEGER PageDirectory; + ULONG PageDirectory[2]; PVOID DpcStack; - ULONG Vendor[3]; /* Detect and set the CPU Type */ KiSetProcessorType(); @@ -401,14 +400,8 @@ /* Set CR0 features based on detected CPU */ KiSetCR0Bits(); - /* Check if an FPU is present */ - NpxPresent = KiIsNpxPresent(); - /* Initialize the Power Management Support for this PRCB */ - PoInitializePrcb(Prcb); - - /* Bugcheck if this is a 386 CPU */ - if (Prcb->CpuType == 3) KeBugCheckEx(0x5D, 0x386, 0, 0, 0); +// PoInitializePrcb(Prcb); /* Get the processor features for the CPU */ FeatureBits = KiGetFeatureBits(); @@ -456,7 +449,7 @@ KiInitSpinLocks(Prcb, Number); /* Check if this is the Boot CPU */ - if (!Number) + if (Number == 0) { /* Set Node Data */ KeNodeBlock[0] = &KiNode0; @@ -474,20 +467,6 @@ KeI386FxsrPresent = (KeFeatureBits & KF_FXSR) ? TRUE : FALSE; KeI386XMMIPresent = (KeFeatureBits & KF_XMMI) ? TRUE : FALSE; - /* Detect 8-byte compare exchange support */ - if (!(KeFeatureBits & KF_CMPXCHG8B)) - { - /* Copy the vendor string */ - RtlCopyMemory(Vendor, Prcb->VendorString, sizeof(Vendor)); - - /* Bugcheck the system. Windows *requires* this */ - KeBugCheckEx(0x5D, - (1 << 24 ) | (Prcb->CpuType << 16) | Prcb->CpuStep, - Vendor[0], - Vendor[1], - Vendor[2]); - } - /* Set the current MP Master KPRCB to the Boot PRCB */ Prcb->MultiThreadSetMaster = Prcb; @@ -503,11 +482,12 @@ /* Initialize the Idle Process and the Process Listhead */ InitializeListHead(&KiProcessListHead); - PageDirectory.QuadPart = 0; + PageDirectory[0] = 0; + PageDirectory[1] = 0; KeInitializeProcess(InitProcess, 0, 0xFFFFFFFF, - &PageDirectory, + PageDirectory, FALSE); InitProcess->QuantumReset = MAXCHAR; } @@ -516,7 +496,8 @@ /* FIXME */ DPRINT1("SMP Boot support not yet present\n"); } - +FrLdrDbgPrint("before KeInitializeThread\n"); +for(;;); /* Setup the Idle Thread */ KeInitializeThread(InitProcess, InitThread, @@ -577,14 +558,14 @@ Prcb->DpcStack = DpcStack; /* Allocate the IOPM save area. */ - Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, - PAGE_SIZE * 2, - TAG('K', 'e', ' ', ' ')); - if (!Ki386IopmSaveArea) - { - /* Bugcheck. We need this for V86/VDM support. */ - KeBugCheckEx(NO_PAGES_AVAILABLE, 2, PAGE_SIZE * 2, 0, 0); - } +// Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, +// PAGE_SIZE * 2, +// TAG('K', 'e', ' ', ' ')); +// if (!Ki386IopmSaveArea) +// { +// /* Bugcheck. We need this for V86/VDM support. */ +// KeBugCheckEx(NO_PAGES_AVAILABLE, 2, PAGE_SIZE * 2, 0, 0); +// } } /* Raise to Dispatch */ @@ -601,7 +582,6 @@ /* Raise back to HIGH_LEVEL and clear the PRCB for the loader block */ KfRaiseIrql(HIGH_LEVEL); LoaderBlock->Prcb = 0; -#endif } VOID @@ -712,7 +692,7 @@ FrLdrDbgPrint("Gdt = %p, Idt = %p, Pcr = %p, Tss = %p\n", Gdt, Idt, Pcr, Tss); /* Setup the TSS descriptors and entries */ - Ki386InitializeTss(Tss, Idt, Gdt); + Ki386InitializeTss(Tss, Idt, Gdt, InitialStack); /* Initialize the PCR */ RtlZeroMemory(Pcr, PAGE_SIZE); @@ -769,7 +749,7 @@ Pcr->Prcb.SetMember = 1 << Cpu; /* Initialize the Processor with HAL */ -// HalInitializeProcessor(Cpu, KeLoaderBlock); + HalInitializeProcessor(Cpu, KeLoaderBlock); /* Set active processors */ KeActiveProcessors |= 1 << Cpu;

1 0

[tkreuzer] 35548: Fix Ke386SaveFlags and Ke386RestoreFlags. Rename KIDT_INIT's 3rd member to IstIndex and use it in KeInitExceptions.
by tkreuzer＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: tkreuzer Date: Fri Aug 22 20:31:51 2008 New Revision: 35548 URL: http://svn.reactos.org/svn/reactos?rev=35548&view=rev Log: Fix Ke386SaveFlags and Ke386RestoreFlags. Rename KIDT_INIT's 3rd member to IstIndex and use it in KeInitExceptions. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Fri Aug 22 20:31:51 2008 @@ -48,8 +48,8 @@ : /* no outputs */ \ : "m" (X)); -#define Ke386SaveFlags(x) __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */) -#define Ke386RestoreFlags(x) __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") +#define Ke386SaveFlags(x) __asm__ __volatile__("pushfq ; popq %0":"=g" (x): /* no input */) +#define Ke386RestoreFlags(x) __asm__ __volatile__("pushq %0 ; popfq": /* no output */ :"g" (x):"memory") #define _Ke386GetSeg(N) ({ \ unsigned int __d; \ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Fri Aug 22 20:31:51 2008 @@ -54,7 +54,7 @@ { UCHAR InterruptId; UCHAR Dpl; - UCHAR Type; + UCHAR IstIndex; PVOID ServiceRoutine; } KIDT_INIT, *PKIDT_INIT; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Fri Aug 22 20:31:51 2008 @@ -42,7 +42,7 @@ {0x2D, 0x03, 0x00, KiDebugServiceTrap}, {0x2F, 0x00, 0x00, KiDpcInterrupt}, {0xE1, 0x00, 0x00, KiIpiInterrupt}, - {0, 0} + {0, 0, 0, 0} }; KIDTENTRY64 KiIdt[256]; @@ -68,17 +68,18 @@ { Offset = (ULONG64)KiInterruptInitTable[j].ServiceRoutine; KiIdt[i].Dpl = KiInterruptInitTable[j].Dpl; + KiIdt[i].IstIndex = KiInterruptInitTable[j].IstIndex; j++; } else { Offset = (ULONG64)KiUnexpectedInterrupt; KiIdt[i].Dpl = 0; + KiIdt[i].IstIndex = 0; } KiIdt[i].OffsetLow = Offset & 0xffff; KiIdt[i].Selector = KGDT_64_R0_CODE; KiIdt[i].Type = 0x0e; - KiIdt[i].IstIndex = 0; KiIdt[i].Reserved0 = 0; KiIdt[i].Present = 1; KiIdt[i].OffsetMiddle = (Offset >> 16) & 0xffff;

1 0

[tkreuzer] 35547: Setup KUSER_SHARED_DATA.
by tkreuzer＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: tkreuzer Date: Fri Aug 22 20:19:34 2008 New Revision: 35547 URL: http://svn.reactos.org/svn/reactos?rev=35547&view=rev Log: Setup KUSER_SHARED_DATA. Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Fri Aug 22 20:19:34 2008 @@ -198,6 +198,7 @@ FrLdrSetupPageDirectory(VOID) { ULONG KernelPages; + PVOID UserSharedData; /* Allocate a Page for the PML4 */ pPML4 = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); @@ -238,9 +239,15 @@ TssBase = GdtBase + 20 * sizeof(ULONG64); // FIXME: don't hardcode if (!FrLdrMapSinglePage(GdtBase, (ULONGLONG)pGdt)) { - DbgPrint("Could not map idt page.\n", KernelPages); - } - + DbgPrint("Could not map gdt page.\n", KernelPages); + } + + /* Setup KUSER_SHARED_DATA page */ + UserSharedData = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory); + if (!FrLdrMapSinglePage(KI_USER_SHARED_DATA, (ULONG64)UserSharedData)) + { + DbgPrint("Could not map KUSER_SHARED_DATA page.\n", KernelPages); + } }

1 0

[tkreuzer] 35546: Fix __readmsr and __writemsr on amd64
by tkreuzer＠svn.reactos.org 23 Aug '08

23 Aug '08

Author: tkreuzer Date: Fri Aug 22 20:18:07 2008 New Revision: 35546 URL: http://svn.reactos.org/svn/reactos?rev=35546&view=rev Log: Fix __readmsr and __writemsr on amd64 Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Fri Aug 22 20:18:07 2008 @@ -1200,14 +1200,24 @@ /*** System operations ***/ static __inline__ __attribute__((always_inline)) unsigned long long __readmsr(const int reg) { +#ifdef _M_AMD64 + unsigned long low, high; + __asm__ __volatile__("rdmsr" : "=a" (low), "=d" (high) : "c" (reg)); + return (high << 32) | low; +#else unsigned long long retval; __asm__ __volatile__("rdmsr" : "=A" (retval) : "c" (reg)); return retval; +#endif } static __inline__ __attribute__((always_inline)) void __writemsr(const unsigned long Register, const unsigned long long Value) { +#ifdef _M_AMD64 + __asm__ __volatile__("wrmsr" : : "a" (Value), "d" (Value >> 32), "c" (Register)); +#else __asm__ __volatile__("wrmsr" : : "A" (Value), "c" (Register)); +#endif } static __inline__ __attribute__((always_inline)) unsigned long long __readpmc(const int counter)

1 0

[hpoussin] 35545: Remove useless 'if'
by hpoussin＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: hpoussin Date: Fri Aug 22 17:13:46 2008 New Revision: 35545 URL: http://svn.reactos.org/svn/reactos?rev=35545&view=rev Log: Remove useless 'if' Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Aug 22 17:13:46 2008 @@ -397,8 +397,7 @@ Node->Level = ParentNode->Level + 1; } - if (PhysicalDeviceObject) - PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; *DeviceNode = Node;

1 0

[hpoussin] 35544: LONG -> NTSTATUS
by hpoussin＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: hpoussin Date: Fri Aug 22 17:11:49 2008 New Revision: 35544 URL: http://svn.reactos.org/svn/reactos?rev=35544&view=rev Log: LONG -> NTSTATUS Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Fri Aug 22 17:11:49 2008 @@ -764,7 +764,7 @@ PNP_DEVNODE_STATE PreviousState; PNP_DEVNODE_STATE StateHistory[20]; ULONG StateHistoryEntry; - LONG CompletionStatus; + NTSTATUS CompletionStatus; PIRP PendingIrp; ULONG Flags; ULONG UserFlags;

1 0

[hpoussin] 35543: Fix device node structure to be compatible with MS Windows Vista Send GUID_DEVICE_ENUMERATED event umpnpmgr: react on GUID_DEVICE_ENUMERATED, not GUID_DEVICE_ARRIVAL IopEnumerateDevice: Set DNF_ENUMERATED and DO_BUS_ENUMERATED_DEVICE when required IopEnumerateDevice: Continue to process PDOs, even if one failed
by hpoussin＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: hpoussin Date: Fri Aug 22 16:43:42 2008 New Revision: 35543 URL: http://svn.reactos.org/svn/reactos?rev=35543&view=rev Log: Fix device node structure to be compatible with MS Windows Vista Send GUID_DEVICE_ENUMERATED event umpnpmgr: react on GUID_DEVICE_ENUMERATED, not GUID_DEVICE_ARRIVAL IopEnumerateDevice: Set DNF_ENUMERATED and DO_BUS_ENUMERATED_DEVICE when required IopEnumerateDevice: Continue to process PDOs, even if one failed Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/setup/usetup/interface/devinst.c trunk/reactos/include/ndk/iotypes.h trunk/reactos/include/ndk/potypes.h trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri Aug 22 16:43:42 2008 @@ -2165,7 +2165,7 @@ /* Process the pnp event */ DPRINT("Received PnP Event\n"); - if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) + if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ENUMERATED, &RpcStatus)) { DeviceInstallParams* Params; DWORD len; Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c [iso-8859-1] Fri Aug 22 16:43:42 2008 @@ -366,7 +366,7 @@ /* Process the pnp event */ DPRINT("Received PnP Event\n"); - if (IsEqualIID(&PnpEvent->EventGuid, (REFGUID)&GUID_DEVICE_ARRIVAL)) + if (IsEqualIID(&PnpEvent->EventGuid, (REFGUID)&GUID_DEVICE_ENUMERATED)) { DPRINT1("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); InstallDevice(hInf, hEnum, hServices, PnpEvent->TargetDevice.DeviceIds); Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Fri Aug 22 16:43:42 2008 @@ -23,6 +23,7 @@ // #include <umtypes.h> #include <ifssupp.h> +#include <potypes.h> // // I/O Completion Access Rights @@ -322,6 +323,18 @@ #endif // +// Dock Profile Status +// +typedef enum _PROFILE_STATUS +{ + DOCK_NOTDOCKDEVICE, + DOCK_QUIESCENT, + DOCK_ARRIVING, + DOCK_DEPARTING, + DOCK_EJECTIRP_COMPLETED +} PROFILE_STATUS, *PPROFILE_STATUS; + +// // Device Node States // typedef enum _PNP_DEVNODE_STATE @@ -740,17 +753,18 @@ // typedef struct _DEVICE_NODE { + struct _DEVICE_NODE *Sibling; + struct _DEVICE_NODE *Child; struct _DEVICE_NODE *Parent; - struct _DEVICE_NODE *PrevSibling; - struct _DEVICE_NODE *NextSibling; - struct _DEVICE_NODE *Child; + struct _DEVICE_NODE *LastChild; ULONG Level; struct _PO_DEVICE_NOTIFY *Notify; + PO_IRP_MANAGER PoIrpManager; PNP_DEVNODE_STATE State; PNP_DEVNODE_STATE PreviousState; PNP_DEVNODE_STATE StateHistory[20]; ULONG StateHistoryEntry; - INT CompletionStatus; + LONG CompletionStatus; PIRP PendingIrp; ULONG Flags; ULONG UserFlags; @@ -786,10 +800,13 @@ struct _DEVICE_NODE *NextResourceDeviceNode; } OverUsed2; PCM_RESOURCE_LIST BootResources; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PCM_RESOURCE_LIST BootResourcesTranslated; +#endif ULONG CapabilityFlags; struct { - ULONG DockStatus; + PROFILE_STATUS DockStatus; LIST_ENTRY ListEntry; WCHAR *SerialNumber; } DockInfo; @@ -799,6 +816,9 @@ ULONG DriverUnloadRetryCount; struct _DEVICE_NODE *PreviousParent; ULONG DeletedChidren; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG NumaNodeIndex; +#endif } DEVICE_NODE, *PDEVICE_NODE; // Modified: trunk/reactos/include/ndk/potypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/potypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/potypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/potypes.h [iso-8859-1] Fri Aug 22 16:43:42 2008 @@ -107,6 +107,22 @@ ULONG ActiveChild; } PO_DEVICE_NOTIFY, *PPO_DEVICE_NOTIFY; +// +// Power IRP Queue +// +typedef struct _PO_IRP_QUEUE +{ + PIRP CurrentIrp; + PIRP PendingIrpList; +} PO_IRP_QUEUE, *PPO_IRP_QUEUE; + +// Power IRP Manager +typedef struct _PO_IRP_MANAGER +{ + PO_IRP_QUEUE DeviceIrpQueue; + PO_IRP_QUEUE SystemIrpQueue; +} PO_IRP_MANAGER, *PPO_IRP_MANAGER; + #endif // !NTOS_MODE_USER #endif // _POTYPES_H Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Fri Aug 22 16:43:42 2008 @@ -128,7 +128,7 @@ /* Traversal of all children nodes */ for (ChildNode = Node->Child; ChildNode != NULL; - ChildNode = ChildNode->NextSibling) + ChildNode = ChildNode->Sibling) { DeviceObject = IopTraverseDeviceNode(ChildNode, DeviceInstance); if (DeviceObject != NULL) @@ -360,7 +360,7 @@ break; case PNP_GET_SIBLING_DEVICE: - RelatedDeviceNode = DeviceNode->NextSibling; + RelatedDeviceNode = DeviceNode->Sibling; break; default: Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Aug 22 16:43:42 2008 @@ -384,19 +384,21 @@ ((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode = Node; - if (ParentNode) - { - KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); - Node->Parent = ParentNode; - Node->NextSibling = ParentNode->Child; - if (ParentNode->Child != NULL) - { - ParentNode->Child->PrevSibling = Node; - } - ParentNode->Child = Node; - KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); - Node->Level = ParentNode->Level + 1; - } + if (ParentNode) + { + KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); + Node->Parent = ParentNode; + if (ParentNode->LastChild != NULL) + ParentNode->LastChild->Sibling = Node; + else + ParentNode->Child = Node; + ParentNode->LastChild = Node; + KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); + Node->Level = ParentNode->Level + 1; + } + + if (PhysicalDeviceObject) + PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; *DeviceNode = Node; @@ -407,6 +409,7 @@ IopFreeDeviceNode(PDEVICE_NODE DeviceNode) { KIRQL OldIrql; + PDEVICE_NODE PrevSibling = NULL; /* All children must be deleted before a parent is deleted */ ASSERT(!DeviceNode->Child); @@ -417,24 +420,30 @@ ObDereferenceObject(DeviceNode->PhysicalDeviceObject); - /* Unlink from parent if it exists */ - - if ((DeviceNode->Parent) && (DeviceNode->Parent->Child == DeviceNode)) - { - DeviceNode->Parent->Child = DeviceNode->NextSibling; - } - - /* Unlink from sibling list */ - - if (DeviceNode->PrevSibling) - { - DeviceNode->PrevSibling->NextSibling = DeviceNode->NextSibling; - } - - if (DeviceNode->NextSibling) - { - DeviceNode->NextSibling->PrevSibling = DeviceNode->PrevSibling; - } + /* Get previous sibling */ + if (DeviceNode->Parent && DeviceNode->Parent->Child != DeviceNode) + { + PrevSibling = DeviceNode->Parent->Child; + while (PrevSibling->Sibling != DeviceNode) + PrevSibling = PrevSibling->Sibling; + } + + /* Unlink from parent if it exists */ + if (DeviceNode->Parent) + { + if (DeviceNode->Parent->LastChild == DeviceNode) + { + DeviceNode->Parent->LastChild = PrevSibling; + if (PrevSibling) + PrevSibling->Sibling = NULL; + } + if (DeviceNode->Parent->Child == DeviceNode) + DeviceNode->Parent->Child = DeviceNode->Sibling; + } + + /* Unlink from sibling list */ + if (PrevSibling) + PrevSibling->Sibling = DeviceNode->Sibling; KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql); @@ -547,7 +556,7 @@ /* Traversal of all children nodes */ for (ChildDeviceNode = ParentDeviceNode->Child; ChildDeviceNode != NULL; - ChildDeviceNode = ChildDeviceNode->NextSibling) + ChildDeviceNode = ChildDeviceNode->Sibling) { /* Pass the current device node to the action routine */ Context->DeviceNode = ChildDeviceNode; @@ -1656,7 +1665,7 @@ if (!IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER)) { /* Report the device to the user-mode pnp manager */ - IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + IopQueueTargetDeviceEvent(&GUID_DEVICE_ENUMERATED, &DeviceNode->InstancePath); } @@ -1671,6 +1680,7 @@ PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); DEVICETREE_TRAVERSE_CONTEXT Context; PDEVICE_RELATIONS DeviceRelations; + PDEVICE_OBJECT ChildDeviceObject; IO_STATUS_BLOCK IoStatusBlock; PDEVICE_NODE ChildDeviceNode; IO_STACK_LOCATION Stack; @@ -1678,6 +1688,12 @@ ULONG i; DPRINT("DeviceObject 0x%p\n", DeviceObject); + + DPRINT("Sending GUID_DEVICE_ARRIVAL\n"); + + /* Report the device to the user-mode pnp manager */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &DeviceNode->InstancePath); DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); @@ -1709,24 +1725,38 @@ */ for (i = 0; i < DeviceRelations->Count; i++) { - if (IopGetDeviceNode(DeviceRelations->Objects[i]) != NULL) + ChildDeviceObject = DeviceRelations->Objects[i]; + ASSERT((ChildDeviceObject->Flags & DO_DEVICE_INITIALIZING) == 0); + + ChildDeviceNode = IopGetDeviceNode(ChildDeviceObject); + if (!ChildDeviceNode) { - ObDereferenceObject(DeviceRelations->Objects[i]); - continue; + /* One doesn't exist, create it */ + Status = IopCreateDeviceNode( + DeviceNode, + ChildDeviceObject, + NULL, + &ChildDeviceNode); + if (NT_SUCCESS(Status)) + { + /* Mark the node as enumerated */ + ChildDeviceNode->Flags |= DNF_ENUMERATED; + + /* Mark the DO as bus enumerated */ + ChildDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE; + } + else + { + /* Ignore this DO */ + DPRINT1("IopCreateDeviceNode() failed with status 0x%08x. Skipping PDO %u\n", Status, i); + ObDereferenceObject(ChildDeviceNode); + } } - Status = IopCreateDeviceNode( - DeviceNode, - DeviceRelations->Objects[i], - NULL, - &ChildDeviceNode); - DeviceNode->Flags |= DNF_ENUMERATED; - if (!NT_SUCCESS(Status)) + else { - DPRINT("No resources\n"); - for (i = 0; i < DeviceRelations->Count; i++) - ObDereferenceObject(DeviceRelations->Objects[i]); - ExFreePool(DeviceRelations); - return Status; + /* Mark it as enumerated */ + ChildDeviceNode->Flags |= DNF_ENUMERATED; + ObDereferenceObject(ChildDeviceObject); } } ExFreePool(DeviceRelations);

1 0

[sginsberg] 35542: - Remove a LIST_FOR_EACH - ASSERTify 2 assumptions - Rename "ListEntry" to "NextEntry" for clarification
by sginsberg＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: sginsberg Date: Fri Aug 22 16:24:31 2008 New Revision: 35542 URL: http://svn.reactos.org/svn/reactos?rev=35542&view=rev Log: - Remove a LIST_FOR_EACH - ASSERTify 2 assumptions - Rename "ListEntry" to "NextEntry" for clarification Modified: trunk/reactos/ntoskrnl/ke/devqueue.c Modified: trunk/reactos/ntoskrnl/ke/devqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/devqueue.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/devqueue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/devqueue.c [iso-8859-1] Fri Aug 22 16:24:31 2008 @@ -197,7 +197,7 @@ KeRemoveByKeyDeviceQueue(IN PKDEVICE_QUEUE DeviceQueue, IN ULONG SortKey) { - PLIST_ENTRY ListEntry; + PLIST_ENTRY NextEntry; PKDEVICE_QUEUE_ENTRY ReturnEntry; KLOCK_QUEUE_HANDLE DeviceLock; ASSERT_DEVICE_QUEUE(DeviceQueue); @@ -218,8 +218,8 @@ else { /* If SortKey is greater than the last key, then return the first entry right away */ - ListEntry = &DeviceQueue->DeviceListHead; - ReturnEntry = CONTAINING_RECORD(ListEntry->Blink, + NextEntry = &DeviceQueue->DeviceListHead; + ReturnEntry = CONTAINING_RECORD(NextEntry->Blink, KDEVICE_QUEUE_ENTRY, DeviceListEntry); @@ -227,24 +227,27 @@ if (ReturnEntry->SortKey <= SortKey) { /* Get the first entry */ - ReturnEntry = CONTAINING_RECORD(ListEntry->Flink, + ReturnEntry = CONTAINING_RECORD(NextEntry->Flink, KDEVICE_QUEUE_ENTRY, DeviceListEntry); } else { /* Loop the list */ - ListEntry = DeviceQueue->DeviceListHead.Flink; + NextEntry = DeviceQueue->DeviceListHead.Flink; while (TRUE) { + /* Make sure we don't go beyond the end of the queue */ + ASSERT(NextEntry != &DeviceQueue->DeviceListHead); + /* Get the next entry and check if the key is low enough */ - ReturnEntry = CONTAINING_RECORD(ListEntry, + ReturnEntry = CONTAINING_RECORD(NextEntry, KDEVICE_QUEUE_ENTRY, DeviceListEntry); if (SortKey <= ReturnEntry->SortKey) break; /* Try the next one */ - ListEntry = ListEntry->Flink; + NextEntry = NextEntry->Flink; } } @@ -270,7 +273,7 @@ KeRemoveByKeyDeviceQueueIfBusy(IN PKDEVICE_QUEUE DeviceQueue, IN ULONG SortKey) { - PLIST_ENTRY ListEntry; + PLIST_ENTRY NextEntry; PKDEVICE_QUEUE_ENTRY ReturnEntry; KLOCK_QUEUE_HANDLE DeviceLock; ASSERT_DEVICE_QUEUE(DeviceQueue); @@ -289,27 +292,42 @@ } else { - /* Find entry with SortKey greater than or equal to the passed-in SortKey */ - LIST_FOR_EACH(ReturnEntry, &DeviceQueue->DeviceListHead, KDEVICE_QUEUE_ENTRY, DeviceListEntry) - { - /* Check if keys match */ - if (ReturnEntry->SortKey >= SortKey) - { - /* We found it, so just remove it */ - RemoveEntryList(&ReturnEntry->DeviceListEntry); - break; - } - } - - /* Check if we found something */ - if (!ReturnEntry) - { - /* Not found, return the first entry */ - ListEntry = RemoveHeadList(&DeviceQueue->DeviceListHead); - ReturnEntry = CONTAINING_RECORD(ListEntry, + /* If SortKey is greater than the last key, then return the first entry right away */ + NextEntry = &DeviceQueue->DeviceListHead; + ReturnEntry = CONTAINING_RECORD(NextEntry->Blink, + KDEVICE_QUEUE_ENTRY, + DeviceListEntry); + + /* Check if we can just get the first entry */ + if (ReturnEntry->SortKey <= SortKey) + { + /* Get the first entry */ + ReturnEntry = CONTAINING_RECORD(NextEntry->Flink, KDEVICE_QUEUE_ENTRY, DeviceListEntry); } + else + { + /* Loop the list */ + NextEntry = DeviceQueue->DeviceListHead.Flink; + while (TRUE) + { + /* Make sure we don't go beyond the end of the queue */ + ASSERT(NextEntry != &DeviceQueue->DeviceListHead); + + /* Get the next entry and check if the key is low enough */ + ReturnEntry = CONTAINING_RECORD(NextEntry, + KDEVICE_QUEUE_ENTRY, + DeviceListEntry); + if (SortKey <= ReturnEntry->SortKey) break; + + /* Try the next one */ + NextEntry = NextEntry->Flink; + } + } + + /* We have an entry, remove it now */ + RemoveEntryList(&ReturnEntry->DeviceListEntry); /* Set it as non-inserted */ ReturnEntry->Inserted = FALSE;

1 0

[pschweitzer] 35541: memcpy -> RtlCopyMemory
by pschweitzer＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: pschweitzer Date: Fri Aug 22 15:25:36 2008 New Revision: 35541 URL: http://svn.reactos.org/svn/reactos?rev=35541&view=rev Log: memcpy -> RtlCopyMemory Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/dos8dot3.c?r… ============================================================================== --- branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] Fri Aug 22 15:25:36 2008 @@ -198,7 +198,7 @@ } /* Build the short name */ - memcpy(Name8dot3->Buffer, NameBuffer, CopyLength * sizeof(WCHAR)); + RtlCopyMemory(Name8dot3->Buffer, NameBuffer, CopyLength * sizeof(WCHAR)); j = CopyLength; if (Context->CheckSumInserted) { @@ -221,7 +221,7 @@ } j += IndexLength + 1; - memcpy(Name8dot3->Buffer + j, ExtBuffer, ExtLength * sizeof(WCHAR)); + RtlCopyMemory(Name8dot3->Buffer + j, ExtBuffer, ExtLength * sizeof(WCHAR)); Name8dot3->Length = (j + ExtLength) * sizeof(WCHAR); DPRINT("Name8dot3: '%wZ'\n", Name8dot3); @@ -229,8 +229,8 @@ /* Update context */ Context->NameLength = CopyLength; Context->ExtensionLength = ExtLength; - memcpy(Context->NameBuffer, NameBuffer, CopyLength * sizeof(WCHAR)); - memcpy(Context->ExtensionBuffer, ExtBuffer, ExtLength * sizeof(WCHAR)); + RtlCopyMemory(Context->NameBuffer, NameBuffer, CopyLength * sizeof(WCHAR)); + RtlCopyMemory(Context->ExtensionBuffer, ExtBuffer, ExtLength * sizeof(WCHAR)); }

1 0

[janderwald] 35540: * When clicking on the desktop background, there is no item selected, thus, apidl is null * Fixes bug 3676
by janderwald＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: janderwald Date: Fri Aug 22 15:07:14 2008 New Revision: 35540 URL: http://svn.reactos.org/svn/reactos?rev=35540&view=rev Log: * When clicking on the desktop background, there is no item selected, thus, apidl is null * Fixes bug 3676 Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Fri Aug 22 15:07:14 2008 @@ -1408,12 +1408,12 @@ WCHAR szDrive[MAX_PATH]; STRRET strFile; - if (_ILIsMyComputer(This->dcm.apidl[0])) + if (This->dcm.cidl &&_ILIsMyComputer(This->dcm.apidl[0])) { ShellExecuteW(lpcmi->hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL); return S_OK; } - else if (_ILIsDesktop(This->dcm.apidl[0])) + else if (This->dcm.cidl == 0 && _ILIsDesktop(This->dcm.pidlFolder)) { ShellExecuteW(lpcmi->hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL); return S_OK;

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