Ros-diffs September 2006

ros-diffs@reactos.org

16 participants
146 discussions

[ion] 23886: - Add missing volatile statements to KPROCESS, KTHREAD, KPRCB and KDPC_DATA. - Fix KDPC definition in DDK. You can always count on the w32api to get even the simplest structures wrong. - Fix memory overwrite bug in KiInitSpinlocks. - Part 1 of 2: Cleanup and improve DPC implementation to add partial support for Threaded DPCs and remove SMP vs non-SMP ifdefs. (At the expense of, oh God, 5 wasted CPU cycles!).

by ion＠svn.reactos.org

Author: ion Date: Sat Sep 2 20:19:00 2006 New Revision: 23886 URL: http://svn.reactos.org/svn/reactos?rev=23886&view=rev Log: - Add missing volatile statements to KPROCESS, KTHREAD, KPRCB and KDPC_DATA. - Fix KDPC definition in DDK. You can always count on the w32api to get even the simplest structures wrong. - Fix memory overwrite bug in KiInitSpinlocks. - Part 1 of 2: Cleanup and improve DPC implementation to add partial support for Threaded DPCs and remove SMP vs non-SMP ifdefs. (At the expense of, oh God, 5 wasted CPU cycles!). Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/ipi.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sat Sep 2 20:19:00 2006 @@ -1079,16 +1079,25 @@ KIRQL OldIrql; } KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; -typedef struct _KDPC { - CSHORT Type; - UCHAR Number; - UCHAR Importance; - LIST_ENTRY DpcListEntry; - PKDEFERRED_ROUTINE DeferredRoutine; - PVOID DeferredContext; - PVOID SystemArgument1; - PVOID SystemArgument2; - PVOID DpcData; +#define DPC_NORMAL 0 +#define DPC_THREADED 1 + +#define ASSERT_DPC(Object) \ + ASSERT(((Object)->Type == 0) || \ + ((Object)->Type == DpcObject) || \ + ((Object)->Type == ThreadedDpcObject)) + +typedef struct _KDPC +{ + UCHAR Type; + UCHAR Importance; + USHORT Number; + LIST_ENTRY DpcListEntry; + PKDEFERRED_ROUTINE DeferredRoutine; + PVOID DeferredContext; + PVOID SystemArgument1; + PVOID SystemArgument2; + volatile PVOID DpcData; } KDPC, *PKDPC, *RESTRICTED_POINTER PRKDPC; typedef PVOID PKIPI_CONTEXT; Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Sat Sep 2 20:19:00 2006 @@ -421,9 +421,9 @@ ULONG KeSecondLevelTbFills; ULONG KeSystemCalls; #endif - ULONG IoReadOperationCount; - ULONG IoWriteOperationCount; - ULONG IoOtherOperationCount; + volatile ULONG IoReadOperationCount; + volatile ULONG IoWriteOperationCount; + volatile ULONG IoOtherOperationCount; LARGE_INTEGER IoReadTransferCount; LARGE_INTEGER IoWriteTransferCount; LARGE_INTEGER IoOtherTransferCount; @@ -464,37 +464,37 @@ PP_LOOKASIDE_LIST PPLookasideList[16]; PP_LOOKASIDE_LIST PPNPagedLookasideList[32]; PP_LOOKASIDE_LIST PPPagedLookasideList[32]; - ULONG PacketBarrier; - ULONG ReverseStall; + volatile ULONG PacketBarrier; + volatile ULONG ReverseStall; PVOID IpiFrame; UCHAR PrcbPad2[52]; - PVOID CurrentPacket[3]; - ULONG TargetSet; - PKIPI_WORKER WorkerRoutine; - ULONG IpiFrozen; + volatile PVOID CurrentPacket[3]; + volatile ULONG TargetSet; + volatile PKIPI_WORKER WorkerRoutine; + volatile ULONG IpiFrozen; UCHAR PrcbPad3[40]; - ULONG RequestSummary; - struct _KPRCB *SignalDone; + volatile ULONG RequestSummary; + volatile struct _KPRCB *SignalDone; UCHAR PrcbPad4[56]; struct _KDPC_DATA DpcData[2]; PVOID DpcStack; ULONG MaximumDpcQueueDepth; ULONG DpcRequestRate; ULONG MinimumDpcRate; - UCHAR DpcInterruptRequested; - UCHAR DpcThreadRequested; - UCHAR DpcRoutineActive; - UCHAR DpcThreadActive; + volatile UCHAR DpcInterruptRequested; + volatile UCHAR DpcThreadRequested; + volatile UCHAR DpcRoutineActive; + volatile UCHAR DpcThreadActive; ULONG PrcbLock; ULONG DpcLastCount; - ULONG TimerHand; - ULONG TimerRequest; + volatile ULONG TimerHand; + volatile ULONG TimerRequest; PVOID DpcThread; KEVENT DpcEvent; UCHAR ThreadDpcEnable; - BOOLEAN QuantumEnd; + volatile BOOLEAN QuantumEnd; UCHAR PrcbPad50; - UCHAR IdleSchedule; + volatile UCHAR IdleSchedule; LONG DpcSetEventRequest; #if (NTDDI_VERSION >= NTDDI_LONGHORN) LONG Sleeping; @@ -535,19 +535,19 @@ #endif PVOID ChainedInterruptList; LONG LookasideIrpFloat; - LONG MmPageFaultCount; - LONG MmCopyOnWriteCount; - LONG MmTransitionCount; - LONG MmCacheTransitionCount; - LONG MmDemandZeroCount; - LONG MmPageReadCount; - LONG MmPageReadIoCount; - LONG MmCacheReadCount; - LONG MmCacheIoCount; - LONG MmDirtyPagesWriteCount; - LONG MmDirtyWriteIoCount; - LONG MmMappedPagesWriteCount; - LONG MmMappedWriteIoCount; + volatile LONG MmPageFaultCount; + volatile LONG MmCopyOnWriteCount; + volatile LONG MmTransitionCount; + volatile LONG MmCacheTransitionCount; + volatile LONG MmDemandZeroCount; + volatile LONG MmPageReadCount; + volatile LONG MmPageReadIoCount; + volatile LONG MmCacheReadCount; + volatile LONG MmCacheIoCount; + volatile LONG MmDirtyPagesWriteCount; + volatile LONG MmDirtyWriteIoCount; + volatile LONG MmMappedPagesWriteCount; + volatile LONG MmMappedWriteIoCount; #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG CachedCommit; ULONG CachedResidentAvailable; @@ -563,7 +563,7 @@ ULONG MHz; ULONG FeatureBits; LARGE_INTEGER UpdateSignature; - LARGE_INTEGER IsrTime; + volatile LARGE_INTEGER IsrTime; LARGE_INTEGER SpareField1; FX_SAVE_AREA NpxSaveArea; PROCESSOR_POWER_STATE PowerState; Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Sat Sep 2 20:19:00 2006 @@ -487,7 +487,7 @@ { LIST_ENTRY DpcListHead; ULONG DpcLock; - ULONG DpcQueueDepth; + volatile ULONG DpcQueueDepth; ULONG DpcCount; } KDPC_DATA, *PKDPC_DATA; @@ -676,13 +676,13 @@ UCHAR ApcQueueable; }; }; - UCHAR NextProcessor; - UCHAR DeferredProcessor; + volatile UCHAR NextProcessor; + volatile UCHAR DeferredProcessor; UCHAR AdjustReason; UCHAR AdjustIncrement; KSPIN_LOCK ApcQueueLock; ULONG ContextSwitches; - UCHAR State; + volatile UCHAR State; UCHAR NpxState; UCHAR WaitIrql; UCHAR WaitMode; @@ -697,7 +697,7 @@ UCHAR WaitReason; UCHAR Priority; UCHAR EnableStackSwap; - UCHAR SwapBusy; + volatile UCHAR SwapBusy; UCHAR Alerted[2]; union { @@ -903,7 +903,7 @@ UCHAR Iopl; UCHAR Unused; #endif - ULONG ActiveProcessors; + volatile ULONG ActiveProcessors; ULONG KernelTime; ULONG UserTime; LIST_ENTRY ReadyListHead; 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 Sat Sep 2 20:19:00 2006 @@ -113,6 +113,9 @@ extern LIST_ENTRY KiProcessInSwapListHead, KiProcessOutSwapListHead; extern LIST_ENTRY KiStackInSwapListHead; extern KEVENT KiSwapEvent; +extern PKPRCB KiProcessorBlock[]; +extern ULONG KiMask32Array[MAXIMUM_PRIORITY]; +extern ULONG IdleProcessorMask; /* MACROS *************************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2388… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Sat Sep 2 20:19:00 2006 @@ -1,29 +1,22 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/dpc.c - * PURPOSE: Handle DPCs (Delayed Procedure Calls) - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/i386/cpu.c + * PURPOSE: Routines for CPU-level support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Philip Susi (phreak(a)iag.net) * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - * Alex Ionescu (alex(a)relsoft.net) - */ - -/* - * NOTE: See also the higher level support routines in ntoskrnl/io/dpc.c - */ - -/* INCLUDES ***************************************************************/ + */ + +/* INCLUDES ******************************************************************/ + +#define NTDDI_VERSION NTDDI_WS03 #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, KeInitDpc) -#endif +#include <debug.h> + +/* GLOBALS *******************************************************************/ ULONG KiMaximumDpcQueueDepth = 4; ULONG KiMinimumDpcRate = 3; @@ -31,32 +24,17 @@ ULONG KiIdealDpcRate = 20; KMUTEX KiGenericCallDpcMutex; -/* TYPES *******************************************************************/ - -#define MAX_QUANTUM 0x7F - -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -VOID -STDCALL -KeInitializeThreadedDpc(PKDPC Dpc, - PKDEFERRED_ROUTINE DeferredRoutine, - PVOID DeferredContext) -/* - * FUNCTION: - * Initalizes a Threaded DPC and registers the DeferredRoutine for it. - * ARGUMENTS: - * Dpc = Pointer to a caller supplied DPC to be initialized. The caller must allocate this memory. - * DeferredRoutine = Pointer to associated DPC callback routine. - * DeferredContext = Parameter to be passed to the callback routine. - * NOTE: Callers can be running at any IRQL. - */ -{ - DPRINT("Threaded DPC Initializing: %x with Routine: %x\n", Dpc, DeferredRoutine); - Dpc->Type = ThreadedDpcObject; +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KiInitializeDpc(IN PKDPC Dpc, + IN PKDEFERRED_ROUTINE DeferredRoutine, + IN PVOID DeferredContext, + IN KOBJECTS Type) +{ + /* Setup the DPC Object */ + Dpc->Type = Type; Dpc->Number= 0; Dpc->Importance= MediumImportance; Dpc->DeferredRoutine = DeferredRoutine; @@ -64,275 +42,236 @@ Dpc->DpcData = NULL; } -/* - * @implemented - * - * FUNCTION: - * Initalizes a DPC and registers the DeferredRoutine for it. - * ARGUMENTS: - * Dpc = Pointer to a caller supplied DPC to be initialized. The caller must allocate this memory. - * DeferredRoutine = Pointer to associated DPC callback routine. - * DeferredContext = Parameter to be passed to the callback routine. - * NOTE: Callers can be running at any IRQL. - */ -VOID -STDCALL -KeInitializeDpc(PKDPC Dpc, - PKDEFERRED_ROUTINE DeferredRoutine, - PVOID DeferredContext) -{ - DPRINT("DPC Initializing: %x with Routine: %x\n", Dpc, DeferredRoutine); - Dpc->Type = DpcObject; - Dpc->Number= 0; - Dpc->Importance= MediumImportance; - Dpc->DeferredRoutine = DeferredRoutine; - Dpc->DeferredContext = DeferredContext; - Dpc->DpcData = NULL; -} - -/* - * @implemented - * - * FUNCTION: - * Queues a DPC for execution when the IRQL of a processor - * drops below DISPATCH_LEVEL - * ARGUMENTS: - * Dpc = Pointed to a DPC Object Initalized by KeInitializeDpc. - * SystemArgument1 = Driver Determined context data - * SystemArgument2 = Driver Determined context data - * RETURNS: - * TRUE if the DPC object wasn't already in the queue - * FALSE otherwise - * NOTES: - * If there is currently a DPC active on the target processor, or a DPC - * interrupt has already been requested on the target processor when a - * DPC is queued, then no further action is necessary. The DPC will be - * executed on the target processor when its queue entry is processed. - * - * If there is not a DPC active on the target processor and a DPC interrupt - * has not been requested on the target processor, then the exact treatment - * of the DPC is dependent on whether the host system is a UP system or an - * MP system. - * - * UP system. - * ---------- - * If the DPC is of medium or high importance, the current DPC queue depth - * is greater than the maximum target depth, or current DPC request rate is - * less the minimum target rate, then a DPC interrupt is requested on the - * host processor and the DPC will be processed when the interrupt occurs. - * Otherwise, no DPC interupt is requested and the DPC execution will be - * delayed until the DPC queue depth is greater that the target depth or the - * minimum DPC rate is less than the target rate. - * - * MP system. - * ---------- - * If the DPC is being queued to another processor and the depth of the DPC - * queue on the target processor is greater than the maximum target depth or - * the DPC is of high importance, then a DPC interrupt is requested on the - * target processor and the DPC will be processed when the interrupt occurs. - * Otherwise, the DPC execution will be delayed on the target processor until - * the DPC queue depth on the target processor is greater that the maximum - * target depth or the minimum DPC rate on the target processor is less than - * the target mimimum rate. - * - * If the DPC is being queued to the current processor and the DPC is not of - * low importance, the current DPC queue depth is greater than the maximum - * target depth, or the minimum DPC rate is less than the minimum target rate, - * then a DPC interrupt is request on the current processor and the DPV will - * be processed whne the interrupt occurs. Otherwise, no DPC interupt is - * requested and the DPC execution will be delayed until the DPC queue depth - * is greater that the target depth or the minimum DPC rate is less than the - * target rate. +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +KeInitializeThreadedDpc(IN PKDPC Dpc, + IN PKDEFERRED_ROUTINE DeferredRoutine, + IN PVOID DeferredContext) +{ + /* Call the internal routine */ + KiInitializeDpc(Dpc, DeferredRoutine, DeferredContext, ThreadedDpcObject); +} + +/* + * @implemented + */ +VOID +NTAPI +KeInitializeDpc(IN PKDPC Dpc, + IN PKDEFERRED_ROUTINE DeferredRoutine, + IN PVOID DeferredContext) +{ + /* Call the internal routine */ + KiInitializeDpc(Dpc, DeferredRoutine, DeferredContext, DpcObject); +} + +/* + * @implemented */ BOOLEAN -STDCALL -KeInsertQueueDpc(PKDPC Dpc, - PVOID SystemArgument1, - PVOID SystemArgument2) +NTAPI +KeInsertQueueDpc(IN PKDPC Dpc, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) { KIRQL OldIrql; - PKPRCB Prcb; - - DPRINT("KeInsertQueueDpc(DPC %x, SystemArgument1 %x, SystemArgument2 %x)\n", - Dpc, SystemArgument1, SystemArgument2); + PKPRCB Prcb, CurrentPrcb = KeGetCurrentPrcb(); + ULONG Cpu; + PKDPC_DATA DpcData; + BOOLEAN DpcConfigured = FALSE, DpcInserted = FALSE; + ASSERT_DPC(Dpc); /* Check IRQL and Raise it to HIGH_LEVEL */ - ASSERT(KeGetCurrentIrql()>=DISPATCH_LEVEL); KeRaiseIrql(HIGH_LEVEL, &OldIrql); - /* Check if this is a Thread DPC, which we don't support (yet) */ - if (Dpc->Type == ThreadedDpcObject) { - KeLowerIrql(OldIrql); - return FALSE; - } - -#ifdef CONFIG_SMP - /* Get the right PCR for this CPU */ - if (Dpc->Number >= MAXIMUM_PROCESSORS) { - - ASSERT (Dpc->Number - MAXIMUM_PROCESSORS < KeNumberProcessors); - Prcb = ((PKPCR)((ULONG_PTR)KPCR_BASE + ((Dpc->Number - MAXIMUM_PROCESSORS) * PAGE_SIZE)))->Prcb; - - } else { - - ASSERT (Dpc->Number < KeNumberProcessors); - Prcb = KeGetCurrentPrcb(); - Dpc->Number = KeGetCurrentProcessorNumber(); - } - - KiAcquireSpinLock(&Prcb->DpcData[0].DpcLock); -#else - Prcb = ((PKPCR)KPCR_BASE)->Prcb; -#endif + /* Check if the DPC has more then the maximum number of CPUs */ + if (Dpc->Number >= MAXIMUM_PROCESSORS) + { + /* Then substract the maximum and get that PRCB. */ + Cpu = Dpc->Number - MAXIMUM_PROCESSORS; + Prcb = KiProcessorBlock[Cpu]; + } + else + { + /* Use the current one */ + Prcb = CurrentPrcb; + Cpu = Prcb->Number; + } + + /* Check if this is a threaded DPC and threaded DPCs are enabled */ + if ((Dpc->Type = ThreadedDpcObject) && (Prcb->ThreadDpcEnable)) + { + /* Then use the threaded data */ + DpcData = &Prcb->DpcData[DPC_THREADED]; + } + else + { + /* Otherwise, use the regular data */ + DpcData = &Prcb->DpcData[DPC_NORMAL]; + } + + /* Acquire the DPC lock */ + KiAcquireSpinLock(&DpcData->DpcLock); /* Get the DPC Data */ - if (InterlockedCompareExchangeUL(&Dpc->DpcData, &Prcb->DpcData[0].DpcLock, 0)) { - - DPRINT("DPC Already Inserted\n"); -#ifdef CONFIG_SMP - KiReleaseSpinLock(&Prcb->DpcData[0].DpcLock); -#endif - KeLowerIrql(OldIrql); - return(FALSE); - } - - /* Make sure the lists are free if the Queue is 0 */ - if (Prcb->DpcData[0].DpcQueueDepth == 0) { - - ASSERT(IsListEmpty(&Prcb->DpcData[0].DpcListHead)); - } else { - - ASSERT(!IsListEmpty(&Prcb->DpcData[0].DpcListHead)); - } - - /* Now we can play with the DPC safely */ - Dpc->SystemArgument1=SystemArgument1; - Dpc->SystemArgument2=SystemArgument2; - Prcb->DpcData[0].DpcQueueDepth++; - Prcb->DpcData[0].DpcCount++; - - /* Insert the DPC into the list. HighImportance DPCs go at the beginning */ - if (Dpc->Importance == HighImportance) { - - InsertHeadList(&Prcb->DpcData[0].DpcListHead, &Dpc->DpcListEntry); - } else { - - InsertTailList(&Prcb->DpcData[0].DpcListHead, &Dpc->DpcListEntry); - } - DPRINT("New DPC Added. Dpc->DpcListEntry.Flink %x\n", Dpc->DpcListEntry.Flink); - - /* Make sure a DPC isn't executing already and respect rules outlined above. */ - if ((!Prcb->DpcRoutineActive) && (!Prcb->DpcInterruptRequested)) { - -#ifdef CONFIG_SMP - /* Check if this is the same CPU */ - if (Prcb != KeGetCurrentPrcb()) { - - /* Send IPI if High Importance */ - if ((Dpc->Importance == HighImportance) || - (Prcb->DpcData[0].DpcQueueDepth >= Prcb->MaximumDpcQueueDepth)) { - - if (Dpc->Number >= MAXIMUM_PROCESSORS) { - - KiIpiSendRequest(1 << (Dpc->Number - MAXIMUM_PROCESSORS), IPI_DPC); - } else { - - KiIpiSendRequest(1 << Dpc->Number, IPI_DPC); + if (!InterlockedCompareExchangePointer(&Dpc->DpcData, DpcData, NULL)) + { + /* Now we can play with the DPC safely */ + Dpc->SystemArgument1 = SystemArgument1; + Dpc->SystemArgument2 = SystemArgument2; + DpcData->DpcQueueDepth++; + DpcData->DpcCount++; + DpcConfigured = TRUE; + + /* Check if this is a high importance DPC */ + if (Dpc->Importance == HighImportance) + { + /* Pre-empty other DPCs */ + InsertHeadList(&DpcData->DpcListHead, &Dpc->DpcListEntry); + } + else + { + /* Add it at the end */ + InsertTailList(&DpcData->DpcListHead, &Dpc->DpcListEntry); + } + + /* Check if this is the DPC on the threaded list */ + if (&Prcb->DpcData[DPC_THREADED].DpcListHead == &DpcData->DpcListHead) + { + /* Make sure a threaded DPC isn't already active */ + if (!(Prcb->DpcThreadActive) && (!Prcb->DpcThreadRequested)) + { + /* FIXME: Setup Threaded DPC */ + ASSERT(FALSE); + } + } + else + { + /* Make sure a DPC isn't executing already */ + if ((!Prcb->DpcRoutineActive) && (!Prcb->DpcInterruptRequested)) + { + /* Check if this is the same CPU */ + if (Prcb != CurrentPrcb) + { + /* + * Check if the DPC is of high importance or above the + * maximum depth. If it is, then make sure that the CPU + * isn't idle, or that it's sleeping. + */ + if (((Dpc->Importance == HighImportance) || + (DpcData->DpcQueueDepth >= + Prcb->MaximumDpcQueueDepth)) && + (!(AFFINITY_MASK(Cpu) & IdleProcessorMask) || + (Prcb->Sleeping))) + { + /* Set interrupt requested */ + Prcb->DpcInterruptRequested = TRUE; + + /* Set DPC inserted */ + DpcInserted = TRUE; + } } - + else + { + /* Check if the DPC is of anything but low importance */ + if ((Dpc->Importance != LowImportance) || + (DpcData->DpcQueueDepth >= + Prcb->MaximumDpcQueueDepth) || + (Prcb->DpcRequestRate < Prcb->MinimumDpcRate)) + { + /* Set interrupt requested */ + Prcb->DpcInterruptRequested = TRUE; + + /* Set DPC inserted */ + DpcInserted = TRUE; + } + } } - } else { - - /* Request an Interrupt only if the DPC isn't low priority */ - if ((Dpc->Importance != LowImportance) || - (Prcb->DpcData[0].DpcQueueDepth >= Prcb->MaximumDpcQueueDepth) || - (Prcb->DpcRequestRate < Prcb->MinimumDpcRate)) { - - /* Request Interrupt */ - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - Prcb->DpcInterruptRequested = TRUE; - } - } -#else - DPRINT("Requesting Interrupt. Importance: %x. QueueDepth: %x. MaxQueue: %x . RequestRate: %x. MinRate:%x \n", Dpc->Importance, Prcb->DpcData[0].DpcQueueDepth, Prcb->MaximumDpcQueueDepth, Prcb->DpcRequestRate, Prcb->MinimumDpcRate); - - /* Request an Interrupt only if the DPC isn't low priority */ - if ((Dpc->Importance != LowImportance) || - (Prcb->DpcData[0].DpcQueueDepth >= Prcb->MaximumDpcQueueDepth) || - (Prcb->DpcRequestRate < Prcb->MinimumDpcRate)) { - - /* Request Interrupt */ - DPRINT("Requesting Interrupt\n"); + } + } + + /* Release the lock */ + KiReleaseSpinLock(&DpcData->DpcLock); + + /* Check if the DPC was inserted */ + if (DpcInserted) + { + /* Check if this was SMP */ + if (Prcb != CurrentPrcb) + { + /* It was, request and IPI */ + KiIpiSendRequest(AFFINITY_MASK(Cpu), IPI_DPC); + } + else + { + /* It wasn't, request an interrupt from HAL */ HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - Prcb->DpcInterruptRequested = TRUE; - } -#endif - } -#ifdef CONFIG_SMP - KiReleaseSpinLock(&Prcb->DpcData[0].DpcLock); -#endif + } + } + /* Lower IRQL */ KeLowerIrql(OldIrql); - return(TRUE); -} - -/* - * @implemented - * - * FUNCTION: - * Removes DPC object from the system dpc queue - * ARGUMENTS: - * Dpc = Pointer to DPC to remove from the queue. - * RETURNS: - * TRUE if the DPC was in the queue - * FALSE otherwise + return DpcConfigured; +} + +/* + * @implemented */ BOOLEAN -STDCALL -KeRemoveQueueDpc(PKDPC Dpc) -{ - BOOLEAN WasInQueue; - KIRQL OldIrql; - - /* Raise IRQL */ - DPRINT("Removing DPC: %x\n", Dpc); - KeRaiseIrql(HIGH_LEVEL, &OldIrql); -#ifdef CONFIG_SMP - KiAcquireSpinLock(&((PKDPC_DATA)Dpc->DpcData)->DpcLock); -#endif - - /* First make sure the DPC lock isn't being held */ - WasInQueue = Dpc->DpcData ? TRUE : FALSE; - if (Dpc->DpcData) { - - /* Remove the DPC */ - ((PKDPC_DATA)Dpc->DpcData)->DpcQueueDepth--; - RemoveEntryList(&Dpc->DpcListEntry); - - } -#ifdef CONFIG_SMP - KiReleaseSpinLock(&((PKDPC_DATA)Dpc->DpcData)->DpcLock); -#endif +NTAPI +KeRemoveQueueDpc(IN PKDPC Dpc) +{ + PKDPC_DATA DpcData; + UCHAR DpcType; + ASSERT_DPC(Dpc); + + /* Disable interrupts */ + Ke386DisableInterrupts(); + + /* Get DPC data and type */ + DpcType = Dpc->Type; + DpcData = Dpc->DpcData; + if (DpcData) + { + /* Acquire the DPC lock */ + KiAcquireSpinLock(&DpcData->DpcLock); + + /* Make sure that the data didn't change */ + if (DpcData == Dpc->DpcData) + { + /* Remove the DPC */ + DpcData->DpcQueueDepth--; + RemoveEntryList(&Dpc->DpcListEntry); + Dpc->DpcData = NULL; + } + + /* Release the lock */ + KiReleaseSpinLock(&DpcData->DpcLock); + } + + /* Re-enable interrupts */ + Ke386EnableInterrupts(); /* Return if the DPC was in the queue or not */ - KeLowerIrql(OldIrql); - return WasInQueue; -} - -/* - * @implemented - */ -VOID -STDCALL + return DpcData ? TRUE : FALSE; +} + +/* + * @implemented + */ +VOID +NTAPI KeFlushQueuedDpcs(VOID) -/* - * FUNCTION: - * Called to Deliver DPCs if any are pending. - * NOTES: - * Called when deleting a Driver. - */ -{ +{ + PAGED_CODE(); + /* Request an interrupt if needed */ + DPRINT1("%s - FIXME!!!\n", __FUNCTION__); if (KeGetCurrentPrcb()->DpcData[0].DpcQueueDepth) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } @@ -340,59 +279,37 @@ * @implemented */ BOOLEAN -STDCALL -KeIsExecutingDpc( - VOID -) +NTAPI +KeIsExecutingDpc(VOID) { /* Return if the Dpc Routine is active */ return KeGetCurrentPrcb()->DpcRoutineActive; } /* - * FUNCTION: Specifies the DPCs importance - * ARGUMENTS: - * Dpc = Initalizes DPC - * Importance = DPC importance - * RETURNS: None - * - * @implemented - */ -VOID -STDCALL + * @implemented + */ +VOID +NTAPI KeSetImportanceDpc (IN PKDPC Dpc, - IN KDPC_IMPORTANCE Importance) + IN KDPC_IMPORTANCE Importance) { /* Set the DPC Importance */ + ASSERT_DPC(Dpc); Dpc->Importance = Importance; } /* * @implemented - * - * FUNCTION: Specifies on which processor the DPC will run - * ARGUMENTS: - * Dpc = Initalizes DPC - * Number = Processor number - * RETURNS: None - */ -VOID -STDCALL + */ +VOID +NTAPI KeSetTargetProcessorDpc(IN PKDPC Dpc, IN CCHAR Number) { - /* Check how many CPUs are on the system */ - if (Number >= MAXIMUM_PROCESSORS) { - - /* No CPU Number */ - Dpc->Number = 0; - - } else { - - /* Set the Number Specified */ - ASSERT(Number < KeNumberProcessors); - Dpc->Number = Number + MAXIMUM_PROCESSORS; - } + /* Set a target CPU */ + ASSERT_DPC(Dpc); + Dpc->Number = Number + MAXIMUM_PROCESSORS; } /* Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Sat Sep 2 20:19:00 2006 @@ -17,11 +17,11 @@ /* GLOBALS *******************************************************************/ +PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS]; KNODE KiNode0; PKNODE KeNodeBlock[1]; UCHAR KeNumberNodes = 1; UCHAR KeProcessNodeSeed; -PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS]; ETHREAD KiInitialThread; EPROCESS KiInitialProcess; @@ -195,10 +195,10 @@ } /* Initialize DPC Fields */ - InitializeListHead(&Prcb->DpcData[0].DpcListHead); - KeInitializeSpinLock(&Prcb->DpcData[0].DpcLock); - Prcb->DpcData[0].DpcQueueDepth = 0; - Prcb->DpcData[0].DpcCount = 0; + InitializeListHead(&Prcb->DpcData[DPC_NORMAL].DpcListHead); + KeInitializeSpinLock(&Prcb->DpcData[DPC_NORMAL].DpcLock); + Prcb->DpcData[DPC_NORMAL].DpcQueueDepth = 0; + Prcb->DpcData[DPC_NORMAL].DpcCount = 0; Prcb->DpcRoutineActive = FALSE; Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; Prcb->MinimumDpcRate = KiMinimumDpcRate; @@ -245,11 +245,14 @@ Prcb->LockQueue[LockQueueAfdWorkQueueLock].Lock = &AfdWorkQueueSpinLock; Prcb->LockQueue[LockQueueUnusedSpare16].Next = NULL; Prcb->LockQueue[LockQueueUnusedSpare16].Lock = NULL; - for (i = LockQueueTimerTableLock; i < LockQueueMaximumLock; i++) - { - KeInitializeSpinLock(&KiTimerTableLock[i - 16]); + + /* Loop timer locks */ + for (i = 0; i < LOCK_QUEUE_TIMER_TABLE_LOCKS; i++) + { + /* Initialize the lock and setup the Queued Spinlock */ + KeInitializeSpinLock(&KiTimerTableLock[i]); Prcb->LockQueue[i].Next = NULL; - Prcb->LockQueue[i].Lock = &KiTimerTableLock[i - 16]; + Prcb->LockQueue[i].Lock = &KiTimerTableLock[i]; } /* Check if this is the boot CPU */ @@ -297,7 +300,7 @@ /* Set pointers to ourselves */ Pcr->Self = (PKPCR)Pcr; - Pcr->Prcb = &(Pcr->PrcbData); + Pcr->Prcb = &Pcr->PrcbData; /* Set the PCR Version */ Pcr->MajorVersion = PCR_MAJOR_VERSION; Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=2388… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c Sat Sep 2 20:19:00 2006 @@ -33,7 +33,7 @@ if (TargetSet & Current) { Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); - Ke386TestAndSetBit(IpiRequest, &Pcr->Prcb->IpiFrozen); + Ke386TestAndSetBit(IpiRequest, (PLONG)&Pcr->Prcb->IpiFrozen); HalRequestIpi(i); } } @@ -59,18 +59,18 @@ Prcb = KeGetCurrentPrcb(); - if (Ke386TestAndClearBit(IPI_APC, &Prcb->IpiFrozen)) + if (Ke386TestAndClearBit(IPI_APC, (PLONG)&Prcb->IpiFrozen)) { HalRequestSoftwareInterrupt(APC_LEVEL); } - if (Ke386TestAndClearBit(IPI_DPC, &Prcb->IpiFrozen)) + if (Ke386TestAndClearBit(IPI_DPC, (PLONG)&Prcb->IpiFrozen)) { Prcb->DpcInterruptRequested = TRUE; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } - if (Ke386TestAndClearBit(IPI_SYNCH_REQUEST, &Prcb->IpiFrozen)) + if (Ke386TestAndClearBit(IPI_SYNCH_REQUEST, (PLONG)&Prcb->IpiFrozen)) { (void)InterlockedDecrementUL(&Prcb->SignalDone->CurrentPacket[1]); if (InterlockedCompareExchangeUL(&Prcb->SignalDone->CurrentPacket[2], 0, 0)) @@ -91,7 +91,7 @@ } } ((VOID (STDCALL*)(PVOID))(Prcb->SignalDone->WorkerRoutine))(Prcb->SignalDone->CurrentPacket[0]); - Ke386TestAndClearBit(KeGetCurrentProcessorNumber(), &Prcb->SignalDone->TargetSet); + Ke386TestAndClearBit(KeGetCurrentProcessorNumber(), (PLONG)&Prcb->SignalDone->TargetSet); if (InterlockedCompareExchangeUL(&Prcb->SignalDone->CurrentPacket[2], 0, 0)) { #ifdef DBG @@ -140,7 +140,7 @@ { Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; while(0 != InterlockedCompareExchangeUL(&Prcb->SignalDone, (LONG)CurrentPrcb, 0)); - Ke386TestAndSetBit(IPI_SYNCH_REQUEST, &Prcb->IpiFrozen); + Ke386TestAndSetBit(IPI_SYNCH_REQUEST, (PLONG)&Prcb->IpiFrozen); if (Processor != CurrentPrcb->SetMember) { HalRequestIpi(i);

18 years, 3 months

[fireball] 23885: Add forgotten "xs-native.cpp" to the MSVC project of ROS Explorer

by fireball＠svn.reactos.org

Author: fireball Date: Sat Sep 2 15:27:36 2006 New Revision: 23885 URL: http://svn.reactos.org/svn/reactos?rev=23885&view=rev Log: Add forgotten "xs-native.cpp" to the MSVC project of ROS Explorer Modified: trunk/reactos/base/shell/explorer/explorer.vcproj Modified: trunk/reactos/base/shell/explorer/explorer.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.vcproj (original) +++ trunk/reactos/base/shell/explorer/explorer.vcproj Sat Sep 2 15:27:36 2006 @@ -1078,6 +1078,10 @@ RelativePath="utility\xmlstorage.h" > </File> + <File + RelativePath=".\utility\xs-native.cpp" + > + </File> </Filter> <Filter Name="resources"

18 years, 3 months

[hpoussin] 23884: Add the autoregister command in rbuild file if needed

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Sep 2 12:16:09 2006 New Revision: 23884 URL: http://svn.reactos.org/svn/reactos?rev=23884&view=rev Log: Add the autoregister command in rbuild file if needed Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=23884&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Sat Sep 2 12:16:09 2006 @@ -70,9 +70,27 @@ ) ) +SET WINE_HAS_DLLINSTALL=0 +SET WINE_HAS_DLLREGISTERSERVER=0 +FOR /F "usebackq tokens=3,4 delims= " %%l IN ("wine\dlls\%2\%2.spec") DO ( + IF NOT "%%l" == "" CALL :internal_analysespec %%l + IF NOT "%%m" == "" CALL :internal_analysespec %%m +) + >NUL COPY /Y wine\dlls\%2\makefile.in %WINE_TMPFILE1% ECHO ^<module name="%2" type="win32dll" baseaddress="${BASEADDRESS_!WINE_UPPERCASE!}" installbase="system32" installname="%2.dll" allowwarnings="true"^> +IF "%WINE_HAS_DLLINSTALL%" == "1" ( + IF "%WINE_HAS_DLLREGISTERSERVER%" == "1" ( + ECHO ^<autoregister infsection="OleControlDlls" type="Both" /^> + ) ELSE ( + ECHO ^<autoregister infsection="OleControlDlls" type="DllInstall" /^> + ) +) ELSE ( + IF "%WINE_HAS_DLLREGISTERSERVER%" == "1" ( + ECHO ^<autoregister infsection="OleControlDlls" type="DllRegisterServer" /^> + ) +) ECHO ^<importlibrary definition="%2.spec.def" /^> ECHO ^<include base="%2"^>.^</include^> ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> @@ -280,3 +298,9 @@ ) ELSE ( SET WINE_FULL_LINE=!WINE_FULL_LINE!!WINE_LINE! ) +GOTO :eof + +:internal_analysespec +SET WINE_LINE=%* +IF "%WINE_LINE:~0,10%" == "DllInstall" SET WINE_HAS_DLLINSTALL=1 +IF "%WINE_LINE:~0,17%" == "DllRegisterServer" SET WINE_HAS_DLLREGISTERSERVER=1

18 years, 3 months

[winesync] 23883: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Sat Sep 2 10:27:09 2006 New Revision: 23883 URL: http://svn.reactos.org/svn/reactos?rev=23883&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/wintrust/register.c (with props) trunk/reactos/dll/win32/wintrust/wintrust_ros.diff Removed: trunk/reactos/dll/win32/wintrust/Makefile.in Modified: trunk/reactos/dll/win32/wintrust/version.rc trunk/reactos/dll/win32/wintrust/wintrust.rbuild trunk/reactos/dll/win32/wintrust/wintrust.spec trunk/reactos/dll/win32/wintrust/wintrust_main.c trunk/reactos/media/doc/README.WINE Removed: trunk/reactos/dll/win32/wintrust/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/Makefil… ============================================================================== --- trunk/reactos/dll/win32/wintrust/Makefile.in (original) +++ trunk/reactos/dll/win32/wintrust/Makefile.in (removed) @@ -1,16 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = wintrust.dll -IMPORTLIB = libwintrust.$(IMPLIBEXT) -IMPORTS = kernel32 - -C_SRCS = wintrust_main.c - -RC_SRCS = \ - version.rc - -@MAKE_DLL_RULES@ - -### Dependencies: Added: trunk/reactos/dll/win32/wintrust/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/registe… ============================================================================== --- trunk/reactos/dll/win32/wintrust/register.c (added) +++ trunk/reactos/dll/win32/wintrust/register.c Sat Sep 2 10:27:09 2006 @@ -1,0 +1,126 @@ +/* + * Register related wintrust functions + * + * Copyright 2006 Paul Vriens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +#include "guiddef.h" +#include "wintrust.h" +#include "softpub.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintrust); + +/*********************************************************************** + * WintrustAddActionID (WINTRUST.@) + */ +BOOL WINAPI WintrustAddActionID( GUID* pgActionID, DWORD fdwFlags, + CRYPT_REGISTER_ACTIONID* psProvInfo) +{ + FIXME("%p %lx %p\n", pgActionID, fdwFlags, psProvInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * WintrustRemoveActionID (WINTRUST.@) + */ +BOOL WINAPI WintrustRemoveActionID( GUID* pgActionID ) +{ + FIXME("(%s)\n", debugstr_guid(pgActionID)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * DllRegisterServer (WINTRUST.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (WINTRUST.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * SoftpubDllRegisterServer (WINTRUST.@) + */ +HRESULT WINAPI SoftpubDllRegisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * SoftpubDllUnregisterServer (WINTRUST.@) + */ +HRESULT WINAPI SoftpubDllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * mscat32DllRegisterServer (WINTRUST.@) + */ +HRESULT WINAPI mscat32DllRegisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * mscat32DllUnregisterServer (WINTRUST.@) + */ +HRESULT WINAPI mscat32DllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * mssip32DllRegisterServer (WINTRUST.@) + */ +HRESULT WINAPI mssip32DllRegisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * mssip32DllUnregisterServer (WINTRUST.@) + */ +HRESULT WINAPI mssip32DllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} Propchange: trunk/reactos/dll/win32/wintrust/register.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/wintrust/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/version… ============================================================================== --- trunk/reactos/dll/win32/wintrust/version.rc (original) +++ trunk/reactos/dll/win32/wintrust/version.rc Sat Sep 2 10:27:09 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WINE_FILENAME_STR "wintrust.dll" Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.rbuild (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.rbuild Sat Sep 2 10:27:09 2006 @@ -1,11 +1,18 @@ -<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> +<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true"> <importlibrary definition="wintrust.spec.def" /> <include base="wintrust">.</include> <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> <library>wine</library> + <library>crypt32</library> + <library>kernel32</library> <library>ntdll</library> + <file>register.c</file> <file>wintrust_main.c</file> <file>version.rc</file> <file>wintrust.spec</file> Modified: trunk/reactos/dll/win32/wintrust/wintrust.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.spec (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.spec Sat Sep 2 10:27:09 2006 @@ -3,7 +3,7 @@ @ stdcall CryptCATAdminAcquireContext(long ptr long) @ stub CryptCATAdminAddCatalog @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) -@ stub CryptCATAdminEnumCatalogFromHash +@ stdcall CryptCATAdminEnumCatalogFromHash(long ptr long long ptr) @ stub CryptCATAdminPauseServiceForBackup @ stub CryptCATAdminReleaseCatalogContext @ stdcall CryptCATAdminReleaseContext(long long) @@ -60,8 +60,8 @@ @ stub SoftpubCheckCert @ stub SoftpubCleanup @ stub SoftpubDefCertInit -@ stub SoftpubDllRegisterServer -@ stub SoftpubDllUnregisterServer +@ stdcall SoftpubDllRegisterServer() +@ stdcall SoftpubDllUnregisterServer() @ stub SoftpubDumpStructure @ stub SoftpubFreeDefUsageCallData @ stub SoftpubInitialize @@ -71,7 +71,7 @@ @ stub TrustDecode @ stub TrustFindIssuerCertificate @ stub TrustFreeDecode -@ stub TrustIsCertificateSelfSigned +@ stdcall TrustIsCertificateSelfSigned(ptr) @ stub TrustOpenStores @ stub WTHelperCertFindIssuerCertificate @ stub WTHelperCertIsSelfSigned @@ -115,10 +115,10 @@ @ stub WintrustCertificateTrust @ stub WintrustGetDefaultForUsage @ stdcall WintrustGetRegPolicyFlags(ptr) -@ stub WintrustLoadFunctionPointers -@ stub WintrustRemoveActionID +@ stdcall WintrustLoadFunctionPointers(ptr ptr) +@ stdcall WintrustRemoveActionID(ptr) @ stdcall WintrustSetRegPolicyFlags(long) -@ stub mscat32DllRegisterServer -@ stub mscat32DllUnregisterServer -@ stub mssip32DllRegisterServer -@ stub mssip32DllUnregisterServer +@ stdcall mscat32DllRegisterServer() +@ stdcall mscat32DllUnregisterServer() +@ stdcall mssip32DllRegisterServer() +@ stdcall mssip32DllUnregisterServer() Modified: trunk/reactos/dll/win32/wintrust/wintrust_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_main.c (original) +++ trunk/reactos/dll/win32/wintrust/wintrust_main.c Sat Sep 2 10:27:09 2006 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "config.h" @@ -25,6 +25,7 @@ #include "winerror.h" #include "guiddef.h" #include "wintrust.h" +#include "softpub.h" #include "mscat.h" #include "objbase.h" @@ -32,8 +33,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); + +/*********************************************************************** + * DllMain (WINTRUST.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + /*********************************************************************** * CryptCATAdminAcquireContext (WINTRUST.@) + * + * Get a catalog administrator context handle. + * + * PARAMS + * catAdmin [O] Pointer to the context handle. + * sysSystem [I] Pointer to a GUID for the needed subsystem. + * dwFlags [I] Reserved. + * + * RETURNS + * Success: TRUE. catAdmin contains the context handle. + * Failure: FAIL. + * */ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN* catAdmin, const GUID *sysSystem, DWORD dwFlags ) @@ -55,7 +85,32 @@ } /*********************************************************************** + * CryptCATAdminEnumCatalogFromHash (WINTRUST.@) + */ +HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN hCatAdmin, + BYTE* pbHash, + DWORD cbHash, + DWORD dwFlags, + HCATINFO* phPrevCatInfo ) +{ + FIXME("%p %p %ld %ld %p\n", hCatAdmin, pbHash, cbHash, dwFlags, phPrevCatInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +/*********************************************************************** * CryptCATAdminReleaseContext (WINTRUST.@) + * + * Release a catalog administrator context handle. + * + * PARAMS + * catAdmin [I] Pointer to the context handle. + * dwFlags [I] Reserved. + * + * RETURNS + * Success: TRUE. + * Failure: FAIL. + * */ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) { @@ -65,12 +120,39 @@ } /*********************************************************************** + * TrustIsCertificateSelfSigned (WINTRUST.@) + */ +BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert ) +{ + BOOL ret; + + TRACE("%p\n", cert); + ret = CertCompareCertificateName(cert->dwCertEncodingType, + &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); + return ret; +} + +/*********************************************************************** * WinVerifyTrust (WINTRUST.@) + * + * Verifies an object by calling the specified trust provider. + * + * PARAMS + * hwnd [I] Handle to a caller window. + * ActionID [I] Pointer to a GUID that identifies the action to perform. + * ActionData [I] Information used by the trust provider to verify the object. + * + * RETURNS + * Success: Zero. + * Failure: A TRUST_E_* error code. + * + * NOTES + * Trust providers can be found at: + * HKLM\SOFTWARE\Microsoft\Cryptography\Providers\Trust\ */ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData ) { - static const GUID WINTRUST_ACTION_GENERIC_VERIFY_V2 = { 0xaac56b, 0xcd44, 0x11d0, - { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; + static const GUID gen_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); @@ -87,7 +169,7 @@ * */ - if (IsEqualCLSID(ActionID, &WINTRUST_ACTION_GENERIC_VERIFY_V2)) + if (IsEqualCLSID(ActionID, &gen_verify_v2)) return TRUST_E_PROVIDER_UNKNOWN; return ERROR_SUCCESS; @@ -125,12 +207,12 @@ } /*********************************************************************** - * WintrustAddActionID (WINTRUST.@) - */ -BOOL WINAPI WintrustAddActionID( GUID* pgActionID, DWORD fdwFlags, - CRYPT_REGISTER_ACTIONID* psProvInfo) -{ - FIXME("%p %lx %p\n", pgActionID, fdwFlags, psProvInfo); + * WintrustLoadFunctionPointers (WINTRUST.@) + */ +BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, + CRYPT_PROVIDER_FUNCTIONS* pPfns ) +{ + FIXME("%s %p\n", debugstr_guid(pgActionID), pPfns); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -152,21 +234,3 @@ FIXME("stub: %lx\n", dwPolicyFlags); return TRUE; } - -/*********************************************************************** - * DllRegisterServer (WINTRUST.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - FIXME("stub\n"); - return S_OK; -} - -/*********************************************************************** - * DllUnregisterServer (WINTRUST.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - FIXME("stub\n"); - return S_OK; -} Added: trunk/reactos/dll/win32/wintrust/wintrust_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust_ros.diff (added) +++ trunk/reactos/dll/win32/wintrust/wintrust_ros.diff Sat Sep 2 10:27:09 2006 @@ -1,0 +1,31 @@ +Index: wintrust_main.c +=================================================================== +--- wintrust_main.c (revision 23867) ++++ wintrust_main.c (working copy) +@@ -152,7 +152,26 @@ + */ + LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData ) + { ++ static const GUID gen_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; ++ + FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); ++ ++ /* Trust providers can be found at: ++ * HKLM\SOFTWARE\Microsoft\Cryptography\Providers\Trust\CertCheck\ ++ * ++ * Process Explorer expects a correct implementation, so we ++ * return TRUST_E_PROVIDER_UNKNOWN. ++ * ++ * Girotel needs ERROR_SUCCESS. ++ * ++ * For now return TRUST_E_PROVIDER_UNKNOWN only when ++ * ActionID = WINTRUST_ACTION_GENERIC_VERIFY_V2. ++ * ++ */ ++ ++ if (IsEqualCLSID(ActionID, &gen_verify_v2)) ++ return TRUST_E_PROVIDER_UNKNOWN; ++ + return ERROR_SUCCESS; + } + Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Sat Sep 2 10:27:09 2006 @@ -80,7 +80,7 @@ reactos/dll/win32/uxtheme # Autosync reactos/dll/win32/version # Synced at 20060509 reactos/dll/win32/wininet # Synced to Wine-0_9_10 -reactos/dll/win32/wintrust # Synced to Wine-0_9_10 +reactos/dll/win32/wintrust # Autosync reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628

18 years, 3 months

[winesync] 23882: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Sat Sep 2 10:24:20 2006 New Revision: 23882 URL: http://svn.reactos.org/svn/reactos?rev=23882&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/advpack/advpack.spec (with props) trunk/reactos/dll/win32/advpack/advpack_private.h (with props) trunk/reactos/dll/win32/advpack/files.c (with props) trunk/reactos/dll/win32/advpack/install.c (with props) trunk/reactos/dll/win32/advpack/reg.c (with props) Removed: trunk/reactos/dll/win32/advpack/advpack.def trunk/reactos/dll/win32/advpack/advpack.h trunk/reactos/dll/win32/advpack/advpack.rc trunk/reactos/dll/win32/advpack/stubs.c Modified: trunk/reactos/dll/win32/advpack/advpack.c trunk/reactos/dll/win32/advpack/advpack.rbuild trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… Removed: trunk/reactos/dll/win32/advpack/advpack.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… Removed: trunk/reactos/dll/win32/advpack/advpack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… Modified: trunk/reactos/dll/win32/advpack/advpack.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… Removed: trunk/reactos/dll/win32/advpack/advpack.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… Added: trunk/reactos/dll/win32/advpack/advpack.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… Added: trunk/reactos/dll/win32/advpack/advpack_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack_… Added: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… Added: trunk/reactos/dll/win32/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.… Added: trunk/reactos/dll/win32/advpack/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/reg.c?re… Removed: trunk/reactos/dll/win32/advpack/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/stubs.c?… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

18 years, 3 months

[ion] 23881: - Move machine-specific initializations to KeInit2. - Initialize bugcheck messages much earlier, separate clock initialization from KeInit2. - Completely move out and isolate ROS/FREELDR PE loading hacks to KiRosPrepareForSystemStartup so that KiSystemStartup is clean of them.

by ion＠svn.reactos.org

Author: ion Date: Sat Sep 2 09:10:16 2006 New Revision: 23881 URL: http://svn.reactos.org/svn/reactos?rev=23881&view=rev Log: - Move machine-specific initializations to KeInit2. - Initialize bugcheck messages much earlier, separate clock initialization from KeInit2. - Completely move out and isolate ROS/FREELDR PE loading hacks to KiRosPrepareForSystemStartup so that KiSystemStartup is clean of them. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sat Sep 2 09:10:16 2006 @@ -506,6 +506,9 @@ /* Sets up the Text Sections of the Kernel and HAL for debugging */ LdrInit1(); + /* Setup bugcheck messages */ + KiInitializeBugCheck(); + /* Lower the IRQL to Dispatch Level */ KeLowerIrql(DISPATCH_LEVEL); @@ -526,7 +529,10 @@ /* Parse the Loaded Modules (by FreeLoader) and cache the ones we'll need */ ParseAndCacheLoadedModules(); - /* Initialize the Dispatcher, Clock and Bug Check Mechanisms. */ + /* Setup system time */ + KiInitializeSystemClock(); + + /* Initialize the second stage of the kernel */ KeInit2(); /* Bring back the IRQL to Passive */ 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 Sat Sep 2 09:10:16 2006 @@ -631,8 +631,7 @@ VOID NTAPI KiSystemStartup( - IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock, - IN ULONG DriverBase // FIXME: hackhack + IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock ); VOID Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Sat Sep 2 09:10:16 2006 @@ -83,11 +83,6 @@ RtlTimeFieldsToTime(&TimeFields, &SystemBootTime); /* Set up the Used Shared Data */ - SharedUserData->TickCountLowDeprecated = 0; - SharedUserData->TickCountMultiplier = 167783691; // 2^24 * 1193182 / 119310 - SharedUserData->InterruptTime.High2Time = 0; - SharedUserData->InterruptTime.LowPart = 0; - SharedUserData->InterruptTime.High1Time = 0; SharedUserData->SystemTime.High2Time = SystemBootTime.u.HighPart; SharedUserData->SystemTime.LowPart = SystemBootTime.u.LowPart; SharedUserData->SystemTime.High1Time = SystemBootTime.u.HighPart; Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Sat Sep 2 09:10:16 2006 @@ -27,6 +27,9 @@ extern LIST_ENTRY KiProcessListHead; extern ULONG Ke386GlobalPagesEnabled; +extern KGDTENTRY KiBootGdt[]; +extern PVOID trap_stack, init_stack; +extern KTSS KiBootTss; /* System-defined Spinlocks */ KSPIN_LOCK KiDispatcherLock; @@ -269,6 +272,7 @@ KeInitializeSpinLock(&MmNonPagedPoolLock); KeInitializeSpinLock(&NtfsStructLock); KeInitializeSpinLock(&AfdWorkQueueSpinLock); + KeInitializeDispatcher(); // ROS OLD DISPATCHER } } @@ -406,57 +410,6 @@ { /* FIXME */ DPRINT1("SMP Boot support not yet present\n"); - } - - /* Check if Fxsr was found */ - if (KeI386FxsrPresent) - { - /* Enable it. FIXME: Send an IPI */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); - - /* Check if XMM was found too */ - if (KeI386XMMIPresent) - { - /* Enable it: FIXME: Send an IPI. */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); - - /* FIXME: Implement and enable XMM Page Zeroing for Mm */ - } - } - - if (KeFeatureBits & KF_GLOBAL_PAGE) - { - ULONG Flags; - /* Enable global pages */ - Ke386GlobalPagesEnabled = TRUE; - Ke386SaveFlags(Flags); - Ke386DisableInterrupts(); - Ke386SetCr4(Ke386GetCr4() | X86_CR4_PGE); - Ke386RestoreFlags(Flags); - } - - if (KeFeatureBits & KF_FAST_SYSCALL) - { - extern void KiFastCallEntry(void); - - /* CS Selector of the target segment. */ - Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); - /* Target ESP. */ - Ke386Wrmsr(0x175, 0, 0); - /* Target EIP. */ - Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); - } - - /* Does the CPU Support 'prefetchnta' (SSE) */ - if(KeFeatureBits & KF_XMMI) - { - ULONG Protect; - - Protect = MmGetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal); - MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect | PAGE_IS_WRITABLE); - /* Replace the ret by a nop */ - *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; - MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect); } #if 0 @@ -534,17 +487,12 @@ VOID NTAPI -KiSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock, - IN ULONG DriverBase) // FIXME: hackhack +KiSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { /* Currently hacked for CPU 0 only */ ULONG Cpu = 0; PKIPCR Pcr = (PKIPCR)KPCR_BASE; PKPRCB Prcb; - ULONG DriverSize; - extern KGDTENTRY KiBootGdt[]; - extern PVOID trap_stack, init_stack; - extern KTSS KiBootTss; /* Initialize the PCR */ RtlZeroMemory(Pcr, PAGE_SIZE); @@ -572,14 +520,6 @@ KiInitializeGdt(NULL); Ki386BootInitializeTSS(); Ki386InitializeLdt(); - KeInitExceptions(); - KeInitInterrupts(); - - /* Load the Kernel with the PE Loader */ - LdrSafePEProcessModule((PVOID)KERNEL_BASE, - (PVOID)KERNEL_BASE, - (PVOID)DriverBase, - &DriverSize); /* Setup CPU-related fields */ Pcr->Number = Cpu; @@ -613,9 +553,54 @@ { ULONG Protect; - KiInitializeBugCheck(); - KeInitializeDispatcher(); - KiInitializeSystemClock(); + /* Check if Fxsr was found */ + if (KeI386FxsrPresent) + { + /* Enable it. FIXME: Send an IPI */ + Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); + + /* Check if XMM was found too */ + if (KeI386XMMIPresent) + { + /* Enable it: FIXME: Send an IPI. */ + Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); + + /* FIXME: Implement and enable XMM Page Zeroing for Mm */ + } + } + + if (KeFeatureBits & KF_GLOBAL_PAGE) + { + ULONG Flags; + /* Enable global pages */ + Ke386GlobalPagesEnabled = TRUE; + Ke386SaveFlags(Flags); + Ke386DisableInterrupts(); + Ke386SetCr4(Ke386GetCr4() | X86_CR4_PGE); + Ke386RestoreFlags(Flags); + } + + if (KeFeatureBits & KF_FAST_SYSCALL) + { + extern void KiFastCallEntry(void); + + /* CS Selector of the target segment. */ + Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); + /* Target ESP. */ + Ke386Wrmsr(0x175, 0, 0); + /* Target EIP. */ + Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); + } + + /* Does the CPU Support 'prefetchnta' (SSE) */ + if(KeFeatureBits & KF_XMMI) + { + Protect = MmGetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal); + MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect | PAGE_IS_WRITABLE); + /* Replace the ret by a nop */ + *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; + MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect); + } /* Set IDT to writable */ Protect = MmGetPageProtect(NULL, (PVOID)KiIdt); Modified: trunk/reactos/ntoskrnl/ke/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/main.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/ke/main.c (original) +++ trunk/reactos/ntoskrnl/ke/main.c Sat Sep 2 09:10:16 2006 @@ -224,8 +224,18 @@ FirstKrnlPhysAddr = KeLoaderModules[0].ModStart - KERNEL_BASE + 0x200000; LastKrnlPhysAddr = LastKernelAddress - KERNEL_BASE + 0x200000; + /* Setup the IDT */ + KeInitExceptions(); // ONCE HACK BELOW IS GONE, MOVE TO KISYSTEMSTARTUP! + KeInitInterrupts(); // ROS HACK DEPRECATED SOON BY NEW HAL + + /* Load the Kernel with the PE Loader */ + LdrSafePEProcessModule((PVOID)KERNEL_BASE, + (PVOID)KERNEL_BASE, + (PVOID)DriverBase, + &DriverSize); + /* Do general System Startup */ - KiSystemStartup(LoaderBlock, DriverBase); + KiSystemStartup(LoaderBlock); } /* EOF */

18 years, 3 months

[ion] 23880: - More Initialization changes: - Initialize bugcheck lists, timer DPC, profile list/locks, timer lists, the swap lists and syscall table as part of KiInitSystem (portable). - Add more initialization for the initial/idle process+thread (some code disabled due to dispatcher problems). - Add code to support future Timer implementation (based on tick-hashes) - Separate post-boostrap initialization code in KiInitializeKernel. - Add some support for future SMP paths. - Create a DPC stack.

by ion＠svn.reactos.org

Author: ion Date: Sat Sep 2 08:40:09 2006 New Revision: 23880 URL: http://svn.reactos.org/svn/reactos?rev=23880&view=rev Log: - More Initialization changes: - Initialize bugcheck lists, timer DPC, profile list/locks, timer lists, the swap lists and syscall table as part of KiInitSystem (portable). - Add more initialization for the initial/idle process+thread (some code disabled due to dispatcher problems). - Add code to support future Timer implementation (based on tick-hashes) - Separate post-boostrap initialization code in KiInitializeKernel. - Add some support for future SMP paths. - Create a DPC stack. - Changes based on WI4 and my automated parsing tool. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sat Sep 2 08:40:09 2006 @@ -25,9 +25,6 @@ extern ULONG_PTR LastKernelAddress; extern LOADER_MODULE KeLoaderModules[64]; extern PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; -extern LIST_ENTRY KiProfileListHead; -extern LIST_ENTRY KiProfileSourceListHead; -extern KSPIN_LOCK KiProfileLock; BOOLEAN SetupMode = TRUE; BOOLEAN NoGuiBoot = FALSE; @@ -503,6 +500,9 @@ /* Check if the structures match the ASM offset constants */ ExecuteRuntimeAsserts(); + /* Initialize HAL */ + HalInitSystem (0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); + /* Sets up the Text Sections of the Kernel and HAL for debugging */ LdrInit1(); @@ -531,11 +531,6 @@ /* Bring back the IRQL to Passive */ KeLowerIrql(PASSIVE_LEVEL); - - /* Initialize Profiling */ - InitializeListHead(&KiProfileListHead); - InitializeListHead(&KiProfileSourceListHead); - KeInitializeSpinLock(&KiProfileLock); /* Initialize resources */ ExpResourceInitialization(); 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 Sat Sep 2 08:40:09 2006 @@ -48,6 +48,12 @@ PKINTERRUPT_ROUTINE ChainedDispatch; PKINTERRUPT_ROUTINE *FlatDispatch; } DISPATCH_INFO, *PDISPATCH_INFO; + +typedef struct _KTIMER_TABLE_ENTRY +{ + LIST_ENTRY Entry; + ULARGE_INTEGER Time; +} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; typedef PCHAR (NTAPI *PKE_BUGCHECK_UNICODE_TO_ANSI)( @@ -94,6 +100,19 @@ extern ULONG KiMinimumDpcRate; extern ULONG KiAdjustDpcThreshold; extern ULONG KiIdealDpcRate; +extern LARGE_INTEGER KiTimeIncrementReciprocal; +extern UCHAR KiTimeIncrementShiftCount; +extern LIST_ENTRY BugcheckCallbackListHead, BugcheckReasonCallbackListHead; +extern KSPIN_LOCK BugCheckCallbackLock; +extern KDPC KiExpireTimerDpc; +extern KTIMER_TABLE_ENTRY KiTimerTableListHead[TIMER_TABLE_SIZE]; +extern LIST_ENTRY KiTimerListHead; +extern KMUTEX KiGenericCallDpcMutex; +extern LIST_ENTRY KiProfileListHead, KiProfileSourceListHead; +extern KSPIN_LOCK KiProfileLock; +extern LIST_ENTRY KiProcessInSwapListHead, KiProcessOutSwapListHead; +extern LIST_ENTRY KiStackInSwapListHead; +extern KEVENT KiSwapEvent; /* MACROS *************************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2388… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Sat Sep 2 08:40:09 2006 @@ -28,6 +28,7 @@ LIST_ENTRY BugcheckCallbackListHead; LIST_ENTRY BugcheckReasonCallbackListHead; +KSPIN_LOCK BugCheckCallbackLock; ULONG KeBugCheckActive, KeBugCheckOwner; LONG KeBugCheckOwnerRecursionCount; PRTL_MESSAGE_RESOURCE_DATA KiBugCodeMessages; @@ -125,10 +126,6 @@ LDR_RESOURCE_INFO ResourceInfo; PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; NTSTATUS Status; - - /* Initialize Callbadk Listhead and State */ - InitializeListHead(&BugcheckCallbackListHead); - InitializeListHead(&BugcheckReasonCallbackListHead); /* Cache the Bugcheck Message Strings. Prepare the Lookup Data */ ResourceInfo.Type = 11; Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Sat Sep 2 08:40:09 2006 @@ -77,9 +77,6 @@ KiInitializeSystemClock(VOID) { TIME_FIELDS TimeFields; - - InitializeListHead(&KiTimerListHead); - KeInitializeDpc(&KiExpireTimerDpc, (PKDEFERRED_ROUTINE)KiExpireTimers, 0); /* Calculate the starting time for the system clock */ HalQueryRealTimeClock(&TimeFields); Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2388… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Sat Sep 2 08:40:09 2006 @@ -29,6 +29,7 @@ ULONG KiMinimumDpcRate = 3; ULONG KiAdjustDpcThreshold = 20; ULONG KiIdealDpcRate = 20; +KMUTEX KiGenericCallDpcMutex; /* TYPES *******************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Sat Sep 2 08:40:09 2006 @@ -13,6 +13,7 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> +#include <internal/napi.h> /* GLOBALS *******************************************************************/ @@ -23,6 +24,8 @@ PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS]; ETHREAD KiInitialThread; EPROCESS KiInitialProcess; + +extern LIST_ENTRY KiProcessListHead; extern ULONG Ke386GlobalPagesEnabled; /* System-defined Spinlocks */ @@ -44,12 +47,132 @@ KSPIN_LOCK KiTimerTableLock[16]; KSPIN_LOCK KiReverseStallIpiLock; +KSPIN_LOCK KiFreezeExecutionLock; +KSPIN_LOCK Ki486CompatibilityLock; + #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, KeInit1) #pragma alloc_text(INIT, KeInit2) #endif /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KiInitSystem(VOID) +{ + ULONG i; + + /* Initialize Bugcheck Callback data */ + InitializeListHead(&BugcheckCallbackListHead); + InitializeListHead(&BugcheckReasonCallbackListHead); + KeInitializeSpinLock(&BugCheckCallbackLock); + + /* Initialize the Timer Expiration DPC */ + KeInitializeDpc(&KiExpireTimerDpc, KiExpireTimers, NULL); + KeSetTargetProcessorDpc(&KiExpireTimerDpc, 0); + + /* Initialize Profiling data */ + KeInitializeSpinLock(&KiProfileLock); + InitializeListHead(&KiProfileListHead); + InitializeListHead(&KiProfileSourceListHead); + + /* Loop the timer table */ + for (i = 0; i < TIMER_TABLE_SIZE; i++) + { + /* Initialize the list and entries */ + InitializeListHead(&KiTimerTableListHead[i].Entry); + KiTimerTableListHead[i].Time.HighPart = 0xFFFFFFFF; + KiTimerTableListHead[i].Time.LowPart = 0; + } + + /* Initialize old-style list */ + InitializeListHead(&KiTimerListHead); + + /* Initialize the Swap event and all swap lists */ + KeInitializeEvent(&KiSwapEvent, SynchronizationEvent, FALSE); + InitializeListHead(&KiProcessInSwapListHead); + InitializeListHead(&KiProcessOutSwapListHead); + InitializeListHead(&KiStackInSwapListHead); + + /* Initialize the mutex for generic DPC calls */ + KeInitializeMutex(&KiGenericCallDpcMutex, 0); + + /* Initialize the syscall table */ + KeServiceDescriptorTable[0].Base = MainSSDT; + KeServiceDescriptorTable[0].Count = NULL; + KeServiceDescriptorTable[0].Limit = NUMBER_OF_SYSCALLS; + KeServiceDescriptorTable[1].Limit = 0; + KeServiceDescriptorTable[0].Number = MainSSPT; + + /* Copy the the current table into the shadow table for win32k */ + RtlCopyMemory(KeServiceDescriptorTableShadow, + KeServiceDescriptorTable, + sizeof(KeServiceDescriptorTable)); +} + +LARGE_INTEGER +NTAPI +KiComputeReciprocal(IN LONG Divisor, + OUT PUCHAR Shift) +{ + LARGE_INTEGER Reciprocal = {{0}}; + LONG BitCount = 0, Remainder = 1; + + /* Start by calculating the remainder */ + while (Reciprocal.HighPart >= 0) + { + /* Increase the loop (bit) count */ + BitCount++; + + /* Calculate the current fraction */ + Reciprocal.HighPart = (Reciprocal.HighPart << 1) | + (Reciprocal.LowPart >> 31); + Reciprocal.LowPart <<= 1; + + /* Double the remainder and see if we went past the divisor */ + Remainder <<= 1; + if (Remainder >= Divisor) + { + /* Set the low-bit and calculate the new remainder */ + Remainder -= Divisor; + Reciprocal.LowPart |= 1; + } + } + + /* Check if we have a remainder */ + if (Remainder) + { + /* Check if the current fraction value is too large */ + if ((Reciprocal.LowPart == 0xFFFFFFFF) && + (Reciprocal.HighPart == 0xFFFFFFFF)) + { + /* Set the high bit and reduce the bit count */ + Reciprocal.LowPart = 0; + Reciprocal.HighPart = 0x80000000; + BitCount--; + } + else + { + /* Check if only the lowest bits got too large */ + if (Reciprocal.LowPart == 0xFFFFFFFF) + { + /* Reset them and increase the high bits instead */ + Reciprocal.LowPart = 0; + Reciprocal.HighPart++; + } + else + { + /* All is well, increase the low bits */ + Reciprocal.LowPart++; + } + } + } + + /* Now calculate the actual shift and return the reciprocal */ + *Shift = (UCHAR)BitCount - 64; + return Reciprocal; +} VOID NTAPI @@ -78,7 +201,7 @@ Prcb->MinimumDpcRate = KiMinimumDpcRate; Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; KeInitializeDpc(&Prcb->CallDpc, NULL, NULL); - //KeSetTargetProcessorDpc(&Prcb->CallDpc, Number); + KeSetTargetProcessorDpc(&Prcb->CallDpc, Number); KeSetImportanceDpc(&Prcb->CallDpc, HighImportance); /* Initialize the Wait List Head */ @@ -202,6 +325,215 @@ VOID NTAPI +KiInitializeKernel(IN PKPROCESS InitProcess, + IN PKTHREAD InitThread, + IN PVOID IdleStack, + IN PKPRCB Prcb, + IN CCHAR Number, + IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) +{ + BOOLEAN NpxPresent; + ULONG FeatureBits; + LARGE_INTEGER PageDirectory; + PVOID DpcStack; + + /* Detect and set the CPU Type */ + KiSetProcessorType(); + + /* 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); + + /* Get the processor features for the CPU */ + FeatureBits = KiGetFeatureBits(); + + /* Save feature bits */ + Prcb->FeatureBits = FeatureBits; + + /* Get cache line information for this CPU */ + KiGetCacheInformation(); + + /* Initialize spinlocks and DPC data */ + KiInitSpinLocks(Prcb, Number); + + /* Check if this is the Boot CPU */ + if (!Number) + { + /* Set Node Data */ + KeNodeBlock[0] = &KiNode0; + Prcb->ParentNode = KeNodeBlock[0]; + KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; + + /* Set boot-level flags */ + KeI386NpxPresent = NpxPresent; + KeI386CpuType = Prcb->CpuType; + KeI386CpuStep = Prcb->CpuStep; + KeProcessorArchitecture = 0; + KeProcessorLevel = (USHORT)Prcb->CpuType; + if (Prcb->CpuID) KeProcessorRevision = Prcb->CpuStep; + KeFeatureBits = FeatureBits; + KeI386FxsrPresent = (KeFeatureBits & KF_FXSR) ? TRUE : FALSE; + KeI386XMMIPresent = (KeFeatureBits & KF_XMMI) ? TRUE : FALSE; + + /* Set the current MP Master KPRCB to the Boot PRCB */ + Prcb->MultiThreadSetMaster = Prcb; + + /* Initialize some spinlocks */ + KeInitializeSpinLock(&KiFreezeExecutionLock); + KeInitializeSpinLock(&Ki486CompatibilityLock); + + /* Initialize portable parts of the OS */ + KiInitSystem(); + + /* Initialize the Idle Process and the Process Listhead */ + InitializeListHead(&KiProcessListHead); + PageDirectory.QuadPart = 0; + KeInitializeProcess(InitProcess, + 0, + 0xFFFFFFFF, + PageDirectory); + InitProcess->QuantumReset = MAXCHAR; + } + else + { + /* FIXME */ + DPRINT1("SMP Boot support not yet present\n"); + } + + /* Check if Fxsr was found */ + if (KeI386FxsrPresent) + { + /* Enable it. FIXME: Send an IPI */ + Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); + + /* Check if XMM was found too */ + if (KeI386XMMIPresent) + { + /* Enable it: FIXME: Send an IPI. */ + Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); + + /* FIXME: Implement and enable XMM Page Zeroing for Mm */ + } + } + + if (KeFeatureBits & KF_GLOBAL_PAGE) + { + ULONG Flags; + /* Enable global pages */ + Ke386GlobalPagesEnabled = TRUE; + Ke386SaveFlags(Flags); + Ke386DisableInterrupts(); + Ke386SetCr4(Ke386GetCr4() | X86_CR4_PGE); + Ke386RestoreFlags(Flags); + } + + if (KeFeatureBits & KF_FAST_SYSCALL) + { + extern void KiFastCallEntry(void); + + /* CS Selector of the target segment. */ + Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); + /* Target ESP. */ + Ke386Wrmsr(0x175, 0, 0); + /* Target EIP. */ + Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); + } + + /* Does the CPU Support 'prefetchnta' (SSE) */ + if(KeFeatureBits & KF_XMMI) + { + ULONG Protect; + + Protect = MmGetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal); + MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect | PAGE_IS_WRITABLE); + /* Replace the ret by a nop */ + *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; + MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect); + } + +#if 0 + /* Setup the Idle Thread */ + KeInitializeThread(InitProcess, + InitThread, + NULL, + NULL, + NULL, + NULL, + NULL, + IdleStack); +#endif + InitThread->NextProcessor = Number; + InitThread->Priority = HIGH_PRIORITY; + InitThread->State = Running; + InitThread->Affinity = 1 << Number; + InitThread->WaitIrql = DISPATCH_LEVEL; + InitProcess->ActiveProcessors = 1 << Number; + + /* Set up the thread-related fields in the PRCB */ + //Prcb->CurrentThread = InitThread; + Prcb->NextThread = NULL; + //Prcb->IdleThread = InitThread; + + /* Initialize the Debugger */ + KdInitSystem (0, &KeLoaderBlock); + + /* Initialize the Kernel Executive */ + ExpInitializeExecutive(); + + /* Only do this on the boot CPU */ + if (!Number) + { + /* Calculate the time reciprocal */ + KiTimeIncrementReciprocal = + KiComputeReciprocal(KeMaximumIncrement, + &KiTimeIncrementShiftCount); + + /* Update DPC Values in case they got updated by the executive */ + Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; + Prcb->MinimumDpcRate = KiMinimumDpcRate; + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + + /* Allocate the DPC Stack */ + DpcStack = MmCreateKernelStack(FALSE); + if (!DpcStack) KeBugCheckEx(NO_PAGES_AVAILABLE, 1, 0, 0, 0); + 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); + } + } + + /* Free Initial Memory */ + MiFreeInitMemory(); + + while (1) + { + LARGE_INTEGER Timeout; + Timeout.QuadPart = 0x7fffffffffffffffLL; + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + } + + /* Bug Check and loop forever if anything failed */ + KEBUGCHECK(0); + for(;;); +} + +VOID +NTAPI KiSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock, IN ULONG DriverBase) // FIXME: hackhack { @@ -209,11 +541,9 @@ ULONG Cpu = 0; PKIPCR Pcr = (PKIPCR)KPCR_BASE; PKPRCB Prcb; - BOOLEAN NpxPresent; - ULONG FeatureBits; ULONG DriverSize; extern KGDTENTRY KiBootGdt[]; - extern PVOID trap_stack; + extern PVOID trap_stack, init_stack; extern KTSS KiBootTss; /* Initialize the PCR */ @@ -267,135 +597,13 @@ /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); - /* Detect and set the CPU Type */ - KiSetProcessorType(); - - /* 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); - - /* Get the processor features for the CPU */ - FeatureBits = KiGetFeatureBits(); - - /* Save feature bits */ - Prcb->FeatureBits = FeatureBits; - - /* Get cache line information for this CPU */ - KiGetCacheInformation(); - - /* Initialize spinlocks and DPC data */ - KiInitSpinLocks(Prcb, 0); - - /* Set Node Data */ - KeNodeBlock[0] = &KiNode0; - Prcb->ParentNode = KeNodeBlock[0]; - KeNodeBlock[0]->ProcessorMask = Prcb->SetMember; - - /* Set boot-level flags */ - KeI386NpxPresent = NpxPresent; - KeI386CpuType = Prcb->CpuType; - KeI386CpuStep = Prcb->CpuStep; - KeProcessorArchitecture = 0; - KeProcessorLevel = (USHORT)Prcb->CpuType; - if (Prcb->CpuID) KeProcessorRevision = Prcb->CpuStep; - KeFeatureBits = FeatureBits; - KeI386FxsrPresent = (KeFeatureBits & KF_FXSR) ? TRUE : FALSE; - KeI386XMMIPresent = (KeFeatureBits & KF_XMMI) ? TRUE : FALSE; - - /* Check if Fxsr was found */ - if (KeI386FxsrPresent) - { - /* Enable it. FIXME: Send an IPI */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSFXSR); - - /* Check if XMM was found too */ - if (KeI386XMMIPresent) - { - /* Enable it: FIXME: Send an IPI. */ - Ke386SetCr4(Ke386GetCr4() | X86_CR4_OSXMMEXCPT); - - /* FIXME: Implement and enable XMM Page Zeroing for Mm */ - } - } - - if (KeFeatureBits & KF_GLOBAL_PAGE) - { - ULONG Flags; - /* Enable global pages */ - Ke386GlobalPagesEnabled = TRUE; - Ke386SaveFlags(Flags); - Ke386DisableInterrupts(); - Ke386SetCr4(Ke386GetCr4() | X86_CR4_PGE); - Ke386RestoreFlags(Flags); - } - - if (KeFeatureBits & KF_FAST_SYSCALL) - { - extern void KiFastCallEntry(void); - - /* CS Selector of the target segment. */ - Ke386Wrmsr(0x174, KGDT_R0_CODE, 0); - /* Target ESP. */ - Ke386Wrmsr(0x175, 0, 0); - /* Target EIP. */ - Ke386Wrmsr(0x176, (ULONG_PTR)KiFastCallEntry, 0); - } - - /* Does the CPU Support 'prefetchnta' (SSE) */ - if(KeFeatureBits & KF_XMMI) - { - ULONG Protect; - - Protect = MmGetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal); - MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect | PAGE_IS_WRITABLE); - /* Replace the ret by a nop */ - *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; - MmSetPageProtect(NULL, (PVOID)RtlPrefetchMemoryNonTemporal, Protect); - } - - /* Initialize the Debugger */ - KdInitSystem (0, &KeLoaderBlock); - - /* Initialize HAL */ - HalInitSystem (0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); - - /* Initialize the Kernel Executive */ - ExpInitializeExecutive(); - - /* Create the IOPM Save Area */ - Ki386IopmSaveArea = ExAllocatePoolWithTag(NonPagedPool, - PAGE_SIZE * 2, - TAG('K', 'e', ' ', ' ')); - - /* Free Initial Memory */ - MiFreeInitMemory(); - - /* Never returns */ -#if 0 - /* FIXME: - * The initial thread isn't a real ETHREAD object, we cannot call PspExitThread. - */ - PspExitThread(STATUS_SUCCESS); -#else - while (1) - { - LARGE_INTEGER Timeout; - Timeout.QuadPart = 0x7fffffffffffffffLL; - KeDelayExecutionThread(KernelMode, FALSE, &Timeout); - } -#endif - - /* Bug Check and loop forever if anything failed */ - KEBUGCHECK(0); - for(;;); + /* Call main kernel intialization */ + KiInitializeKernel(&KiInitialProcess.Pcb, + &KiInitialThread.Tcb, + init_stack, + Prcb, + Cpu, + LoaderBlock); } VOID Modified: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/process.c (original) +++ trunk/reactos/ntoskrnl/ke/process.c Sat Sep 2 08:40:09 2006 @@ -10,26 +10,18 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -#include <internal/napi.h> #define NDEBUG #include <internal/debug.h> /* GLOBALS *****************************************************************/ -KSERVICE_TABLE_DESCRIPTOR -__declspec(dllexport) -KeServiceDescriptorTable[SSDT_MAX_ENTRIES] = -{ - { MainSSDT, NULL, NUMBER_OF_SYSCALLS, MainSSPT }, - { NULL, NULL, 0, NULL }, -}; - -KSERVICE_TABLE_DESCRIPTOR -KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES] = -{ - { MainSSDT, NULL, NUMBER_OF_SYSCALLS, MainSSPT }, - { NULL, NULL, 0, NULL }, -}; +LIST_ENTRY KiProcessListHead; +LIST_ENTRY KiProcessInSwapListHead, KiProcessOutSwapListHead; +LIST_ENTRY KiStackInSwapListHead; +KEVENT KiSwapEvent; + +KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[SSDT_MAX_ENTRIES]; +KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTableShadow[SSDT_MAX_ENTRIES]; /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timer.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timer.c (original) +++ trunk/reactos/ntoskrnl/ke/timer.c Sat Sep 2 08:40:09 2006 @@ -15,7 +15,10 @@ /* GLOBALS ****************************************************************/ +LARGE_INTEGER KiTimeIncrementReciprocal; +UCHAR KiTimeIncrementShiftCount; LIST_ENTRY KiTimerListHead; +KTIMER_TABLE_ENTRY KiTimerTableListHead[TIMER_TABLE_SIZE]; #define SYSTEM_TIME_UNITS_PER_MSEC (10000) /* PRIVATE FUNCTIONS ******************************************************/

18 years, 3 months

[ion] 23879: - More kernel initialization changes and cleanups. - Start support for an initial boot thread.

by ion＠svn.reactos.org

Author: ion Date: Sat Sep 2 06:59:44 2006 New Revision: 23879 URL: http://svn.reactos.org/svn/reactos?rev=23879&view=rev Log: - More kernel initialization changes and cleanups. - Start support for an initial boot thread. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Sat Sep 2 06:59:44 2006 @@ -503,9 +503,6 @@ /* Check if the structures match the ASM offset constants */ ExecuteRuntimeAsserts(); - /* Set 1 CPU for now, we'll increment this later */ - KeNumberProcessors = 1; - /* Sets up the Text Sections of the Kernel and HAL for debugging */ LdrInit1(); Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Sat Sep 2 06:59:44 2006 @@ -20,7 +20,9 @@ PKNODE KeNodeBlock[1]; UCHAR KeNumberNodes = 1; UCHAR KeProcessNodeSeed; -ULONG KiPcrInitDone = 0; +PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS]; +ETHREAD KiInitialThread; +EPROCESS KiInitialProcess; extern ULONG Ke386GlobalPagesEnabled; /* System-defined Spinlocks */ @@ -149,34 +151,88 @@ VOID NTAPI +KiInitializePcr(IN ULONG ProcessorNumber, + IN PKIPCR Pcr, + IN PKIDTENTRY Idt, + IN PKGDTENTRY Gdt, + IN PKTSS Tss, + IN PKTHREAD IdleThread, + IN PVOID DpcStack) +{ + /* Setup the TIB */ + Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; + Pcr->NtTib.StackBase = 0; + Pcr->NtTib.StackLimit = 0; + Pcr->NtTib.Self = 0; + + /* Set the Current Thread */ + //Pcr->PrcbData.CurrentThread = IdleThread; + + /* Set pointers to ourselves */ + Pcr->Self = (PKPCR)Pcr; + Pcr->Prcb = &(Pcr->PrcbData); + + /* Set the PCR Version */ + Pcr->MajorVersion = PCR_MAJOR_VERSION; + Pcr->MinorVersion = PCR_MINOR_VERSION; + + /* Set the PCRB Version */ + Pcr->PrcbData.MajorVersion = 1; + Pcr->PrcbData.MinorVersion = 1; + + /* Set the Build Type */ + Pcr->PrcbData.BuildType = 0; + + /* Set the Processor Number and current Processor Mask */ + Pcr->PrcbData.Number = (UCHAR)ProcessorNumber; + Pcr->PrcbData.SetMember = 1 << ProcessorNumber; + + /* Set the PRCB for this Processor */ + KiProcessorBlock[ProcessorNumber] = Pcr->Prcb; + + /* Start us out at PASSIVE_LEVEL */ + Pcr->Irql = PASSIVE_LEVEL; + + /* Set the GDI, IDT, TSS and DPC Stack */ + Pcr->GDT = (PVOID)Gdt; + Pcr->IDT = Idt; + Pcr->TSS = Tss; + Pcr->PrcbData.DpcStack = DpcStack; +} + +VOID +NTAPI KiSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock, IN ULONG DriverBase) // FIXME: hackhack { - PKIPCR KPCR; + /* Currently hacked for CPU 0 only */ + ULONG Cpu = 0; + PKIPCR Pcr = (PKIPCR)KPCR_BASE; PKPRCB Prcb; BOOLEAN NpxPresent; ULONG FeatureBits; ULONG DriverSize; - extern USHORT KiBootGdt[]; + extern KGDTENTRY KiBootGdt[]; + extern PVOID trap_stack; extern KTSS KiBootTss; /* Initialize the PCR */ - KPCR = (PKIPCR)KPCR_BASE; - Prcb = &KPCR->PrcbData; - memset(KPCR, 0, PAGE_SIZE); - KPCR->Self = (PKPCR)KPCR; - KPCR->Prcb = &KPCR->PrcbData; - KPCR->Irql = SYNCH_LEVEL; - KPCR->NtTib.Self = &KPCR->NtTib; - KPCR->NtTib.ExceptionList = (PVOID)-1; - KPCR->GDT = KiBootGdt; - KPCR->IDT = KiIdt; - KPCR->TSS = &KiBootTss; - KPCR->Number = 0; - KPCR->SetMember = 1 << 0; - KeActiveProcessors = 1 << 0; - KPCR->PrcbData.SetMember = 1 << 0; - KiPcrInitDone = 1; + RtlZeroMemory(Pcr, PAGE_SIZE); + KiInitializePcr(Cpu, + Pcr, + KiIdt, + KiBootGdt, + &KiBootTss, + &KiInitialThread.Tcb, + trap_stack); + Prcb = Pcr->Prcb; + + /* Set us as the current process */ + KiInitialThread.Tcb.ApcState.Process = &KiInitialProcess.Pcb; + + /* Clear DR6/7 to cleanup bootloader debugging */ + Pcr->PrcbData.ProcessorState.SpecialRegisters.KernelDr6 = 0; + Pcr->PrcbData.ProcessorState.SpecialRegisters.KernelDr7 = 0; /* * Low-level GDT, TSS and LDT Setup, most of which Freeldr should have done @@ -195,6 +251,22 @@ (PVOID)DriverBase, &DriverSize); + /* Setup CPU-related fields */ + Pcr->Number = Cpu; + Pcr->SetMember = 1 << Cpu; + Pcr->SetMemberCopy = 1 << Cpu; + Prcb->SetMember = 1 << Cpu; + + /* Initialize the Processor with HAL */ + HalInitializeProcessor(Cpu, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); + + /* Set active processors */ + KeActiveProcessors |= Pcr->SetMember; + KeNumberProcessors++; + + /* Raise to HIGH_LEVEL */ + KfRaiseIrql(HIGH_LEVEL); + /* Detect and set the CPU Type */ KiSetProcessorType(); @@ -295,9 +367,6 @@ /* Initialize HAL */ HalInitSystem (0, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); - /* Initialize the Processor with HAL */ - HalInitializeProcessor(KeNumberProcessors, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); - /* Initialize the Kernel Executive */ ExpInitializeExecutive(); Modified: trunk/reactos/ntoskrnl/ke/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/main.c?rev=238… ============================================================================== --- trunk/reactos/ntoskrnl/ke/main.c (original) +++ trunk/reactos/ntoskrnl/ke/main.c Sat Sep 2 06:59:44 2006 @@ -24,7 +24,7 @@ ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(4, 0); ULONG NtBuildNumber = KERNEL_VERSION_BUILD; ULONG NtGlobalFlag = 0; -CHAR KeNumberProcessors; +CHAR KeNumberProcessors; KAFFINITY KeActiveProcessors = 1; ROS_LOADER_PARAMETER_BLOCK KeLoaderBlock; ULONG KeDcacheFlushCount = 0;

18 years, 3 months

[weiden] 23878: Fix creating the console system menu items

by weiden＠svn.reactos.org

Author: weiden Date: Sat Sep 2 03:18:23 2006 New Revision: 23878 URL: http://svn.reactos.org/svn/reactos?rev=23878&view=rev Log: Fix creating the console system menu items Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/resource.h Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sat Sep 2 03:18:23 2006 @@ -53,7 +53,103 @@ static BOOL ConsInitialized = FALSE; static HWND NotifyWnd; +typedef struct _GUICONSOLE_MENUITEM +{ + UINT uID; + const struct _GUICONSOLE_MENUITEM *SubMenu; + WORD wCmdID; +} GUICONSOLE_MENUITEM, *PGUICONSOLE_MENUITEM; + +static const GUICONSOLE_MENUITEM GuiConsoleEditMenuItems[] = +{ + { IDS_MARK, NULL, ID_SYSTEM_EDIT_MARK }, + { IDS_COPY, NULL, ID_SYSTEM_EDIT_COPY }, + { IDS_PASTE, NULL, ID_SYSTEM_EDIT_PASTE }, + { IDS_SELECTALL, NULL, ID_SYSTEM_EDIT_SELECTALL }, + { IDS_SCROLL, NULL, ID_SYSTEM_EDIT_SCROLL }, + { IDS_FIND, NULL, ID_SYSTEM_EDIT_FIND }, + + { 0, NULL, 0 } /* End of list */ +}; + +static const GUICONSOLE_MENUITEM GuiConsoleMainMenuItems[] = +{ + { (UINT)-1, NULL, 0 }, /* Separator */ + { IDS_EDIT, GuiConsoleEditMenuItems, 0 }, + { IDS_DEFAULTS, NULL, ID_SYSTEM_DEFAULTS }, + { IDS_PROPERTIES, NULL, ID_SYSTEM_PROPERTIES }, + + { 0, NULL, 0 } /* End of list */ +}; + /* FUNCTIONS *****************************************************************/ + +static VOID FASTCALL +GuiConsoleAppendMenuItems(HMENU hMenu, + const GUICONSOLE_MENUITEM *Items) +{ + UINT i; + WCHAR szMenuString[255]; + HMENU hSubMenu; + + for (i = 0; Items[i].uID != 0; i++) + { + if (Items[i].uID != (UINT)-1) + { + if (LoadStringW(Win32CsrDllHandle, + Items[i].uID, + szMenuString, + sizeof(szMenuString) / sizeof(szMenuString[0])) > 0) + { + if (Items[i].SubMenu != NULL) + { + hSubMenu = CreatePopupMenu(); + if (hSubMenu != NULL) + { + GuiConsoleAppendMenuItems(hSubMenu, + Items[i].SubMenu); + + if (!AppendMenuW(hMenu, + MF_STRING | MF_POPUP, + (UINT_PTR)hSubMenu, + szMenuString)) + { + DestroyMenu(hSubMenu); + } + } + } + else + { + AppendMenuW(hMenu, + MF_STRING, + Items[i].wCmdID, + szMenuString); + } + } + } + else + { + AppendMenuW(hMenu, + MF_SEPARATOR, + 0, + NULL); + } + } +} + +static VOID FASTCALL +GuiConsoleCreateSysMenu(PCSRSS_CONSOLE Console) +{ + HMENU hMenu; + + hMenu = GetSystemMenu(Console->hWindow, + FALSE); + if (hMenu != NULL) + { + GuiConsoleAppendMenuItems(hMenu, + GuiConsoleMainMenuItems); + } +} static VOID FASTCALL GuiConsoleGetDataPointers(HWND hWnd, PCSRSS_CONSOLE *Console, PGUI_CONSOLE_DATA *GuiData) @@ -338,6 +434,8 @@ PCSRSS_PROCESS_DATA ProcessData; HKEY hKey; + Console->hWindow = hWnd; + if (NULL == GuiData) { DPRINT1("GuiConsoleNcCreate: HeapAlloc failed\n"); @@ -431,6 +529,8 @@ SetTimer(hWnd, 1, CURSOR_BLINK_TIME, NULL); SetEvent(GuiData->hGuiInitEvent); + + GuiConsoleCreateSysMenu(Console); return (BOOL) DefWindowProcW(hWnd, WM_NCCREATE, 0, (LPARAM) Create); } @@ -1137,97 +1237,35 @@ // then exchange this info with console.dll in // some private way } -static LRESULT FASTCALL -GuiConsoleHandleSysMenuCommand(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) -{ - DPRINT1("GuiConsoleHandleSysMenuCommand entered %d\n", wParam); - - switch(wParam) - { - case IDS_MARK: - case IDS_COPY: - case IDS_PASTE: - case IDS_SELECTALL: - case IDS_SCROLL: - case IDS_FIND: - break; - - case IDS_DEFAULTS: - GuiConsoleShowConsoleProperties(hWnd, TRUE); - break; - case IDS_PROPERTIES: - GuiConsoleShowConsoleProperties(hWnd, FALSE); - break; - default: - return DefWindowProcW(hWnd, Msg, wParam, lParam); - } - - return 0; -} -static BOOLEAN FASTCALL -InsertItem(HMENU hMenu, INT fType, INT fMask, INT fState, HMENU hSubMenu, INT ResourceId) -{ - MENUITEMINFO MenuItemInfo; - TCHAR szBuffer[MAX_PATH]; - - memset(&MenuItemInfo, 0x0, sizeof(MENUITEMINFO)); - MenuItemInfo.cbSize = sizeof (MENUITEMINFO); - MenuItemInfo.fMask = fMask; - MenuItemInfo.fType = fType; - MenuItemInfo.fState = fState; - MenuItemInfo.hSubMenu = hSubMenu; - MenuItemInfo.wID = ResourceId; - - if (fType != MFT_SEPARATOR) - { - MenuItemInfo.cch = LoadString(Win32CsrDllHandle, ResourceId, szBuffer, MAX_PATH); - if (!MenuItemInfo.cch) - { - DPRINT("LoadString failed ResourceId %d Error %x\n", ResourceId, GetLastError()); - return FALSE; - } - MenuItemInfo.dwTypeData = szBuffer; - } - - if (InsertMenuItem(hMenu, ResourceId, FALSE, &MenuItemInfo)) - return TRUE; - - DPRINT("InsertMenuItem failed Last error %x\n", GetLastError()); - return FALSE; -} - - - -static VOID FASTCALL -GuiConsoleCreateSysMenu(HWND hWnd) -{ - HMENU hMenu; - HMENU hSubMenu; - - - hMenu = GetSystemMenu(hWnd, FALSE); - if (hMenu == NULL) - { - DPRINT("GetSysMenu failed\n"); - return; - } - /* insert seperator */ - InsertItem(hMenu, MFT_SEPARATOR, MIIM_FTYPE, 0, NULL, -1); - - /* create submenu */ - hSubMenu = CreatePopupMenu(); - InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_MARK); - InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING | MIIM_STATE, MFS_GRAYED, NULL, IDS_COPY); - InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_PASTE); - InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SELECTALL); - InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLL); - InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_FIND); - InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING | MIIM_SUBMENU, 0, hSubMenu, IDS_EDIT); - - /* create default/properties item */ - InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_DEFAULTS); - InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_PROPERTIES); - DrawMenuBar(hWnd); +static BOOL FASTCALL +GuiConsoleHandleSysMenuCommand(HWND hWnd, WPARAM wParam) +{ + BOOL Ret = TRUE; + + switch(wParam) + { + case ID_SYSTEM_EDIT_MARK: + case ID_SYSTEM_EDIT_COPY: + case ID_SYSTEM_EDIT_PASTE: + case ID_SYSTEM_EDIT_SELECTALL: + case ID_SYSTEM_EDIT_SCROLL: + case ID_SYSTEM_EDIT_FIND: + break; + + case ID_SYSTEM_DEFAULTS: + GuiConsoleShowConsoleProperties(hWnd, TRUE); + break; + + case ID_SYSTEM_PROPERTIES: + GuiConsoleShowConsoleProperties(hWnd, FALSE); + break; + + default: + Ret = FALSE; + break; + } + + return Ret; } static LRESULT CALLBACK @@ -1272,7 +1310,9 @@ GuiConsoleMouseMove(hWnd, wParam, lParam); break; case WM_SYSCOMMAND: - return GuiConsoleHandleSysMenuCommand(hWnd, msg, wParam, lParam); + if (!GuiConsoleHandleSysMenuCommand(hWnd, wParam)) + Result = DefWindowProcW(hWnd, msg, wParam, lParam); + break; default: Result = DefWindowProcW(hWnd, msg, wParam, lParam); break; @@ -1325,10 +1365,8 @@ { HeapFree(Win32CsrApiHeap, 0, Buffer); } - Console->hWindow = NewWindow; if (NULL != NewWindow) { - GuiConsoleCreateSysMenu(NewWindow); //ShowScrollBar(NewWindow, SB_VERT, FALSE); //ShowScrollBar(NewWindow, SB_HORZ, FALSE); SetWindowLongW(hWnd, GWL_USERDATA, GetWindowLongW(hWnd, GWL_USERDATA) + 1); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/resource.h (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/resource.h Sat Sep 2 03:18:23 2006 @@ -15,6 +15,14 @@ #define IDC_PROGRESS 101 #define IDC_END_NOW 102 +#define ID_SYSTEM_EDIT_MARK 1001 +#define ID_SYSTEM_EDIT_COPY 1002 +#define ID_SYSTEM_EDIT_PASTE 1003 +#define ID_SYSTEM_EDIT_SELECTALL 1004 +#define ID_SYSTEM_EDIT_SCROLL 1005 +#define ID_SYSTEM_EDIT_FIND 1006 +#define ID_SYSTEM_DEFAULTS 1007 +#define ID_SYSTEM_PROPERTIES 1008 #define NCPOPUP_MENU 103

18 years, 3 months

[hpoussin] 23877: Add softpub.h header

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Sep 2 03:06:32 2006 New Revision: 23877 URL: http://svn.reactos.org/svn/reactos?rev=23877&view=rev Log: Add softpub.h header Added: trunk/reactos/include/psdk/softpub.h (with props) Modified: trunk/reactos/include/psdk/mscat.h Modified: trunk/reactos/include/psdk/mscat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mscat.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/mscat.h (original) +++ trunk/reactos/include/psdk/mscat.h Sat Sep 2 03:06:32 2006 @@ -13,14 +13,14 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_MSCAT_H #define __WINE_MSCAT_H typedef HANDLE HCATADMIN; - +typedef HANDLE HCATINFO; #ifdef __cplusplus extern "C" { @@ -28,6 +28,7 @@ BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); +HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); #ifdef __cplusplus Added: trunk/reactos/include/psdk/softpub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/softpub.h?rev… ============================================================================== --- trunk/reactos/include/psdk/softpub.h (added) +++ trunk/reactos/include/psdk/softpub.h Sat Sep 2 03:06:32 2006 @@ -1,0 +1,42 @@ +/* + * Copyright (C) 2006 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SOFTPUB_H +#define __WINE_SOFTPUB_H + +#include <wintrust.h> + +#define WINTRUST_ACTION_GENERIC_CERT_VERIFY \ + { 0x189a3842, 0x3041, 0x11d1, { 0x85,0xe1,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#define WINTRUST_ACTION_GENERIC_CHAIN_VERIFY \ + { 0xfc451c16, 0xac75, 0x11d1, { 0xb4,0xb8,0x00,0xc0,0x4f,0xb6,0x6e,0xa0 }} + +#define WINTRUST_ACTION_GENERIC_VERIFY_V2 \ + { 0xaac56b, 0xcd44, 0x11d0, { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#define WINTRUST_ACTION_TRUSTPROVIDER_TEST \ + { 0x573e31f8, 0xddba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#define OFFICESIGN_ACTION_VERIFY \ + { 0x5555c2cd, 0x17fb, 0x11d1, { 0x85,0xc4,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#define DRIVER_ACTION_VERIFY \ + { 0xf750e6c3, 0x38ee, 0x11d1, { 0x85,0xe5,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#endif /* __WINE_SOFTPUB_H */ Propchange: trunk/reactos/include/psdk/softpub.h ------------------------------------------------------------------------------ svn:eol-style = native

18 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2006