Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[ion] 14663: Implement PsSetLegoNotifyRoutine and PsRemoveCreateThreadNotifyroutine. Clean up ps/thread.c, move things to their own subsystem, do proper TEB Allocation with MmCreateTeb, remove TEB EPROCESS hack fields. Rename PsFrezeAllThreads to KeFreezeAllThreads and implement a working version.

by ion＠svn.reactos.com

Implement PsSetLegoNotifyRoutine and PsRemoveCreateThreadNotifyroutine. Clean up ps/thread.c, move things to their own subsystem, do proper TEB Allocation with MmCreateTeb, remove TEB EPROCESS hack fields. Rename PsFrezeAllThreads to KeFreezeAllThreads and implement a working version. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/notify.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -461,7 +461,7 @@ /* Set up the Kernel and Process Manager for this CPU */ KePrepareForApplicationProcessorInit(KeNumberProcessors); - PsPrepareForApplicationProcessorInit(KeNumberProcessors); + KeCreateApplicationProcessorIdleThread(KeNumberProcessors); /* Allocate a stack for use when booting the processor */ ProcessorStack = Ki386InitialStackArray[((int)KeNumberProcessors)] + MM_STACK_SIZE; _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -587,8 +587,13 @@ SpiCur = (PSYSTEM_PROCESSES)pCur; - nThreads = PsEnumThreadsByProcess(pr); - + current_entry = pr->ThreadListHead.Flink; + while (current_entry != &pr->ThreadListHead) + { + nThreads++; + current_entry = current_entry->Flink; + } + // size of the structure for every process curSize = sizeof(SYSTEM_PROCESSES)-sizeof(SYSTEM_THREADS)+sizeof(SYSTEM_THREADS)*n Threads; ovlSize += curSize+inLen; @@ -667,7 +672,7 @@ } pr = PsGetNextProcess(pr); - + nThreads = 0; if ((pr == syspr) || (pr == NULL)) { SpiCur->NextEntryDelta = 0; _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-18 04:46:06 UTC (rev 14663) @@ -198,6 +198,10 @@ VOID KeFreeGdtSelector(ULONG Entry); VOID NtEarlyInitVdm(VOID); +VOID +KeApplicationProcessorInitDispatcher(VOID); +VOID +KeCreateApplicationProcessorIdleThread(ULONG Id); #ifdef CONFIG_SMP #define LOCK "lock ; " _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-18 04:46:06 UTC (rev 14663) @@ -437,8 +437,6 @@ */ MADDRESS_SPACE AddressSpace; LIST_ENTRY ProcessListEntry; - PVOID TebBlock; - PVOID TebLastAllocated; }; #define PROCESS_STATE_TERMINATED (1) _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -26,6 +26,8 @@ BOOLEAN Ke386Pae = FALSE; BOOLEAN Ke386GlobalPagesEnabled = FALSE; ULONG KiFastSystemCallDisable = 1; +extern PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS]; +extern ULONG IdleProcessorMask; /* FUNCTIONS *****************************************************************/ @@ -123,6 +125,42 @@ } } +VOID +KeApplicationProcessorInitDispatcher(VOID) +{ + KIRQL oldIrql; + oldIrql = KeAcquireDispatcherDatabaseLock(); + IdleProcessorMask |= (1 << KeGetCurrentProcessorNumber()); + KeReleaseDispatcherDatabaseLock(oldIrql); +} + +VOID +INIT_FUNCTION +KeCreateApplicationProcessorIdleThread(ULONG Id) +{ + PETHREAD IdleThread; + PKPRCB Prcb = ((PKPCR)((ULONG_PTR)KPCR_BASE + Id * PAGE_SIZE))->Prcb; + + PsInitializeThread(PsIdleProcess, + &IdleThread, + NULL, + KernelMode, + FALSE); + IdleThread->Tcb.State = THREAD_STATE_RUNNING; + IdleThread->Tcb.FreezeCount = 0; + IdleThread->Tcb.Affinity = 1 << Id; + IdleThread->Tcb.UserAffinity = 1 << Id; + IdleThread->Tcb.Priority = LOW_PRIORITY; + IdleThread->Tcb.BasePriority = LOW_PRIORITY; + Prcb->IdleThread = &IdleThread->Tcb; + Prcb->CurrentThread = &IdleThread->Tcb; + + Ki386InitialStackArray[Id] = (PVOID)IdleThread->Tcb.StackLimit; + + DPRINT("IdleThread for Processor %d has PID %d\n", + Id, IdleThread->Cid.UniqueThread); +} + VOID INIT_FUNCTION KePrepareForApplicationProcessorInit(ULONG Id) { _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -342,8 +342,48 @@ DPRINT("Done Waiting\n"); } +#ifdef KeGetCurrentThread +#undef KeGetCurrentThread +#endif +/* + * @implemented + */ +PKTHREAD +STDCALL +KeGetCurrentThread(VOID) +{ +#ifdef CONFIG_SMP + ULONG Flags; + PKTHREAD Thread; + Ke386SaveFlags(Flags); + Ke386DisableInterrupts(); + Thread = KeGetCurrentPrcb()->CurrentThread; + Ke386RestoreFlags(Flags); + return Thread; +#else + return(KeGetCurrentPrcb()->CurrentThread); +#endif +} + VOID STDCALL +KeSetPreviousMode(ULONG Mode) +{ + PsGetCurrentThread()->Tcb.PreviousMode = (UCHAR)Mode; +} + +/* + * @implemented + */ +KPROCESSOR_MODE +STDCALL +KeGetPreviousMode(VOID) +{ + return (ULONG)PsGetCurrentThread()->Tcb.PreviousMode; +} + +VOID +STDCALL KeRundownThread(VOID) { KIRQL OldIrql; @@ -422,7 +462,51 @@ STDCALL KiInsertQueueApc(PKAPC Apc, KPRIORITY PriorityBoost); - + +/* + * Used by the debugging code to freeze all the process's threads + * while the debugger is examining their state. + */ +VOID +STDCALL +KeFreezeAllThreads(PKPROCESS Process) +{ + KIRQL OldIrql; + PLIST_ENTRY CurrentEntry; + PKTHREAD Current; + PKTHREAD CurrentThread = KeGetCurrentThread(); + + /* Acquire Lock */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Loop the Process's Threads */ + CurrentEntry = Process->ThreadListHead.Flink; + while (CurrentEntry != &Process->ThreadListHead) + { + /* Get the Thread */ + Current = CONTAINING_RECORD(CurrentEntry, KTHREAD, ThreadListEntry); + + /* Make sure it's not ours */ + if (Current == CurrentThread) continue; + + /* Make sure it wasn't already frozen, and that it's not suspended */ + if (!(++Current->FreezeCount) && !(Current->SuspendCount)) + { + /* Insert the APC */ + if (!KiInsertQueueApc(&Current->SuspendApc, IO_NO_INCREMENT)) + { + /* Unsignal the Semaphore, the APC already got inserted */ + Current->SuspendSemaphore.Header.SignalState--; + } + } + + CurrentEntry = CurrentEntry->Flink; + } + + /* Release the lock */ + KeReleaseDispatcherDatabaseLock(OldIrql); +} + NTSTATUS STDCALL KeSuspendThread(PKTHREAD Thread) _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -109,7 +109,7 @@ } else { /* Do application processor initialization */ - PsApplicationProcessorInit(); + KeApplicationProcessorInitDispatcher(); /* Lower IRQL and go to Idle Thread */ KeLowerIrql(PASSIVE_LEVEL); _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -16,6 +16,7 @@ extern ULONG NtMajorVersion; extern ULONG NtMinorVersion; extern ULONG NtOSCSDVersion; + /* FUNCTIONS *****************************************************************/ PVOID @@ -28,25 +29,33 @@ PMEMORY_AREA MemoryArea; PHYSICAL_ADDRESS BoundaryAddressMultiple; BoundaryAddressMultiple.QuadPart = 0; + PVOID AllocatedBase = BaseAddress; /* Acquire the Lock */ MmLockAddressSpace(ProcessAddressSpace); - /* Create a Peb or Teb */ - Status = MmCreateMemoryArea(Process, - ProcessAddressSpace, - MEMORY_AREA_PEB_OR_TEB, - &BaseAddress, - PAGE_SIZE, - PAGE_READWRITE, - &MemoryArea, - FALSE, - FALSE, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to allocate PEB or TEB\n"); - } + /* + * Create a Peb or Teb. + * Loop until it works, decreasing by PAGE_SIZE each time. The logic here + * is that a PEB allocation should never fail since the address is free, + * while TEB allocation can fail, and we should simply try the address + * below. Is there a nicer way of doing this automagically? (ie: findning) + * a gap region? -- Alex + */ + do { + DPRINT("Trying to allocate: %x\n", AllocatedBase); + Status = MmCreateMemoryArea(Process, + ProcessAddressSpace, + MEMORY_AREA_PEB_OR_TEB, + &AllocatedBase, + PAGE_SIZE, + PAGE_READWRITE, + &MemoryArea, + TRUE, + FALSE, + BoundaryAddressMultiple); + AllocatedBase = AllocatedBase - PAGE_SIZE; + } while (Status != STATUS_SUCCESS); /* Initialize the Region */ MmInitialiseRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, @@ -60,7 +69,7 @@ /* Unlock Address Space */ DPRINT("Returning\n"); MmUnlockAddressSpace(ProcessAddressSpace); - return BaseAddress; + return AllocatedBase + PAGE_SIZE; } VOID @@ -77,7 +86,7 @@ VOID STDCALL -MmDeleteKernelStack(PVOID Stack, +MmDeleteKernelStack(PVOID Stack, BOOLEAN GuiStack) { /* Lock the Address Space */ @@ -93,6 +102,54 @@ MmUnlockAddressSpace(MmGetKernelAddressSpace()); } +VOID +MiFreePebPage(PVOID Context, + MEMORY_AREA* MemoryArea, + PVOID Address, + PFN_TYPE Page, + SWAPENTRY SwapEntry, + BOOLEAN Dirty) +{ + PEPROCESS Process = (PEPROCESS)Context; + + if (Page != 0) + { + SWAPENTRY SavedSwapEntry; + SavedSwapEntry = MmGetSavedSwapEntryPage(Page); + if (SavedSwapEntry != 0) + { + MmFreeSwapPage(SavedSwapEntry); + MmSetSavedSwapEntryPage(Page, 0); + } + MmDeleteRmap(Page, Process, Address); + MmReleasePageMemoryConsumer(MC_USER, Page); + } + else if (SwapEntry != 0) + { + MmFreeSwapPage(SwapEntry); + } +} + +VOID +STDCALL +MmDeleteTeb(PEPROCESS Process, + PTEB Teb) +{ + PMADDRESS_SPACE ProcessAddressSpace = &Process->AddressSpace; + + /* Lock the Address Space */ + MmLockAddressSpace(ProcessAddressSpace); + + /* Delete the Stack */ + MmFreeMemoryAreaByPtr(ProcessAddressSpace, + Teb, + MiFreePebPage, + Process); + + /* Unlock the Address Space */ + MmUnlockAddressSpace(ProcessAddressSpace); +} + PVOID STDCALL MmCreateKernelStack(BOOLEAN GuiStack) @@ -218,11 +275,64 @@ return STATUS_SUCCESS; } -VOID +PTEB STDCALL -MmCreateTeb(VOID) +MmCreateTeb(PEPROCESS Process, + PCLIENT_ID ClientId, + PINITIAL_TEB InitialTeb) { + PTEB Teb; + BOOLEAN Attached = FALSE; + /* Attach to the process */ + DPRINT("MmCreateTeb\n"); + if (Process != PsGetCurrentProcess()) + { + /* Attach to Target */ + KeAttachProcess(&Process->Pcb); + Attached = TRUE; + } + + /* Allocate the TEB */ + Teb = MiCreatePebOrTeb(Process, (PVOID)TEB_BASE); + + /* Initialize the PEB */ + RtlZeroMemory(Teb, sizeof(TEB)); + + /* Set TIB Data */ + Teb->Tib.ExceptionList = (PVOID)0xFFFFFFFF; + Teb->Tib.Version = 1; + Teb->Tib.Self = (PNT_TIB)Teb; + + /* Set TEB Data */ + Teb->Cid = *ClientId; + Teb->RealClientId = *ClientId; + Teb->Peb = Process->Peb; + Teb->CurrentLocale = PsDefaultThreadLocaleId; + + /* Store stack information from InitialTeb */ + if(InitialTeb != NULL) + { + /* fixed-size stack */ + if(InitialTeb->StackBase && InitialTeb->StackLimit) + { + Teb->Tib.StackBase = InitialTeb->StackBase; + Teb->Tib.StackLimit = InitialTeb->StackLimit; + Teb->DeallocationStack = InitialTeb->StackLimit; + } + /* expandable stack */ + else + { + Teb->Tib.StackBase = InitialTeb->StackCommit; + Teb->Tib.StackLimit = InitialTeb->StackCommitMax; + Teb->DeallocationStack = InitialTeb->StackReserved; + } + } + + /* Return TEB Address */ + DPRINT("Allocated: %x\n", Teb); + if (Attached) KeDetachProcess(); + return Teb; } NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -24,6 +24,11 @@ extern LIST_ENTRY PsActiveProcessHead; extern FAST_MUTEX PspActiveProcessMutex; +VOID +STDCALL +MmDeleteTeb(PEPROCESS Process, + PTEB Teb); + /* FUNCTIONS *****************************************************************/ STDCALL @@ -204,9 +209,8 @@ PETHREAD CurrentThread; BOOLEAN Last; PEPROCESS CurrentProcess; - SIZE_T Length = PAGE_SIZE; - PVOID TebBlock; PTERMINATION_PORT TerminationPort; + PTEB Teb; DPRINT("PspExitThread(ExitStatus %x), Current: 0x%x\n", ExitStatus, PsGetCurrentThread()); @@ -285,26 +289,10 @@ //CmNotifyRunDown(CurrentThread); /* Free the TEB */ - if(CurrentThread->Tcb.Teb) { + if((Teb = CurrentThread->Tcb.Teb)) { - DPRINT("Decommit teb at %p\n", CurrentThread->Tcb.Teb); - TebBlock = MM_ROUND_DOWN(CurrentThread->Tcb.Teb, MM_VIRTMEM_GRANULARITY); - - ZwFreeVirtualMemory(NtCurrentProcess(), - (PVOID *)&CurrentThread->Tcb.Teb, - &Length, - MEM_DECOMMIT); - - DPRINT("teb %p, TebBlock %p\n", CurrentThread->Tcb.Teb, TebBlock); - - if (TebBlock != CurrentProcess->TebBlock || - CurrentProcess->TebBlock == CurrentProcess->TebLastAllocated) { - - MmLockAddressSpace(&CurrentProcess->AddressSpace); - MmReleaseMemoryAreaIfDecommitted(CurrentProcess, &CurrentProcess->AddressSpace, TebBlock); - MmUnlockAddressSpace(&CurrentProcess->AddressSpace); - } - + DPRINT1("Decommit teb at %p\n", Teb); + MmDeleteTeb(CurrentProcess, Teb); CurrentThread->Tcb.Teb = NULL; } _____ Modified: trunk/reactos/ntoskrnl/ps/notify.c --- trunk/reactos/ntoskrnl/ps/notify.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/ps/notify.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -18,9 +18,9 @@ #define MAX_THREAD_NOTIFY_ROUTINE_COUNT 8 #define TAG_KAPC TAG('k','p','a','p') /* kpap - kernel ps apc */ -static ULONG PiThreadNotifyRoutineCount = 0; +static ULONG PspThreadNotifyRoutineCount = 0; static PCREATE_THREAD_NOTIFY_ROUTINE -PiThreadNotifyRoutine[MAX_THREAD_NOTIFY_ROUTINE_COUNT]; +PspThreadNotifyRoutine[MAX_THREAD_NOTIFY_ROUTINE_COUNT]; static PCREATE_PROCESS_NOTIFY_ROUTINE PspProcessNotifyRoutine[MAX_PROCESS_NOTIFY_ROUTINE_COUNT]; @@ -28,6 +28,8 @@ static PLOAD_IMAGE_NOTIFY_ROUTINE PspLoadImageNotifyRoutine[MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT]; +static PVOID PspLegoNotifyRoutine; + /* FUNCTIONS ***************************************************************/ /* @@ -77,6 +79,20 @@ /* * @implemented */ +ULONG +STDCALL +PsSetLegoNotifyRoutine(PVOID LegoNotifyRoutine) +{ + /* Set the System-Wide Lego Routine */ + PspLegoNotifyRoutine = LegoNotifyRoutine; + + /* Return the location to the Lego Data */ + return FIELD_OFFSET(KTHREAD, LegoData); +} + +/* + * @implemented + */ NTSTATUS STDCALL PsRemoveLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) @@ -124,17 +140,60 @@ return STATUS_INVALID_PARAMETER; } -VOID STDCALL -PspRunCreateThreadNotifyRoutines ( - PETHREAD CurrentThread, - BOOLEAN Create ) +/* + * @implemented + */ +NTSTATUS +STDCALL +PsRemoveCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) { ULONG i; + + /* Loop the routines */ + for(i=0;i<MAX_THREAD_NOTIFY_ROUTINE_COUNT;i++) + { + /* Check for a match */ + if ((PVOID)PspThreadNotifyRoutine[i] == (PVOID)NotifyRoutine) + { + /* Remove and return */ + PspThreadNotifyRoutine[i] = NULL; + return(STATUS_SUCCESS); + } + } + + /* Nothing found */ + return STATUS_INVALID_PARAMETER; +} + +/* + * @implemented + */ +NTSTATUS +STDCALL +PsSetCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) +{ + if (PspThreadNotifyRoutineCount >= MAX_THREAD_NOTIFY_ROUTINE_COUNT) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + PspThreadNotifyRoutine[PspThreadNotifyRoutineCount] = NotifyRoutine; + PspThreadNotifyRoutineCount++; + + return(STATUS_SUCCESS); +} + +VOID +STDCALL +PspRunCreateThreadNotifyRoutines(PETHREAD CurrentThread, + BOOLEAN Create) +{ + ULONG i; CLIENT_ID Cid = CurrentThread->Cid; - for (i = 0; i < PiThreadNotifyRoutineCount; i++) + for (i = 0; i < PspThreadNotifyRoutineCount; i++) { - PiThreadNotifyRoutine[i](Cid.UniqueProcess, Cid.UniqueThread, Create); + PspThreadNotifyRoutine[i](Cid.UniqueProcess, Cid.UniqueThread, Create); } } @@ -173,22 +232,4 @@ } } -/* - * @implemented - */ -NTSTATUS STDCALL -PsSetCreateThreadNotifyRoutine ( - IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine ) -{ - if (PiThreadNotifyRoutineCount >= MAX_THREAD_NOTIFY_ROUTINE_COUNT) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - PiThreadNotifyRoutine[PiThreadNotifyRoutineCount] = NotifyRoutine; - PiThreadNotifyRoutineCount++; - - return(STATUS_SUCCESS); -} - /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -15,15 +15,26 @@ #include <internal/debug.h> extern LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; +extern LIST_ENTRY PriorityListHead[MAXIMUM_PRIORITY]; static GENERIC_MAPPING PiProcessMapping = { STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, STANDARD_RIGHTS_WRITE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_VM_OPERATION | PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | - PROCESS_TERMINATE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_SET_PORT, + PROCESS_TERMINATE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | + PROCESS_SET_PORT, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, PROCESS_ALL_ACCESS}; +static GENERIC_MAPPING PiThreadMapping = { + STANDARD_RIGHTS_READ | THREAD_GET_CONTEXT | THREAD_QUERY_INFORMATION, + STANDARD_RIGHTS_WRITE | THREAD_TERMINATE | THREAD_SUSPEND_RESUME | + THREAD_ALERT | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + THREAD_ALL_ACCESS}; + +BOOLEAN DoneInitYet = FALSE; + VOID INIT_FUNCTION PsInitClientIDManagment(VOID); @@ -50,6 +61,60 @@ VOID INIT_FUNCTION +PsInitThreadManagment(VOID) +/* + * FUNCTION: Initialize thread managment + */ +{ + PETHREAD FirstThread; + ULONG i; + + for (i=0; i < MAXIMUM_PRIORITY; i++) + { + InitializeListHead(&PriorityListHead[i]); + } + + PsThreadType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); + + PsThreadType->Tag = TAG('T', 'H', 'R', 'T'); + PsThreadType->TotalObjects = 0; + PsThreadType->TotalHandles = 0; + PsThreadType->PeakObjects = 0; + PsThreadType->PeakHandles = 0; + PsThreadType->PagedPoolCharge = 0; + PsThreadType->NonpagedPoolCharge = sizeof(ETHREAD); + PsThreadType->Mapping = &PiThreadMapping; + PsThreadType->Dump = NULL; + PsThreadType->Open = NULL; + PsThreadType->Close = NULL; + PsThreadType->Delete = PspDeleteThread; + PsThreadType->Parse = NULL; + PsThreadType->Security = NULL; + PsThreadType->QueryName = NULL; + PsThreadType->OkayToClose = NULL; + PsThreadType->Create = NULL; + PsThreadType->DuplicationNotify = NULL; + + RtlInitUnicodeString(&PsThreadType->TypeName, L"Thread"); + + ObpCreateTypeObject(PsThreadType); + + PsInitializeThread(NULL, &FirstThread, NULL, KernelMode, TRUE); + FirstThread->Tcb.State = THREAD_STATE_RUNNING; + FirstThread->Tcb.FreezeCount = 0; + FirstThread->Tcb.UserAffinity = (1 << 0); /* Set the affinity of the first thread to the boot processor */ + FirstThread->Tcb.Affinity = (1 << 0); + KeGetCurrentPrcb()->CurrentThread = (PVOID)FirstThread; + + DPRINT("FirstThread %x\n",FirstThread); + + DoneInitYet = TRUE; + + ExInitializeWorkItem(&PspReaperWorkItem, PspReapRoutine, NULL); +} + +VOID +INIT_FUNCTION PsInitProcessManagment(VOID) { PKPROCESS KProcess; _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-04-18 02:12:30 UTC (rev 14662) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-04-18 04:46:06 UTC (rev 14663) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ps/thread.c @@ -9,14 +8,6 @@ * Phillip Susi */ -/* - * NOTE: - * - * All of the routines that manipulate the thread queue synchronize on - * a single spinlock - * - */ - /* INCLUDES ****************************************************************/ #include <ntoskrnl.h> @@ -30,49 +21,183 @@ POBJECT_TYPE EXPORTED PsThreadType = NULL; -extern PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS]; -extern ULONG IdleProcessorMask; -extern LIST_ENTRY PriorityListHead[MAXIMUM_PRIORITY]; +PTEB +STDCALL +MmCreateTeb(PEPROCESS Process, + PCLIENT_ID ClientId, + PINITIAL_TEB InitialTeb); +/* FUNCTIONS ***************************************************************/ -BOOLEAN DoneInitYet = FALSE; -static GENERIC_MAPPING PiThreadMapping = {STANDARD_RIGHTS_READ | THREAD_GET_CONTEXT | THREAD_QUERY_INFORMATION, - STANDARD_RIGHTS_WRITE | THREAD_TERMINATE | THREAD_SUSPEND_RESUME | THREAD_ALERT | - THREAD_SET_INFORMATION | THREAD_SET_CONTEXT, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, - THREAD_ALL_ACCESS}; +VOID STDCALL +LdrInitApcRundownRoutine ( PKAPC Apc ) +{ + ExFreePool(Apc); +} -/* FUNCTIONS ***************************************************************/ -#ifdef KeGetCurrentThread -#undef KeGetCurrentThread -#endif -/* - * @implemented - */ -PKTHREAD -STDCALL -KeGetCurrentThread(VOID) +VOID STDCALL +LdrInitApcKernelRoutine ( + PKAPC Apc, + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArgument2) { -#ifdef CONFIG_SMP - ULONG Flags; - PKTHREAD Thread; - Ke386SaveFlags(Flags); - Ke386DisableInterrupts(); - Thread = KeGetCurrentPrcb()->CurrentThread; - Ke386RestoreFlags(Flags); - return Thread; -#else - return(KeGetCurrentPrcb()->CurrentThread); -#endif + ExFreePool(Apc); } +VOID +PiBeforeBeginThread(CONTEXT c) +{ + KeLowerIrql(PASSIVE_LEVEL); +} + +NTSTATUS +PsInitializeThread ( + PEPROCESS Process, + PETHREAD* ThreadPtr, + POBJECT_ATTRIBUTES ObjectAttributes, + KPROCESSOR_MODE AccessMode, + BOOLEAN First ) +{ + PETHREAD Thread; + NTSTATUS Status; + KIRQL oldIrql; + + PAGED_CODE(); + + if (Process == NULL) + { + Process = PsInitialSystemProcess; + } + + /* + * Create and initialize thread + */ + Status = ObCreateObject(AccessMode, + PsThreadType, + ObjectAttributes, + KernelMode, + NULL, + sizeof(ETHREAD), + 0, + 0, + (PVOID*)&Thread); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + /* + * Reference process + */ + ObReferenceObjectByPointer(Process, + PROCESS_CREATE_THREAD, + PsProcessType, + KernelMode); + + Thread->ThreadsProcess = Process; + Thread->Cid.UniqueThread = NULL; + Thread->Cid.UniqueProcess = (HANDLE)Thread->ThreadsProcess->UniqueProcessId; + + DPRINT("Thread = %x\n",Thread); + + KeInitializeThread(&Process->Pcb, &Thread->Tcb, First); + InitializeListHead(&Thread->ActiveTimerListHead); + KeInitializeSpinLock(&Thread->ActiveTimerListLock); + InitializeListHead(&Thread->IrpList); + Thread->DeadThread = FALSE; + Thread->HasTerminated = FALSE; + Thread->Tcb.Win32Thread = NULL; + DPRINT("Thread->Cid.UniqueThread %d\n",Thread->Cid.UniqueThread); + + + Thread->Tcb.BasePriority = (CHAR)Process->Pcb.BasePriority; + Thread->Tcb.Priority = Thread->Tcb.BasePriority; + + /* + * Local Procedure Call facility (LPC) + */ + KeInitializeSemaphore (& Thread->LpcReplySemaphore, 0, LONG_MAX); + Thread->LpcReplyMessage = NULL; + Thread->LpcReplyMessageId = 0; /* not valid */ + /* Thread->LpcReceiveMessageId = 0; */ + Thread->LpcExitThreadCalled = FALSE; + Thread->LpcReceivedMsgIdValid = FALSE; + + oldIrql = KeAcquireDispatcherDatabaseLock(); + InsertTailList(&Process->ThreadListHead, + &Thread->ThreadListEntry); + KeReleaseDispatcherDatabaseLock(oldIrql); + + *ThreadPtr = Thread; + + return STATUS_SUCCESS; +} + +VOID PsDumpThreads(BOOLEAN IncludeSystem) +{ + PLIST_ENTRY AThread, AProcess; + PEPROCESS Process; + PETHREAD Thread; + ULONG nThreads = 0; + + AProcess = PsActiveProcessHead.Flink; + while(AProcess != &PsActiveProcessHead) + { + Process = CONTAINING_RECORD(AProcess, EPROCESS, ProcessListEntry); + /* FIXME - skip suspended, ... processes? */ + if((Process != PsInitialSystemProcess) || + (Process == PsInitialSystemProcess && IncludeSystem)) + { + AThread = Process->ThreadListHead.Flink; + while(AThread != &Process->ThreadListHead) + { + Thread = CONTAINING_RECORD(AThread, ETHREAD, ThreadListEntry); + + nThreads++; + DbgPrint("Thread->Tcb.State %d Affinity %08x Priority %d PID.TID %d.%d Name %.8s Stack: \n", + Thread->Tcb.State, + Thread->Tcb.Affinity, + Thread->Tcb.Priority, + Thread->ThreadsProcess->UniqueProcessId, + Thread->Cid.UniqueThread, + Thread->ThreadsProcess->ImageFileName); + if(Thread->Tcb.State == THREAD_STATE_READY || + Thread->Tcb.State == THREAD_STATE_SUSPENDED || + Thread->Tcb.State == THREAD_STATE_BLOCKED) + { + ULONG i = 0; + PULONG Esp = (PULONG)Thread->Tcb.KernelStack; + PULONG Ebp = (PULONG)Esp[4]; + DbgPrint("Ebp 0x%.8X\n", Ebp); + while(Ebp != 0 && Ebp >= (PULONG)Thread->Tcb.StackLimit) + { + DbgPrint("%.8X %.8X%s", Ebp[0], Ebp[1], (i % 8) == 7 ? "\n" : " "); + Ebp = (PULONG)Ebp[0]; + i++; + } + if((i % 8) != 0) + { + DbgPrint("\n"); + } + } + AThread = AThread->Flink; + } + } + AProcess = AProcess->Flink; + } +} + /* * @implemented */ -HANDLE STDCALL PsGetCurrentThreadId(VOID) +HANDLE +STDCALL +PsGetCurrentThreadId(VOID) { - return(PsGetCurrentThread()->Cid.UniqueThread); + return(PsGetCurrentThread()->Cid.UniqueThread); } /* @@ -80,11 +205,9 @@ */ ULONG STDCALL -PsGetThreadFreezeCount( - PETHREAD Thread - ) +PsGetThreadFreezeCount(PETHREAD Thread) { - return Thread->Tcb.FreezeCount; + return Thread->Tcb.FreezeCount; } /* @@ -92,11 +215,9 @@ */ BOOLEAN STDCALL -PsGetThreadHardErrorsAreDisabled( - PETHREAD Thread - ) +PsGetThreadHardErrorsAreDisabled(PETHREAD Thread) { - return Thread->HardErrorsAreDisabled; + return Thread->HardErrorsAreDisabled; } [truncated at 1000 lines; 895 more skipped]

19 years, 8 months

[ion] 14662: Remove ps/create.c, it did not fit with the current model of abstraction. Major cleanup of ps/process.c, created ps/notify.c and ps/quota.c. Implemented NtOpenProcess, PsRemoveLoadImageNotifyRoutine, PsGetCurrentProcessSessionId

by ion＠svn.reactos.com

Remove ps/create.c, it did not fit with the current model of abstraction. Major cleanup of ps/process.c, created ps/notify.c and ps/quota.c. Implemented NtOpenProcess, PsRemoveLoadImageNotifyRoutine, PsGetCurrentProcessSessionId Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ke/process.c Deleted: trunk/reactos/ntoskrnl/ps/create.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Added: trunk/reactos/ntoskrnl/ps/notify.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Added: trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/ps/suspend.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-04-18 02:11:19 UTC (rev 14661) +++ trunk/reactos/ntoskrnl/Makefile 2005-04-18 02:12:30 UTC (rev 14662) @@ -222,7 +222,6 @@ # Process Manager (Ps) OBJECTS_PS = \ ps/cid.o \ - ps/create.o \ ps/debug.o \ ps/idle.o \ ps/job.o \ @@ -230,6 +229,8 @@ ps/locale.o \ ps/process.o \ ps/psmgr.o \ + ps/notify.o \ + ps/quota.o \ ps/query.o \ ps/security.o \ ps/suspend.o \ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-18 02:11:19 UTC (rev 14661) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-18 02:12:30 UTC (rev 14662) @@ -97,6 +97,10 @@ KiUnblockThread(PKTHREAD Thread, PNTSTATUS WaitStatus, KPRIORITY Increment); + +NTSTATUS +STDCALL +KeSuspendThread(PKTHREAD Thread); /* gmutex.c ********************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-18 02:11:19 UTC (rev 14661) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-18 02:12:30 UTC (rev 14662) @@ -533,6 +533,12 @@ extern LIST_ENTRY PspReaperListHead; extern WORK_QUEUE_ITEM PspReaperWorkItem; extern BOOLEAN PspReaping; +extern PEPROCESS PsInitialSystemProcess; +extern PEPROCESS PsIdleProcess; +extern POBJECT_TYPE PsProcessType; +extern LIST_ENTRY PsActiveProcessHead; +extern FAST_MUTEX PspActiveProcessMutex; +extern LARGE_INTEGER ShortPsLockDelay, PsLockTimeout; VOID STDCALL @@ -544,7 +550,7 @@ VOID PsFreezeProcessThreads(PEPROCESS Process); VOID PsUnfreezeProcessThreads(PEPROCESS Process); ULONG PsEnumThreadsByProcess(PEPROCESS Process); -PEPROCESS PsGetNextProcess(PEPROCESS OldProcess); +PEPROCESS STDCALL PsGetNextProcess(PEPROCESS OldProcess); VOID PsApplicationProcessorInit(VOID); VOID @@ -679,6 +685,9 @@ #define EPROCESS_TO_KPROCESS(pEProcess) (&(pEProcess)->Pcb) #define KPROCESS_TO_EPROCESS(pKProcess) (CONTAINING_RECORD((pKProcess), EPROCESS, Pcb)) +#define MAX_PROCESS_NOTIFY_ROUTINE_COUNT 8 +#define MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT 8 + #endif /* ASSEMBLER */ #endif /* __INCLUDE_INTERNAL_PS_H */ _____ Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2005-04-18 02:11:19 UTC (rev 14661) +++ trunk/reactos/ntoskrnl/ke/process.c 2005-04-18 02:12:30 UTC (rev 14662) @@ -53,6 +53,16 @@ MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); } +/* + * FUNCTION: Returns a pointer to the current process + */ +PKPROCESS +STDCALL +KeGetCurrentProcess(VOID) +{ + return(&(PsGetCurrentProcess()->Pcb)); +} + VOID STDCALL KeInitializeProcess(PKPROCESS Process, _____ Deleted: trunk/reactos/ntoskrnl/ps/create.c --- trunk/reactos/ntoskrnl/ps/create.c 2005-04-18 02:11:19 UTC (rev 14661) +++ trunk/reactos/ntoskrnl/ps/create.c 2005-04-18 02:12:30 UTC (rev 14662) @@ -1,642 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ps/create.c - * PURPOSE: Thread managment - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - * Phillip Susi - * Skywing - */ - -/* - * NOTE: - * - * All of the routines that manipulate the thread queue synchronize on - * a single spinlock - * - */ - -/* INCLUDES ****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBAL *******************************************************************/ - -#define MAX_THREAD_NOTIFY_ROUTINE_COUNT 8 -#define TAG_KAPC TAG('k','p','a','p') /* kpap - kernel ps apc */ - -static ULONG PiThreadNotifyRoutineCount = 0; -static PCREATE_THREAD_NOTIFY_ROUTINE -PiThreadNotifyRoutine[MAX_THREAD_NOTIFY_ROUTINE_COUNT]; - -ULONG -STDCALL -KeSuspendThread(PKTHREAD Thread); -/* FUNCTIONS ***************************************************************/ - -VOID -PiBeforeBeginThread(CONTEXT c) -{ - KeLowerIrql(PASSIVE_LEVEL); -} - -NTSTATUS -PsInitializeThread ( - PEPROCESS Process, - PETHREAD* ThreadPtr, - POBJECT_ATTRIBUTES ObjectAttributes, - KPROCESSOR_MODE AccessMode, - BOOLEAN First ) -{ - PETHREAD Thread; - NTSTATUS Status; - KIRQL oldIrql; - - PAGED_CODE(); - - if (Process == NULL) - { - Process = PsInitialSystemProcess; - } - - /* - * Create and initialize thread - */ - Status = ObCreateObject(AccessMode, - PsThreadType, - ObjectAttributes, - KernelMode, - NULL, - sizeof(ETHREAD), - 0, - 0, - (PVOID*)&Thread); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - /* - * Reference process - */ - ObReferenceObjectByPointer(Process, - PROCESS_CREATE_THREAD, - PsProcessType, - KernelMode); - - Thread->ThreadsProcess = Process; - Thread->Cid.UniqueThread = NULL; - Thread->Cid.UniqueProcess = (HANDLE)Thread->ThreadsProcess->UniqueProcessId; - - DPRINT("Thread = %x\n",Thread); - - KeInitializeThread(&Process->Pcb, &Thread->Tcb, First); - InitializeListHead(&Thread->ActiveTimerListHead); - KeInitializeSpinLock(&Thread->ActiveTimerListLock); - InitializeListHead(&Thread->IrpList); - Thread->DeadThread = FALSE; - Thread->HasTerminated = FALSE; - Thread->Tcb.Win32Thread = NULL; - DPRINT("Thread->Cid.UniqueThread %d\n",Thread->Cid.UniqueThread); - - - Thread->Tcb.BasePriority = (CHAR)Process->Pcb.BasePriority; - Thread->Tcb.Priority = Thread->Tcb.BasePriority; - - /* - * Local Procedure Call facility (LPC) - */ - KeInitializeSemaphore (& Thread->LpcReplySemaphore, 0, LONG_MAX); - Thread->LpcReplyMessage = NULL; - Thread->LpcReplyMessageId = 0; /* not valid */ - /* Thread->LpcReceiveMessageId = 0; */ - Thread->LpcExitThreadCalled = FALSE; - Thread->LpcReceivedMsgIdValid = FALSE; - - oldIrql = KeAcquireDispatcherDatabaseLock(); - InsertTailList(&Process->ThreadListHead, - &Thread->ThreadListEntry); - KeReleaseDispatcherDatabaseLock(oldIrql); - - *ThreadPtr = Thread; - - return STATUS_SUCCESS; -} - - -static NTSTATUS -PsCreateTeb ( - HANDLE ProcessHandle, - PTEB *TebPtr, - PETHREAD Thread, - PINITIAL_TEB InitialTeb ) -{ - PEPROCESS Process; - NTSTATUS Status; - ULONG ByteCount; - ULONG RegionSize; - ULONG TebSize; - PVOID TebBase; - TEB Teb; - - PAGED_CODE(); - - TebSize = PAGE_SIZE; - - if (NULL == Thread->ThreadsProcess) - { - /* We'll be allocating a 64k block here and only use 4k of it, but this - path should almost never be taken. Actually, I never saw it was taken, - so maybe we should just ASSERT(NULL != Thread->ThreadsProcess) and - move on */ - TebBase = NULL; - Status = ZwAllocateVirtualMemory(ProcessHandle, - &TebBase, - 0, - &TebSize, - MEM_RESERVE | MEM_COMMIT | MEM_TOP_DOWN, - PAGE_READWRITE); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to allocate virtual memory for TEB\n"); - return Status; - } - } - else - { - Process = Thread->ThreadsProcess; - PsLockProcess(Process, FALSE); - if (NULL == Process->TebBlock || - Process->TebBlock == Process->TebLastAllocated) - { - Process->TebBlock = NULL; - RegionSize = MM_VIRTMEM_GRANULARITY; - Status = ZwAllocateVirtualMemory(ProcessHandle, - &Process->TebBlock, - 0, - &RegionSize, - MEM_RESERVE | MEM_TOP_DOWN, - PAGE_READWRITE); - if (! NT_SUCCESS(Status)) - { - PsUnlockProcess(Process); - DPRINT1("Failed to reserve virtual memory for TEB\n"); - return Status; - } - Process->TebLastAllocated = (PVOID) ((char *) Process->TebBlock + RegionSize); - } - TebBase = (PVOID) ((char *) Process->TebLastAllocated - PAGE_SIZE); - Status = ZwAllocateVirtualMemory(ProcessHandle, - &TebBase, - 0, - &TebSize, - MEM_COMMIT, - PAGE_READWRITE); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to commit virtual memory for TEB\n"); - return Status; - } - Process->TebLastAllocated = TebBase; - PsUnlockProcess(Process); - } - - DPRINT ("TebBase %p TebSize %lu\n", TebBase, TebSize); - ASSERT(NULL != TebBase && PAGE_SIZE <= TebSize); - - RtlZeroMemory(&Teb, sizeof(TEB)); - /* set all pointers to and from the TEB */ - Teb.Tib.Self = TebBase; - if (Thread->ThreadsProcess) - { - Teb.Peb = Thread->ThreadsProcess->Peb; /* No PEB yet!! */ - } - DPRINT("Teb.Peb %x\n", Teb.Peb); - - /* store stack information from InitialTeb */ - if(InitialTeb != NULL) - { - /* fixed-size stack */ - if(InitialTeb->StackBase && InitialTeb->StackLimit) - { - Teb.Tib.StackBase = InitialTeb->StackBase; - Teb.Tib.StackLimit = InitialTeb->StackLimit; - Teb.DeallocationStack = InitialTeb->StackLimit; - } - /* expandable stack */ - else - { - Teb.Tib.StackBase = InitialTeb->StackCommit; - Teb.Tib.StackLimit = InitialTeb->StackCommitMax; - Teb.DeallocationStack = InitialTeb->StackReserved; - } - } - - /* more initialization */ - Teb.Cid.UniqueThread = Thread->Cid.UniqueThread; - Teb.Cid.UniqueProcess = Thread->Cid.UniqueProcess; - Teb.CurrentLocale = PsDefaultThreadLocaleId; - - /* Terminate the exception handler list */ - Teb.Tib.ExceptionList = (PVOID)-1; - - DPRINT("sizeof(TEB) %x\n", sizeof(TEB)); - - /* write TEB data into teb page */ - Status = NtWriteVirtualMemory(ProcessHandle, - TebBase, - &Teb, - sizeof(TEB), - &ByteCount); - - if (!NT_SUCCESS(Status)) - { - /* free TEB */ - DPRINT1 ("Writing TEB failed!\n"); - - RegionSize = 0; - NtFreeVirtualMemory(ProcessHandle, - TebBase, - &RegionSize, - MEM_RELEASE); - - return Status; - } - - if (TebPtr != NULL) - { - *TebPtr = (PTEB)TebBase; - } - - DPRINT("TEB allocated at %p\n", TebBase); - - return Status; -} - - -VOID STDCALL -LdrInitApcRundownRoutine ( PKAPC Apc ) -{ - ExFreePool(Apc); -} - - -VOID STDCALL -LdrInitApcKernelRoutine ( - PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) -{ - ExFreePool(Apc); -} - - -NTSTATUS STDCALL -NtCreateThread ( - OUT PHANDLE ThreadHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN HANDLE ProcessHandle, - OUT PCLIENT_ID ClientId, - IN PCONTEXT ThreadContext, - IN PINITIAL_TEB InitialTeb, - IN BOOLEAN CreateSuspended ) -{ - HANDLE hThread; - CONTEXT SafeContext; - INITIAL_TEB SafeInitialTeb; - PEPROCESS Process; - PETHREAD Thread; - PTEB TebBase; - PKAPC LdrInitApc; - KIRQL oldIrql; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - if(ThreadContext == NULL) - { - return STATUS_INVALID_PARAMETER; - } - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(ThreadHandle, - sizeof(HANDLE), - sizeof(ULONG)); - if(ClientId != NULL) - { - ProbeForWrite(ClientId, - sizeof(CLIENT_ID), - sizeof(ULONG)); - } - ProbeForRead(ThreadContext, - sizeof(CONTEXT), - sizeof(ULONG)); - SafeContext = *ThreadContext; - ThreadContext = &SafeContext; - ProbeForRead(InitialTeb, - sizeof(INITIAL_TEB), - sizeof(ULONG)); - SafeInitialTeb = *InitialTeb; - InitialTeb = &SafeInitialTeb; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - DPRINT("NtCreateThread(ThreadHandle %x, PCONTEXT %x)\n", - ThreadHandle,ThreadContext); - - Status = ObReferenceObjectByHandle( - ProcessHandle, - PROCESS_CREATE_THREAD, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if(!NT_SUCCESS(Status)) - { - return(Status); - } - - Status = PsLockProcess(Process, FALSE); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Process); - return(Status); - } - - if(Process->ExitTime.QuadPart != 0) - { - PsUnlockProcess(Process); - return STATUS_PROCESS_IS_TERMINATING; - } - - PsUnlockProcess(Process); - - Status = PsInitializeThread(Process, - &Thread, - ObjectAttributes, - PreviousMode, - FALSE); - - ObDereferenceObject(Process); - - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - /* create a client id handle */ - Status = PsCreateCidHandle ( - Thread, PsThreadType, &Thread->Cid.UniqueThread); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Thread); - return Status; - } - - Status = KiArchInitThreadWithContext(&Thread->Tcb, ThreadContext); - if (!NT_SUCCESS(Status)) - { - PsDeleteCidHandle(Thread->Cid.UniqueThread, PsThreadType); - ObDereferenceObject(Thread); - return(Status); - } - - Status = PsCreateTeb(ProcessHandle, - &TebBase, - Thread, - InitialTeb); - if (!NT_SUCCESS(Status)) - { - PsDeleteCidHandle(Thread->Cid.UniqueThread, PsThreadType); - ObDereferenceObject(Thread); - return(Status); - } - Thread->Tcb.Teb = TebBase; - - Thread->StartAddress = NULL; - - /* - * Maybe send a message to the process's debugger - */ - DbgkCreateThread((PVOID)ThreadContext->Eip); - - /* - * First, force the thread to be non-alertable for user-mode alerts. - */ - Thread->Tcb.Alertable = FALSE; - - /* - * If the thread is to be created suspended then queue an APC to - * do the suspend before we run any userspace code. - */ - if (CreateSuspended) - { - KeSuspendThread(&Thread->Tcb); - } - - /* - * Queue an APC to the thread that will execute the ntdll startup - * routine. - */ - LdrInitApc = ExAllocatePoolWithTag ( - NonPagedPool, sizeof(KAPC), TAG_KAPC ); - KeInitializeApc ( - LdrInitApc, - &Thread->Tcb, - OriginalApcEnvironment, - LdrInitApcKernelRoutine, - LdrInitApcRundownRoutine, - LdrpGetSystemDllEntryPoint(), - UserMode, - NULL ); - KeInsertQueueApc(LdrInitApc, NULL, NULL, IO_NO_INCREMENT); - /* - * The thread is non-alertable, so the APC we added did not set UserApcPending to TRUE. - * We must do this manually. Do NOT attempt to set the Thread to Alertable before the call, - * doing so is a blatant and erronous hack. - */ - Thread->Tcb.ApcState.UserApcPending = TRUE; - Thread->Tcb.Alerted[KernelMode] = TRUE; - - oldIrql = KeAcquireDispatcherDatabaseLock (); - KiUnblockThread(&Thread->Tcb, NULL, 0); - KeReleaseDispatcherDatabaseLock(oldIrql); - - Status = ObInsertObject((PVOID)Thread, - NULL, - DesiredAccess, - 0, - NULL, - &hThread); - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - if(ClientId != NULL) - { - *ClientId = Thread->Cid; - } - *ThreadHandle = hThread; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - return Status; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -PsCreateSystemThread ( - PHANDLE ThreadHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - HANDLE ProcessHandle, - PCLIENT_ID ClientId, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext ) -/* - * FUNCTION: Creates a thread which executes in kernel mode - * ARGUMENTS: - * ThreadHandle (OUT) = Caller supplied storage for the returned thread - * handle - * DesiredAccess = Requested access to the thread - * ObjectAttributes = Object attributes (optional) - * ProcessHandle = Handle of process thread will run in - * NULL to use system process - * ClientId (OUT) = Caller supplied storage for the returned client id - * of the thread (optional) - * StartRoutine = Entry point for the thread - * StartContext = Argument supplied to the thread when it begins - * execution - * RETURNS: Success or failure status - */ -{ - PETHREAD Thread; - NTSTATUS Status; - KIRQL oldIrql; - - PAGED_CODE(); - - DPRINT("PsCreateSystemThread(ThreadHandle %x, ProcessHandle %x)\n", - ThreadHandle,ProcessHandle); - - Status = PsInitializeThread( - NULL, - &Thread, - ObjectAttributes, - KernelMode, - FALSE); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - /* Set the thread as a system thread */ - Thread->SystemThread = TRUE; - - Status = PsCreateCidHandle(Thread, - PsThreadType, - &Thread->Cid.UniqueThread); - if(!NT_SUCCESS(Status)) - { - ObDereferenceObject(Thread); - return Status; - } - - Thread->StartAddress = StartRoutine; - Status = KiArchInitThread ( - &Thread->Tcb, StartRoutine, StartContext); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Thread); - return(Status); - } - - if (ClientId != NULL) - { - *ClientId=Thread->Cid; - } - - oldIrql = KeAcquireDispatcherDatabaseLock (); - KiUnblockThread(&Thread->Tcb, NULL, 0); - KeReleaseDispatcherDatabaseLock(oldIrql); - - Status = ObInsertObject( - (PVOID)Thread, - NULL, - DesiredAccess, - 0, - NULL, - ThreadHandle); - - /* don't dereference the thread, the initial reference serves as the keep-alive - reference which will be removed by the thread reaper */ - - return Status; -} - - -VOID STDCALL -PspRunCreateThreadNotifyRoutines ( - PETHREAD CurrentThread, - BOOLEAN Create ) -{ - ULONG i; - CLIENT_ID Cid = CurrentThread->Cid; - - for (i = 0; i < PiThreadNotifyRoutineCount; i++) - { - PiThreadNotifyRoutine[i](Cid.UniqueProcess, Cid.UniqueThread, Create); - } -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -PsSetCreateThreadNotifyRoutine ( - IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine ) -{ - if (PiThreadNotifyRoutineCount >= MAX_THREAD_NOTIFY_ROUTINE_COUNT) - { - return(STATUS_INSUFFICIENT_RESOURCES); - } - - PiThreadNotifyRoutine[PiThreadNotifyRoutineCount] = NotifyRoutine; - PiThreadNotifyRoutineCount++; - - return(STATUS_SUCCESS); -} - -/* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-04-18 02:11:19 UTC (rev 14661) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-04-18 02:12:30 UTC (rev 14662) @@ -81,6 +81,35 @@ VOID STDCALL +PspKillMostProcesses(VOID) +{ + PLIST_ENTRY current_entry; + PEPROCESS current; + + /* Acquire the Active Process Lock */ + ExAcquireFastMutex(&PspActiveProcessMutex); + + /* Loop all processes on the list */ + current_entry = PsActiveProcessHead.Flink; + while (current_entry != &PsActiveProcessHead) + { + current = CONTAINING_RECORD(current_entry, EPROCESS, ProcessListEntry); + current_entry = current_entry->Flink; + + if (current->UniqueProcessId != PsInitialSystemProcess->UniqueProcessId && + current->UniqueProcessId != PsGetCurrentProcessId()) + { + /* Terminate all the Threads in this Process */ + PspTerminateProcessThreads(current, STATUS_SUCCESS); + } + } + + /* Release the lock */ + ExReleaseFastMutex(&PspActiveProcessMutex); +} + +VOID +STDCALL PspTerminateProcessThreads(PEPROCESS Process, NTSTATUS ExitStatus) { _____ Added: trunk/reactos/ntoskrnl/ps/notify.c --- trunk/reactos/ntoskrnl/ps/notify.c 2005-04-18 02:11:19 UTC (rev 14661) +++ trunk/reactos/ntoskrnl/ps/notify.c 2005-04-18 02:12:30 UTC (rev 14662) @@ -0,0 +1,194 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ps/notify.c + * PURPOSE: Notifications + * + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +/* GLOBAL *******************************************************************/ + +#define MAX_THREAD_NOTIFY_ROUTINE_COUNT 8 +#define TAG_KAPC TAG('k','p','a','p') /* kpap - kernel ps apc */ + +static ULONG PiThreadNotifyRoutineCount = 0; +static PCREATE_THREAD_NOTIFY_ROUTINE +PiThreadNotifyRoutine[MAX_THREAD_NOTIFY_ROUTINE_COUNT]; + +static PCREATE_PROCESS_NOTIFY_ROUTINE +PspProcessNotifyRoutine[MAX_PROCESS_NOTIFY_ROUTINE_COUNT]; + +static PLOAD_IMAGE_NOTIFY_ROUTINE +PspLoadImageNotifyRoutine[MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT]; + +/* FUNCTIONS ***************************************************************/ + +/* + * @implemented + */ +NTSTATUS +STDCALL +PsSetCreateProcessNotifyRoutine(IN PCREATE_PROCESS_NOTIFY_ROUTINE NotifyRoutine, + IN BOOLEAN Remove) +{ + ULONG i; + + /* Check if it's a removal or addition */ + if (Remove) + { + /* Loop the routines */ + for(i=0;i<MAX_PROCESS_NOTIFY_ROUTINE_COUNT;i++) + { + /* Check for a match */ + if ((PVOID)PspProcessNotifyRoutine[i] == (PVOID)NotifyRoutine) + { + /* Remove and return */ + PspProcessNotifyRoutine[i] = NULL; + return(STATUS_SUCCESS); + } + } + } + else + { + /* Loop the routines */ + for(i=0;i<MAX_PROCESS_NOTIFY_ROUTINE_COUNT;i++) + { + /* Find an empty one */ + if (PspProcessNotifyRoutine[i] == NULL) + { + /* Add it */ + PspProcessNotifyRoutine[i] = NotifyRoutine; + return STATUS_SUCCESS; + } + } + } + + /* Nothing found */ + return STATUS_INVALID_PARAMETER; +} + +/* + * @implemented + */ +NTSTATUS +STDCALL +PsRemoveLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) +{ + ULONG i; + + /* Loop the routines */ + for(i=0;i<MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT;i++) + { + /* Check for a match */ + if ((PVOID)PspLoadImageNotifyRoutine[i] == (PVOID)NotifyRoutine) + { + /* Remove and return */ + PspLoadImageNotifyRoutine[i] = NULL; + return(STATUS_SUCCESS); + } + } + + /* Nothing found */ + return STATUS_INVALID_PARAMETER; +} + +/* + * @implemented + */ +NTSTATUS +STDCALL +PsSetLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) +{ + ULONG i; + + /* Loop the routines */ + for (i = 0; i < MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT; i++) + { + /* Find an empty one */ + if (PspLoadImageNotifyRoutine[i] == NULL) + { + /* Add it */ + PspLoadImageNotifyRoutine[i] = NotifyRoutine; + return STATUS_SUCCESS; + } + } + + /* Nothing found */ + return STATUS_INVALID_PARAMETER; +} + +VOID STDCALL +PspRunCreateThreadNotifyRoutines ( + PETHREAD CurrentThread, + BOOLEAN Create ) +{ + ULONG i; + CLIENT_ID Cid = CurrentThread->Cid; + + for (i = 0; i < PiThreadNotifyRoutineCount; i++) + { + PiThreadNotifyRoutine[i](Cid.UniqueProcess, Cid.UniqueThread, Create); + } +} + +VOID +STDCALL +PspRunCreateProcessNotifyRoutines(PEPROCESS CurrentProcess, + BOOLEAN Create) +{ + ULONG i; + HANDLE ProcessId = (HANDLE)CurrentProcess->UniqueProcessId; + HANDLE ParentId = CurrentProcess->InheritedFromUniqueProcessId; + + for(i = 0; i < MAX_PROCESS_NOTIFY_ROUTINE_COUNT; ++i) + { + if(PspProcessNotifyRoutine[i]) + { + PspProcessNotifyRoutine[i](ParentId, ProcessId, Create); + } + } +} + +VOID +STDCALL +PspRunLoadImageNotifyRoutines(PUNICODE_STRING FullImageName, + HANDLE ProcessId, + PIMAGE_INFO ImageInfo) +{ + ULONG i; + + for (i = 0; i < MAX_PROCESS_NOTIFY_ROUTINE_COUNT; ++ i) + { + if (PspLoadImageNotifyRoutine[i]) + { + PspLoadImageNotifyRoutine[i](FullImageName, ProcessId, ImageInfo); + } + } +} + +/* + * @implemented + */ +NTSTATUS STDCALL +PsSetCreateThreadNotifyRoutine ( + IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine ) +{ + if (PiThreadNotifyRoutineCount >= MAX_THREAD_NOTIFY_ROUTINE_COUNT) + { + return(STATUS_INSUFFICIENT_RESOURCES); + } + + PiThreadNotifyRoutine[PiThreadNotifyRoutineCount] = NotifyRoutine; + PiThreadNotifyRoutineCount++; + + return(STATUS_SUCCESS); +} + +/* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-04-18 02:11:19 UTC (rev 14661) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-04-18 02:12:30 UTC (rev 14662) @@ -1,11 +1,11 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ps/process.c * PURPOSE: Process managment * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * David Welch (welch(a)cwcom.net) */ /* INCLUDES ******************************************************************/ @@ -16,347 +16,156 @@ [truncated at 1000 lines; 2478 more skipped]

19 years, 8 months

[ion] 14661: Forgot this

by ion＠svn.reactos.com

Forgot this Added: trunk/reactos/ntoskrnl/mm/process.c _____ Added: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-04-18 00:42:31 UTC (rev 14660) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-04-18 02:11:19 UTC (rev 14661) @@ -0,0 +1,373 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/mm/process.c + * PURPOSE: Memory functions related to Processes + * + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +extern ULONG NtMajorVersion; +extern ULONG NtMinorVersion; +extern ULONG NtOSCSDVersion; +/* FUNCTIONS *****************************************************************/ + +PVOID +STDCALL +MiCreatePebOrTeb(PEPROCESS Process, + PVOID BaseAddress) +{ + NTSTATUS Status; + PMADDRESS_SPACE ProcessAddressSpace = &Process->AddressSpace; + PMEMORY_AREA MemoryArea; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + BoundaryAddressMultiple.QuadPart = 0; + + /* Acquire the Lock */ + MmLockAddressSpace(ProcessAddressSpace); + + /* Create a Peb or Teb */ + Status = MmCreateMemoryArea(Process, + ProcessAddressSpace, + MEMORY_AREA_PEB_OR_TEB, + &BaseAddress, + PAGE_SIZE, + PAGE_READWRITE, + &MemoryArea, + FALSE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to allocate PEB or TEB\n"); + } + + /* Initialize the Region */ + MmInitialiseRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, + PAGE_SIZE, + MEM_COMMIT, + PAGE_READWRITE); + + /* Reserve the pages */ + MmReserveSwapPages(PAGE_SIZE); + + /* Unlock Address Space */ + DPRINT("Returning\n"); + MmUnlockAddressSpace(ProcessAddressSpace); + return BaseAddress; +} + +VOID +MiFreeStackPage(PVOID Context, + MEMORY_AREA* MemoryArea, + PVOID Address, + PFN_TYPE Page, + SWAPENTRY SwapEntry, + BOOLEAN Dirty) +{ + ASSERT(SwapEntry == 0); + if (Page) MmReleasePageMemoryConsumer(MC_NPPOOL, Page); +} + +VOID +STDCALL +MmDeleteKernelStack(PVOID Stack, + BOOLEAN GuiStack) +{ + /* Lock the Address Space */ + MmLockAddressSpace(MmGetKernelAddressSpace()); + + /* Delete the Stack */ + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + Stack, + MiFreeStackPage, + NULL); + + /* Unlock the Address Space */ + MmUnlockAddressSpace(MmGetKernelAddressSpace()); +} + +PVOID +STDCALL +MmCreateKernelStack(BOOLEAN GuiStack) +{ + PMEMORY_AREA StackArea; + ULONG i; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + PFN_TYPE Page[MM_STACK_SIZE / PAGE_SIZE]; + PVOID KernelStack = NULL; + NTSTATUS Status; + + /* Initialize the Boundary Address */ + BoundaryAddressMultiple.QuadPart = 0; + + /* Lock the Kernel Address Space */ + MmLockAddressSpace(MmGetKernelAddressSpace()); + + /* Create a MAREA for the Kernel Stack */ + Status = MmCreateMemoryArea(NULL, + MmGetKernelAddressSpace(), + MEMORY_AREA_KERNEL_STACK, + &KernelStack, + MM_STACK_SIZE, + 0, + &StackArea, + FALSE, + FALSE, + BoundaryAddressMultiple); + + /* Unlock the Address Space */ + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + + /* Check for Success */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create thread stack\n"); + KEBUGCHECK(0); + } + + /* Mark the Stack in use */ + for (i = 0; i < (MM_STACK_SIZE / PAGE_SIZE); i++) + { + Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page[i]); + } + + /* Create a Virtual Mapping for it */ + Status = MmCreateVirtualMapping(NULL, + KernelStack, + PAGE_READWRITE, + Page, + MM_STACK_SIZE / PAGE_SIZE); + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not create Virtual Mapping for Kernel Stack\n"); + KEBUGCHECK(0); + } + + return KernelStack; +} + +NTSTATUS +STDCALL +MmCreatePeb(PEPROCESS Process) +{ + PPEB Peb = NULL; + LARGE_INTEGER SectionOffset; + ULONG ViewSize = 0; + PVOID TableBase = NULL; + NTSTATUS Status; + SectionOffset.QuadPart = (ULONGLONG)0; + + DPRINT("MmCreatePeb\n"); + + /* Map NLS Tables */ + DPRINT("Mapping NLS\n"); + Status = MmMapViewOfSection(NlsSectionObject, + Process, + &TableBase, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + MEM_TOP_DOWN, + PAGE_READONLY); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmMapViewOfSection() failed (Status %lx)\n", Status); + return(Status); + } + DPRINT("TableBase %p ViewSize %lx\n", TableBase, ViewSize); + + /* Attach to Process */ + KeAttachProcess(&Process->Pcb); + + /* Allocate the PEB */ + Peb = MiCreatePebOrTeb(Process, (PVOID)PEB_BASE); + + /* Initialize the PEB */ + DPRINT("Allocated: %x\n", Peb); + RtlZeroMemory(Peb, sizeof(PEB)); + + /* Set up data */ + DPRINT("Setting up PEB\n"); + Peb->ImageBaseAddress = Process->SectionBaseAddress; + Peb->OSMajorVersion = NtMajorVersion; + Peb->OSMinorVersion = NtMinorVersion; + Peb->OSBuildNumber = 2195; + Peb->OSPlatformId = 2; //VER_PLATFORM_WIN32_NT; + Peb->OSCSDVersion = NtOSCSDVersion; + Peb->AnsiCodePageData = (char*)TableBase + NlsAnsiTableOffset; + Peb->OemCodePageData = (char*)TableBase + NlsOemTableOffset; + Peb->UnicodeCaseTableData = (char*)TableBase + NlsUnicodeTableOffset; + Peb->NumberOfProcessors = KeNumberProcessors; + Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL ? TRUE : FALSE); + + Process->Peb = Peb; + KeDetachProcess(); + + DPRINT("MmCreatePeb: Peb created at %p\n", Peb); + return STATUS_SUCCESS; +} + +VOID +STDCALL +MmCreateTeb(VOID) +{ + +} + +NTSTATUS +STDCALL +MmCreateProcessAddressSpace(IN PEPROCESS Process, + IN PSECTION_OBJECT Section OPTIONAL) +{ + NTSTATUS Status; + PMADDRESS_SPACE ProcessAddressSpace = &Process->AddressSpace; + PVOID BaseAddress; + PMEMORY_AREA MemoryArea; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + BoundaryAddressMultiple.QuadPart = 0; + ULONG ViewSize = 0; + PVOID ImageBase = 0; + + /* Initialize the Addresss Space */ + MmInitializeAddressSpace(Process, ProcessAddressSpace); + + /* Acquire the Lock */ + MmLockAddressSpace(ProcessAddressSpace); + + /* Protect the highest 64KB of the process address space */ + BaseAddress = (PVOID)MmUserProbeAddress; + Status = MmCreateMemoryArea(Process, + ProcessAddressSpace, + MEMORY_AREA_NO_ACCESS, + &BaseAddress, + 0x10000, + PAGE_NOACCESS, + &MemoryArea, + FALSE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to protect last 64KB\n"); + goto exit; + } + + /* Protect the 60KB above the shared user page */ + BaseAddress = (char*)USER_SHARED_DATA + PAGE_SIZE; + Status = MmCreateMemoryArea(Process, + ProcessAddressSpace, + MEMORY_AREA_NO_ACCESS, + &BaseAddress, + 0x10000 - PAGE_SIZE, + PAGE_NOACCESS, + &MemoryArea, + FALSE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to protect the memory above the shared user page\n"); + goto exit; + } + + /* Create the shared data page */ + BaseAddress = (PVOID)USER_SHARED_DATA; + Status = MmCreateMemoryArea(Process, + ProcessAddressSpace, + MEMORY_AREA_SHARED_DATA, + &BaseAddress, + PAGE_SIZE, + PAGE_READONLY, + &MemoryArea, + FALSE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create Shared User Data\n"); + goto exit; + } + + /* Check if there's a Section Object */ + if (Section) + { + UNICODE_STRING FileName; + PWCHAR szSrc; + PCHAR szDest; + USHORT lnFName = 0; + + /* Unlock the Address Space */ + DPRINT("Unlocking\n"); + MmUnlockAddressSpace(ProcessAddressSpace); + + DPRINT("Mapping process image. Section: %p, Process: %p, ImageBase: %p\n", + Section, Process, &ImageBase); + Status = MmMapViewOfSection(Section, + Process, + (PVOID*)&ImageBase, + 0, + 0, + NULL, + &ViewSize, + 0, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to map process Image\n"); + ObDereferenceObject(Section); + goto exit; + } + ObDereferenceObject(Section); + + /* Save the pointer */ + Process->SectionBaseAddress = ImageBase; + + /* Determine the image file name and save it to EPROCESS */ + DPRINT("Getting Image name\n"); + FileName = Section->FileObject->FileName; + szSrc = (PWCHAR)(FileName.Buffer + (FileName.Length / sizeof(WCHAR)) - 1); + + while(szSrc >= FileName.Buffer) + { + if(*szSrc == L'\\') + { + szSrc++; + break; + } + else + { + szSrc--; + lnFName++; + } + } + + /* Copy the to the process and truncate it to 15 characters if necessary */ + DPRINT("Copying and truncating\n"); + szDest = Process->ImageFileName; + lnFName = min(lnFName, sizeof(Process->ImageFileName) - 1); + while(lnFName-- > 0) *(szDest++) = (UCHAR)*(szSrc++); + + /* Return status to caller */ + return Status; + } + +exit: + /* Unlock the Address Space */ + DPRINT("Unlocking\n"); + MmUnlockAddressSpace(ProcessAddressSpace); + + /* Return status to caller */ + return Status; +}

19 years, 8 months

[ion] 14660: Mini-merge from my local changes. Rewrite of Process Creation. Notable improvements:

by ion＠svn.reactos.com

Mini-merge from my local changes. Rewrite of Process Creation. Notable improvements: - Subsystemization of Process Creation code. Memory code done by new Mm functions (not all used yet), Kernel code done by Ke*, etc. - Written to be compatible with the information in "Windows Internals". - Optimized and cleaned up. - ObInsertObject is now called at the end, fixing a plethora of wrong things that were covered with FIXMEs. - PEB is allocated with a Memory Area, and so will TEB soon, which allows 4KB allocation without 64KB gra nularity. - System DLL Mapping/Loading has been changed to be cached at system bootup, resulting in faster code. Also changed Peb to report NT 5.0 NOTE: Messy, more to come soon. The full benefits of this patch won't be realized until the complete changes are in. Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ke/process.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/ob/wait.c Modified: trunk/reactos/ntoskrnl/ps/create.c Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/Makefile 2005-04-18 00:42:31 UTC (rev 14660) @@ -144,6 +144,7 @@ mm/pool.o \ mm/ppool.o \ mm/physical.o \ + mm/process.o \ mm/region.o \ mm/rmap.o \ mm/section.o \ _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -494,7 +494,7 @@ /* Initialize I/O Objects, Filesystems, Error Logging and Shutdown */ IoInit(); - + /* TBD */ PoInit((PLOADER_PARAMETER_BLOCK)&KeLoaderBlock, ForceAcpiDisable); @@ -562,6 +562,9 @@ /* Create ARC Names, SystemRoot SymLink, Load Drivers and Assign Letters */ IoInit3(); + + /* Load the System DLL and its Entrypoints */ + LdrpInitializeSystemDll(); /* Initialize the Default Locale */ PiInitDefaultLocale(); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-18 00:42:31 UTC (rev 14660) @@ -259,7 +259,14 @@ KiAbortWaitThread(PKTHREAD Thread, NTSTATUS WaitStatus, KPRIORITY Increment); - + +VOID +STDCALL +KeInitializeProcess(struct _KPROCESS *Process, + KPRIORITY Priority, + KAFFINITY Affinity, + LARGE_INTEGER DirectoryTableBase); + ULONG STDCALL KeForceResumeThread(IN PKTHREAD Thread); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ldr.h --- trunk/reactos/ntoskrnl/include/internal/ldr.h 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/include/internal/ldr.h 2005-04-18 00:42:31 UTC (rev 14660) @@ -34,10 +34,18 @@ ); NTSTATUS -LdrpMapSystemDll ( - HANDLE ProcessHandle, - PVOID * LdrStartupAddress - ); +STDCALL +LdrpMapSystemDll(PEPROCESS Process, + PVOID *DllBase); + +NTSTATUS +STDCALL +LdrpInitializeSystemDll(VOID); + +NTSTATUS +STDCALL +LdrpGetSystemDllEntryPoints(VOID); + PVOID LdrpGetSystemDllEntryPoint (VOID); PVOID _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-04-18 00:42:31 UTC (rev 14660) @@ -37,6 +37,7 @@ #define MEMORY_AREA_KERNEL_STACK (11) #define MEMORY_AREA_PAGED_POOL (12) #define MEMORY_AREA_NO_ACCESS (13) +#define MEMORY_AREA_PEB_OR_TEB (14) #define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \ ((x) / (4*1024*1024)) @@ -496,6 +497,17 @@ VOID MmShowOutOfSpaceMessagePagingFile(VOID); +/* process.c ****************************************************************/ + +NTSTATUS +STDCALL +MmCreateProcessAddressSpace(IN struct _EPROCESS* Process, + IN PSECTION_OBJECT Section OPTIONAL); + +NTSTATUS +STDCALL +MmCreatePeb(PEPROCESS Process); + /* i386/pfault.c *************************************************************/ NTSTATUS MmPageFault(ULONG Cs, @@ -579,6 +591,17 @@ VOID MmInitializePageOp(VOID); +/* process.c *****************************************************************/ + +PVOID +STDCALL +MmCreateKernelStack(BOOLEAN GuiStack); + +VOID +STDCALL +MmDeleteKernelStack(PVOID Stack, + BOOLEAN GuiStack); + /* balace.c ******************************************************************/ VOID MmInitializeMemoryConsumer(ULONG Consumer, @@ -737,7 +760,11 @@ PFN_TYPE MmGetPfnForProcess(struct _EPROCESS* Process, PVOID Address); -NTSTATUS MmCopyMmInfo(struct _EPROCESS* Src, struct _EPROCESS* Dest); +NTSTATUS +STDCALL +MmCopyMmInfo(struct _EPROCESS* Src, + struct _EPROCESS* Dest, + PPHYSICAL_ADDRESS DirectoryTableBase); NTSTATUS MmReleaseMmInfo(struct _EPROCESS* Process); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-18 00:42:31 UTC (rev 14660) @@ -492,6 +492,11 @@ PVOID *NormalContext, PVOID *SystemArgument1, PVOID *SystemArgument2); + +NTSTATUS +STDCALL +PspInitializeProcessSecurity(PEPROCESS Process, + PEPROCESS Parent OPTIONAL); #define THREAD_STATE_INITIALIZED (0) #define THREAD_STATE_READY (1) _____ Modified: trunk/reactos/ntoskrnl/include/internal/se.h --- trunk/reactos/ntoskrnl/include/internal/se.h 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/include/internal/se.h 2005-04-18 00:42:31 UTC (rev 14660) @@ -117,9 +117,7 @@ VOID SepInitializeTokenImplementation(VOID); -NTSTATUS SepCreateSystemProcessToken(struct _EPROCESS* Process); -NTSTATUS SepInitializeNewProcess(struct _EPROCESS* NewProcess, - struct _EPROCESS* ParentProcess); +PTOKEN STDCALL SepCreateSystemProcessToken(VOID); NTSTATUS SeExchangePrimaryToken(struct _EPROCESS* Process, PACCESS_TOKEN NewToken, @@ -149,6 +147,16 @@ KPROCESSOR_MODE PreviousMode); NTSTATUS +STDCALL +SepDuplicateToken(PTOKEN Token, + POBJECT_ATTRIBUTES ObjectAttributes, + BOOLEAN EffectiveOnly, + TOKEN_TYPE TokenType, + SECURITY_IMPERSONATION_LEVEL Level, + KPROCESSOR_MODE PreviousMode, + PTOKEN* NewAccessToken); + +NTSTATUS SepCaptureSecurityQualityOfService(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN KPROCESSOR_MODE AccessMode, IN POOL_TYPE PoolType, _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -756,6 +756,7 @@ Esp[4] = (ULONG)SystemArgument2; Esp[5] = (ULONG)Context; TrapFrame->Eip = (ULONG)LdrpGetSystemDllApcDispatcher(); + DPRINT("TrapFrame->Eip: %x\n", TrapFrame->Eip); TrapFrame->Esp = (ULONG)Esp; } _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -205,13 +205,14 @@ } else { /* Set the Thread Data as Requested */ - DPRINT("Dispatching Thread as blocked\n"); + DPRINT("Dispatching Thread as blocked: %d\n", Thread->WaitStatus); Thread->Alertable = Alertable; Thread->WaitMode = (UCHAR)WaitMode; Thread->WaitReason = WaitReason; /* Dispatch it and return status */ KiDispatchThreadNoLock(THREAD_STATE_BLOCKED); + DPRINT("Dispatching Thread as blocked: %d\n", Thread->WaitStatus); if (Status != NULL) *Status = Thread->WaitStatus; } _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -19,7 +19,7 @@ #define BUILD_OSCSDVERSION(major, minor) (((major & 0xFF) << 8) | (minor & 0xFF)) -ULONG NtMajorVersion = 4; +ULONG NtMajorVersion = 5; ULONG NtMinorVersion = 0; ULONG NtOSCSDVersion = BUILD_OSCSDVERSION(6, 0); #ifdef __GNUC__ _____ Modified: trunk/reactos/ntoskrnl/ke/process.c --- trunk/reactos/ntoskrnl/ke/process.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ke/process.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -53,6 +53,35 @@ MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); } +VOID +STDCALL +KeInitializeProcess(PKPROCESS Process, + KPRIORITY Priority, + KAFFINITY Affinity, + LARGE_INTEGER DirectoryTableBase) +{ + DPRINT1("KeInitializeProcess. Process: %x, DirectoryTableBase: %x\n", Process, DirectoryTableBase); + + /* Initialize the Dispatcher Header */ + KeInitializeDispatcherHeader(&Process->DispatcherHeader, + ProcessObject, + sizeof(KPROCESS), + FALSE); + + /* Initialize Scheduler Data, Disable Alignment Faults and Set the PDE */ + Process->Affinity = Affinity; + Process->BasePriority = Priority; + Process->ThreadQuantum = 6; + Process->DirectoryTableBase = DirectoryTableBase; + Process->AutoAlignment = TRUE; + Process->IopmOffset = 0xFFFF; + Process->State = PROCESS_STATE_ACTIVE; + + /* Initialize the Thread List */ + InitializeListHead(&Process->ThreadListHead); + DPRINT1("The Process has now been initalized with the Kernel\n"); +} + ULONG STDCALL KeSetProcess(PKPROCESS Process, @@ -148,6 +177,7 @@ } /* Swap the Processes */ + DPRINT("Swapping\n"); KiSwapProcess(Process, SavedApcState->Process); /* Return to old IRQL*/ _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -445,7 +445,6 @@ */ if (CurrentObject->Type == IO_TYPE_FILE) { - DPRINT1("Hack used: %x\n", &((PFILE_OBJECT)CurrentObject)->Event); CurrentObject = (PDISPATCHER_HEADER)(&((PFILE_OBJECT)CurrentObject)->Event); } @@ -571,7 +570,7 @@ DPRINT("Waking Queue\n"); KiWakeQueue(CurrentThread->Queue); } - + /* Block the Thread */ DPRINT("Blocking the Thread: %d, %d, %d, %x\n", Alertable, WaitMode, WaitReason, KeGetCurrentThread()); KiBlockThread(&Status, _____ Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c --- trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -24,6 +24,9 @@ PVOID SystemDllExceptionDispatcher = NULL; PVOID SystemDllRaiseExceptionDispatcher = NULL; +PVOID LdrpSystemDllBase = NULL; +PVOID LdrpSystemDllSection = NULL; + /* FUNCTIONS *****************************************************************/ PVOID LdrpGetSystemDllExceptionDispatcher(VOID) @@ -51,282 +54,223 @@ return(SystemDllRaiseExceptionDispatcher); } -NTSTATUS LdrpMapSystemDll(HANDLE ProcessHandle, - PVOID* LdrStartupAddr) -/* - * FUNCTION: LdrpMapSystemDll maps the system dll into the specified process - * address space and returns its startup address. - * PARAMETERS: - * ProcessHandle - * Points to the process to map the system dll into - * - * LdrStartupAddress - * Receives the startup address of the system dll on function - * completion - * - * RETURNS: Status - */ +NTSTATUS +STDCALL +LdrpGetSystemDllEntryPoints(VOID) { - CHAR BlockBuffer [1024]; - DWORD ImageBase; - ULONG ImageSize; - NTSTATUS Status; - OBJECT_ATTRIBUTES FileObjectAttributes; - HANDLE FileHandle; - HANDLE NTDllSectionHandle; - UNICODE_STRING DllPathname = ROS_STRING_INITIALIZER(L"\\SystemRoot\\system32\\ntdll.dll"); - PIMAGE_DOS_HEADER DosHeader; - PIMAGE_NT_HEADERS NTHeaders; - PEPROCESS Process, CurrentProcess; - ANSI_STRING ProcedureName; - ULONG ViewSize; - IO_STATUS_BLOCK Iosb; + ANSI_STRING ProcedureName; + NTSTATUS Status; + + /* Retrieve ntdll's startup address */ + DPRINT("Getting Entrypoint: %p\n", LdrpSystemDllBase); + RtlInitAnsiString(&ProcedureName, "LdrInitializeThunk"); + Status = LdrGetProcedureAddress((PVOID)LdrpSystemDllBase, + &ProcedureName, + 0, + &SystemDllEntryPoint); + + if (!NT_SUCCESS(Status)) { + + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); + return (Status); + } - /* - * Locate and open NTDLL to determine ImageBase - * and LdrStartup - */ - InitializeObjectAttributes(&FileObjectAttributes, - &DllPathname, - 0, - NULL, - NULL); - DPRINT("Opening NTDLL\n"); - Status = ZwOpenFile(&FileHandle, - FILE_READ_ACCESS, - &FileObjectAttributes, - &Iosb, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NTDLL open failed (Status %x)\n", Status); - return Status; - } - Status = ZwReadFile(FileHandle, - 0, - 0, - 0, - &Iosb, - BlockBuffer, - sizeof(BlockBuffer), - 0, - 0); - if (!NT_SUCCESS(Status) || Iosb.Information != sizeof(BlockBuffer)) - { - DPRINT1("NTDLL header read failed (Status %x)\n", Status); - ZwClose(FileHandle); - return Status; - } + /* Get User APC Dispatcher */ + DPRINT("Getting Entrypoint\n"); + RtlInitAnsiString(&ProcedureName, "KiUserApcDispatcher"); + Status = LdrGetProcedureAddress((PVOID)LdrpSystemDllBase, + &ProcedureName, + 0, + &SystemDllApcDispatcher); + + if (!NT_SUCCESS(Status)) { + + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); + return (Status); + } + + /* Get Exception Dispatcher */ + DPRINT("Getting Entrypoint\n"); + RtlInitAnsiString(&ProcedureName, "KiUserExceptionDispatcher"); + Status = LdrGetProcedureAddress((PVOID)LdrpSystemDllBase, + &ProcedureName, + 0, + &SystemDllExceptionDispatcher); + + if (!NT_SUCCESS(Status)) { + + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); + return (Status); + } + + /* Get Callback Dispatcher */ + DPRINT("Getting Entrypoint\n"); + RtlInitAnsiString(&ProcedureName, "KiUserCallbackDispatcher"); + Status = LdrGetProcedureAddress((PVOID)LdrpSystemDllBase, + &ProcedureName, + 0, + &SystemDllCallbackDispatcher); + + if (!NT_SUCCESS(Status)) { + + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); + return (Status); + } + + /* Get Raise Exception Dispatcher */ + DPRINT("Getting Entrypoint\n"); + RtlInitAnsiString(&ProcedureName, "KiRaiseUserExceptionDispatcher"); + Status = LdrGetProcedureAddress((PVOID)LdrpSystemDllBase, + &ProcedureName, + 0, + &SystemDllRaiseExceptionDispatcher); + + if (!NT_SUCCESS(Status)) { + + DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); + return (Status); + } - /* - * FIXME: this will fail if the NT headers are - * more than 1024 bytes from start. - */ - DosHeader = (PIMAGE_DOS_HEADER) BlockBuffer; - NTHeaders = (PIMAGE_NT_HEADERS) (BlockBuffer + DosHeader->e_lfanew); - if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE) - || (DosHeader->e_lfanew == 0L) - || (*(PULONG) NTHeaders != IMAGE_NT_SIGNATURE)) - { - DPRINT1("NTDLL format invalid\n"); - ZwClose(FileHandle); - return(STATUS_UNSUCCESSFUL); - } - ImageBase = NTHeaders->OptionalHeader.ImageBase; - ImageSize = NTHeaders->OptionalHeader.SizeOfImage; - - /* - * Create a section for NTDLL - */ - DPRINT("Creating section\n"); - Status = ZwCreateSection(&NTDllSectionHandle, - SECTION_ALL_ACCESS, - NULL, - NULL, - PAGE_READONLY, - SEC_IMAGE | SEC_COMMIT, - FileHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NTDLL create section failed (Status %x)\n", Status); - ZwClose(FileHandle); - return(Status); - } - ZwClose(FileHandle); - - /* - * Map the NTDLL into the process - */ - ViewSize = 0; - ImageBase = 0; - Status = ZwMapViewOfSection(NTDllSectionHandle, - ProcessHandle, - (PVOID*)&ImageBase, - 0, - ViewSize, - NULL, - &ViewSize, - 0, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NTDLL map view of secion failed (Status %x)", Status); - ZwClose(NTDllSectionHandle); - return(Status); - } + /* Return success */ + return(STATUS_SUCCESS); +} - DPRINT("Referencing process\n"); - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_ALL_ACCESS, - PsProcessType, - KernelMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObReferenceObjectByProcess() failed (Status %x)\n", Status); - return(Status); - } +NTSTATUS +STDCALL +LdrpMapSystemDll(PEPROCESS Process, + PVOID *DllBase) +{ + NTSTATUS Status; + ULONG ViewSize = 0; + PVOID ImageBase = 0; + + /* Map the System DLL */ + DPRINT("Mapping System DLL\n"); + Status = MmMapViewOfSection(LdrpSystemDllSection, + Process, + (PVOID*)&ImageBase, + 0, + 0, + NULL, + &ViewSize, + 0, + MEM_COMMIT, + PAGE_READWRITE); + + if (!NT_SUCCESS(Status)) { + + DPRINT1("Failed to map System DLL Into Process\n"); + } + + if (DllBase) *DllBase = ImageBase; + + return Status; +} - CurrentProcess = PsGetCurrentProcess(); - if (Process != CurrentProcess) - { - DPRINT("Attaching to Process\n"); - KeAttachProcess(&Process->Pcb); +NTSTATUS +STDCALL +LdrpInitializeSystemDll(VOID) +{ + UNICODE_STRING DllPathname = ROS_STRING_INITIALIZER(L"\\SystemRoot\\system32\\ntdll.dll"); + OBJECT_ATTRIBUTES FileObjectAttributes; + IO_STATUS_BLOCK Iosb; + HANDLE FileHandle; + HANDLE NTDllSectionHandle; + NTSTATUS Status; + CHAR BlockBuffer[1024]; + PIMAGE_DOS_HEADER DosHeader; + PIMAGE_NT_HEADERS NTHeaders; + + /* Locate and open NTDLL to determine ImageBase and LdrStartup */ + InitializeObjectAttributes(&FileObjectAttributes, + &DllPathname, + 0, + NULL, + NULL); + + DPRINT("Opening NTDLL\n"); + Status = ZwOpenFile(&FileHandle, + FILE_READ_ACCESS, + &FileObjectAttributes, + &Iosb, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + + if (!NT_SUCCESS(Status)) { + DPRINT1("NTDLL open failed (Status %x)\n", Status); + return Status; } - - /* - * retrieve ntdll's startup address - */ - if (SystemDllEntryPoint == NULL) - { - RtlInitAnsiString (&ProcedureName, - "LdrInitializeThunk"); - Status = LdrGetProcedureAddress ((PVOID)ImageBase, - &ProcedureName, - 0, - &SystemDllEntryPoint); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); - if (Process != CurrentProcess) - { - KeDetachProcess(); - } - ObDereferenceObject(Process); - ZwClose(NTDllSectionHandle); - return (Status); - } - *LdrStartupAddr = SystemDllEntryPoint; - } - - /* - * Retrieve the offset of the APC dispatcher from NTDLL - */ - if (SystemDllApcDispatcher == NULL) - { - RtlInitAnsiString (&ProcedureName, - "KiUserApcDispatcher"); - Status = LdrGetProcedureAddress ((PVOID)ImageBase, - &ProcedureName, - 0, - &SystemDllApcDispatcher); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); - if (Process != CurrentProcess) - { - KeDetachProcess(); - } - ObDereferenceObject(Process); - ZwClose(NTDllSectionHandle); - return (Status); - } - } - - /* - * Retrieve the offset of the exception dispatcher from NTDLL - */ - if (SystemDllExceptionDispatcher == NULL) - { - RtlInitAnsiString (&ProcedureName, - "KiUserExceptionDispatcher"); - Status = LdrGetProcedureAddress ((PVOID)ImageBase, - &ProcedureName, - 0, - &SystemDllExceptionDispatcher); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); - if (Process != CurrentProcess) - { - KeDetachProcess(); - } - ObDereferenceObject(Process); - ZwClose(NTDllSectionHandle); - return (Status); - } - } - - /* - * Retrieve the offset of the callback dispatcher from NTDLL - */ - if (SystemDllCallbackDispatcher == NULL) - { - RtlInitAnsiString (&ProcedureName, - "KiUserCallbackDispatcher"); - Status = LdrGetProcedureAddress ((PVOID)ImageBase, - &ProcedureName, - 0, - &SystemDllCallbackDispatcher); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); - if (Process != CurrentProcess) - { - KeDetachProcess(); - } - ObDereferenceObject(Process); - ZwClose(NTDllSectionHandle); - return (Status); - } - } - - /* - * Retrieve the offset of the raise exception dispatcher from NTDLL - */ - if (SystemDllRaiseExceptionDispatcher == NULL) - { - RtlInitAnsiString (&ProcedureName, - "KiRaiseUserExceptionDispatcher"); - Status = LdrGetProcedureAddress ((PVOID)ImageBase, - &ProcedureName, - 0, - &SystemDllRaiseExceptionDispatcher); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("LdrGetProcedureAddress failed (Status %x)\n", Status); - if (Process != CurrentProcess) - { - KeDetachProcess(); - } - ObDereferenceObject(Process); - ZwClose(NTDllSectionHandle); - return (Status); - } - } - - if (Process != CurrentProcess) - { - KeDetachProcess(); - } - ObDereferenceObject(Process); - - ZwClose(NTDllSectionHandle); - - return(STATUS_SUCCESS); + + /* Load NTDLL is valid */ + DPRINT("Reading NTDLL\n"); + Status = ZwReadFile(FileHandle, + 0, + 0, + 0, + &Iosb, + BlockBuffer, + sizeof(BlockBuffer), + 0, + 0); + if (!NT_SUCCESS(Status) || Iosb.Information != sizeof(BlockBuffer)) { + + DPRINT1("NTDLL header read failed (Status %x)\n", Status); + ZwClose(FileHandle); + return Status; + } + + /* Check if it's valid */ + DosHeader = (PIMAGE_DOS_HEADER)BlockBuffer; + NTHeaders = (PIMAGE_NT_HEADERS)(BlockBuffer + DosHeader->e_lfanew); + + if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || + (DosHeader->e_lfanew == 0L) || + (*(PULONG) NTHeaders != IMAGE_NT_SIGNATURE)) { + + DPRINT1("NTDLL format invalid\n"); + ZwClose(FileHandle); + return(STATUS_UNSUCCESSFUL); + } + + /* Create a section for NTDLL */ + DPRINT("Creating section\n"); + Status = ZwCreateSection(&NTDllSectionHandle, + SECTION_ALL_ACCESS, + NULL, + NULL, + PAGE_READONLY, + SEC_IMAGE | SEC_COMMIT, + FileHandle); + if (!NT_SUCCESS(Status)) { + + DPRINT1("NTDLL create section failed (Status %x)\n", Status); + ZwClose(FileHandle); + return(Status); + } + ZwClose(FileHandle); + + /* Reference the Section */ + DPRINT("ObReferenceObjectByHandle section: %d\n", NTDllSectionHandle); + Status = ObReferenceObjectByHandle(NTDllSectionHandle, + SECTION_ALL_ACCESS, + MmSectionObjectType, + KernelMode, + (PVOID*)&LdrpSystemDllSection, + NULL); + if (!NT_SUCCESS(Status)) { + + DPRINT1("NTDLL section reference failed (Status %x)\n", Status); + return(Status); + } + + /* Map it */ + LdrpMapSystemDll(PsGetCurrentProcess(), &LdrpSystemDllBase); + DPRINT("LdrpSystemDllBase: %x\n", LdrpSystemDllBase); + + /* Now get the Entrypoints */ + LdrpGetSystemDllEntryPoints(); + + return STATUS_SUCCESS; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c --- trunk/reactos/ntoskrnl/mm/i386/page.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/mm/i386/page.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -319,9 +319,12 @@ return(STATUS_SUCCESS); } -NTSTATUS MmCopyMmInfo(PEPROCESS Src, PEPROCESS Dest) +NTSTATUS +STDCALL +MmCopyMmInfo(PEPROCESS Src, + PEPROCESS Dest, + PPHYSICAL_ADDRESS DirectoryTableBase) { - PKPROCESS KProcess = &Dest->Pcb; NTSTATUS Status; ULONG i, j; PFN_TYPE Pfn[7]; @@ -389,8 +392,9 @@ MmDeleteHyperspaceMapping(PageDirectory); } - KProcess->DirectoryTableBase.QuadPart = PFN_TO_PTE(Pfn[0]); - DPRINT("Finished MmCopyMmInfo()\n"); + + DirectoryTableBase->QuadPart = PFN_TO_PTE(Pfn[0]); + DPRINT("Finished MmCopyMmInfo(): %I64x\n", DirectoryTableBase->QuadPart); return(STATUS_SUCCESS); } _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/mm/mm.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -384,6 +384,7 @@ break; case MEMORY_AREA_VIRTUAL_MEMORY: + case MEMORY_AREA_PEB_OR_TEB: Status = MmNotPresentFaultVirtualMemory(AddressSpace, MemoryArea, (PVOID)Address, _____ Modified: trunk/reactos/ntoskrnl/ob/wait.c --- trunk/reactos/ntoskrnl/ob/wait.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ob/wait.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -111,7 +111,7 @@ UserRequest, PreviousMode, Alertable, - TimeOut, + TimeOut, WaitBlockArray); /* dereference all objects */ _____ Modified: trunk/reactos/ntoskrnl/ps/create.c --- trunk/reactos/ntoskrnl/ps/create.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ps/create.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -473,7 +473,6 @@ UserMode, NULL ); KeInsertQueueApc(LdrInitApc, NULL, NULL, IO_NO_INCREMENT); - /* * The thread is non-alertable, so the APC we added did not set UserApcPending to TRUE. * We must do this manually. Do NOT attempt to set the Thread to Alertable before the call, _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-04-17 20:46:36 UTC (rev 14659) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-04-18 00:42:31 UTC (rev 14660) @@ -41,8 +41,7 @@ PiProcessNotifyRoutine[MAX_PROCESS_NOTIFY_ROUTINE_COUNT]; static PLOAD_IMAGE_NOTIFY_ROUTINE PiLoadImageNotifyRoutine[MAX_LOAD_IMAGE_NOTIFY_ROUTINE_COUNT]; - - + /* FUNCTIONS *****************************************************************/ PEPROCESS @@ -113,8 +112,7 @@ PLIST_ENTRY current_entry; PEPROCESS current; - ExAcquireFastMutex(&PspActiveProcessMutex); - + ExAcquireFastMutex(&PspActiveProcessMutex); current_entry = PsActiveProcessHead.Flink; while (current_entry != &PsActiveProcessHead) { @@ -271,8 +269,16 @@ InsertHeadList(&PsActiveProcessHead, &PsInitialSystemProcess->ProcessListEntry); InitializeListHead(&PsInitialSystemProcess->ThreadListHead); - - SepCreateSystemProcessToken(PsInitialSystemProcess); + +#ifndef SCHED_REWRITE + PTOKEN BootToken; + + /* No parent, this is the Initial System Process. Assign Boot Token */ + BootToken = SepCreateSystemProcessToken(); + BootToken->TokenInUse = TRUE; + PsInitialSystemProcess->Token = BootToken; + ObReferenceObject(BootToken); +#endif } VOID @@ -298,99 +304,6 @@ } } -static NTSTATUS -PsCreatePeb(HANDLE ProcessHandle, - PEPROCESS Process, - PVOID ImageBase) -{ - ULONG AllocSize; - ULONG PebSize; - PPEB Peb; - LARGE_INTEGER SectionOffset; - ULONG ViewSize; - PVOID TableBase; - NTSTATUS Status; - - PAGED_CODE(); - - /* Allocate the Process Environment Block (PEB) */ - Process->TebBlock = (PVOID) MM_ROUND_DOWN(PEB_BASE, MM_VIRTMEM_GRANULARITY); - AllocSize = MM_VIRTMEM_GRANULARITY; - Status = NtAllocateVirtualMemory(ProcessHandle, - &Process->TebBlock, - 0, - &AllocSize, - MEM_RESERVE, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtAllocateVirtualMemory() failed (Status %lx)\n", Status); - return(Status); - } - ASSERT((ULONG_PTR) Process->TebBlock <= PEB_BASE && - PEB_BASE + PAGE_SIZE <= (ULONG_PTR) Process->TebBlock + AllocSize); - Peb = (PPEB)PEB_BASE; - PebSize = PAGE_SIZE; - Status = NtAllocateVirtualMemory(ProcessHandle, - (PVOID*)&Peb, - 0, - &PebSize, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtAllocateVirtualMemory() failed (Status %lx)\n", Status); - return(Status); - } - DPRINT("Peb %p PebSize %lu\n", Peb, PebSize); - ASSERT((PPEB) PEB_BASE == Peb && PAGE_SIZE <= PebSize); - Process->TebLastAllocated = (PVOID) Peb; - - ViewSize = 0; - SectionOffset.QuadPart = (ULONGLONG)0; - TableBase = NULL; - Status = MmMapViewOfSection(NlsSectionObject, - Process, - &TableBase, - 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - MEM_TOP_DOWN, - PAGE_READONLY); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmMapViewOfSection() failed (Status %lx)\n", Status); - return(Status); - } - DPRINT("TableBase %p ViewSize %lx\n", TableBase, ViewSize); - - KeAttachProcess(&Process->Pcb); - - /* Initialize the PEB */ - RtlZeroMemory(Peb, sizeof(PEB)); [truncated at 1000 lines; 932 more skipped]

19 years, 8 months

[weiden] 14659: fixed warning

by weiden＠svn.reactos.com

fixed warning Modified: trunk/reactos/drivers/usb/usbd/usbd.c _____ Modified: trunk/reactos/drivers/usb/usbd/usbd.c --- trunk/reactos/drivers/usb/usbd/usbd.c 2005-04-17 19:56:50 UTC (rev 14658) +++ trunk/reactos/drivers/usb/usbd/usbd.c 2005-04-17 20:46:36 UTC (rev 14659) @@ -351,15 +351,17 @@ PUCHAR BufferEnd ) { + ULONG_PTR Current; PUSB_INTERFACE_DESCRIPTOR CurrentDescriptor = InterfaceDescriptor; DWORD Length = CurrentDescriptor->bLength; // USB_ENDPOINT_DESCRIPTOR_TYPE if (CurrentDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) { - for (; - (PUCHAR)CurrentDescriptor < BufferEnd; - (PVOID)CurrentDescriptor += CurrentDescriptor->bLength) + for (Current = (ULONG_PTR)CurrentDescriptor; + Current < (ULONG_PTR)BufferEnd; + Current += CurrentDescriptor->bLength) + CurrentDescriptor = (PUSB_INTERFACE_DESCRIPTOR)Current; Length += CurrentDescriptor->bLength; }

19 years, 8 months

[ekohl] 14658: ADVAPI32.DLL / SERVICES.EXE:

by ekohl＠svn.reactos.com

ADVAPI32.DLL / SERVICES.EXE: Implement ControlService() RPCRT4.DLL: Disable a bogus buffer overflow check in NdrSimpleStructMarshall. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-04-17 19:47:44 UTC (rev 14657) +++ trunk/reactos/include/idl/svcctl.idl 2005-04-17 19:56:50 UTC (rev 14658) @@ -39,10 +39,10 @@ [in] SC_HANDLE hSCObject); /* Function 1 */ -// BOOL ScmrControlService([in] handle_t BindingHandle, -// [in] SC_HANDLE hService, -// [in] DWORD dwControl, -// [out] LPSERVICE_STATUS lpServiceStatus); + BOOL ScmrControlService([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwControl, + [out] LPSERVICE_STATUS lpServiceStatus); /* Function 2 */ DWORD ScmrDeleteService([in] handle_t BindingHandle, _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-04-17 19:47:44 UTC (rev 14657) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-04-17 19:56:50 UTC (rev 14658) @@ -139,21 +139,22 @@ { DWORD dwError; - DPRINT1("CloseServiceHandle() called\n"); + DPRINT("CloseServiceHandle() called\n"); HandleBind(); /* Call to services.exe using RPC */ dwError = ScmrCloseServiceHandle(BindingHandle, (unsigned int)hSCObject); - DPRINT1("dwError %lu\n", dwError); - if (dwError) { + DPRINT1("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } + DPRINT("CloseServiceHandle() done\n"); + return TRUE; } @@ -168,11 +169,10 @@ DWORD dwControl, LPSERVICE_STATUS lpServiceStatus) { -#if 0 DWORD dwError; - DPRINT1("ControlService(%x, %x, %p)\n", - hService, dwControl, lpServiceStatus); + DPRINT("ControlService(%x, %x, %p)\n", + hService, dwControl, lpServiceStatus); HandleBind(); @@ -183,18 +183,14 @@ lpServiceStatus); if (dwError != ERROR_SUCCESS) { + DPRINT1("ScmrControlService() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } - DPRINT1("ControlService() done\n"); + DPRINT("ControlService() done\n"); return TRUE; -#endif - - DPRINT1("ControlService is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; } @@ -262,7 +258,7 @@ { DWORD dwError; - DPRINT1("DeleteService(%x)\n", hService); + DPRINT("DeleteService(%x)\n", hService); HandleBind(); @@ -271,6 +267,7 @@ (unsigned int)hService); if (dwError != ERROR_SUCCESS) { + DPRINT1("ScmrDeleteService() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -536,7 +533,7 @@ (unsigned int *)&hLock); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); + DPRINT1("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -613,9 +610,9 @@ (LPSTR)lpDatabaseName, dwDesiredAccess, (unsigned int*)&hScm); - if (dwError) + if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); + DPRINT1("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -928,7 +925,7 @@ (unsigned int)ScLock); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); + DPRINT1("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-04-17 19:47:44 UTC (rev 14657) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-04-17 19:56:50 UTC (rev 14658) @@ -1161,7 +1161,15 @@ if (pFormat[0] != RPC_FC_STRUCT) EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat+4); + /* + * This test does not work when NdrSimpleStructMarshall is called + * by an rpc-server to marshall data to return to the client because + * BufferStart and BufferEnd are bogus. MIDL does not update them + * when a new buffer is allocated in order to return data to the caller. + */ +#if 0 STD_OVERFLOW_CHECK(pStubMsg); +#endif return NULL; } @@ -1201,20 +1209,22 @@ /*********************************************************************** - * NdrSimpleStructUnmarshall [RPCRT4.@] + * NdrSimpleTypeUnmarshall [RPCRT4.@] */ -void WINAPI NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, - unsigned char FormatChar ) +void WINAPI NdrSimpleTypeMarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + unsigned char FormatChar) { FIXME("stub\n"); } /*********************************************************************** - * NdrSimpleStructUnmarshall [RPCRT4.@] + * NdrSimpleTypeUnmarshall [RPCRT4.@] */ -void WINAPI NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, - unsigned char FormatChar ) +void WINAPI NdrSimpleTypeUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + unsigned char FormatChar) { FIXME("stub\n"); } _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-04-17 19:47:44 UTC (rev 14657) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-04-17 19:56:50 UTC (rev 14658) @@ -272,7 +272,6 @@ /* Function 1 */ -#if 0 unsigned long ScmrControlService(handle_t BindingHandle, unsigned int hService, @@ -281,7 +280,10 @@ { DPRINT1("ScmrControlService() called\n"); -#if 0 + /* FIXME: return proper service information */ + + /* test data */ +// #if 0 lpServiceStatus->dwServiceType = 0x12345678; lpServiceStatus->dwCurrentState = 0x98765432; lpServiceStatus->dwControlsAccepted = 0xdeadbabe; @@ -289,11 +291,10 @@ lpServiceStatus->dwServiceSpecificExitCode = 0xdeadf00d; lpServiceStatus->dwCheckPoint = 0xbaadbabe; lpServiceStatus->dwWaitHint = 0x2468ACE1; -#endif +// #endif - return TRUE; + return ERROR_SUCCESS; } -#endif /* Function 2 */

19 years, 8 months

[arty] 14657: Fixed the repeating DHCPOFFER/DHCPACK. I was assuming that the lease timeout

by arty＠svn.reactos.com

Fixed the repeating DHCPOFFER/DHCPACK. I was assuming that the lease timeout was relative but it's been adjusted by the time we get here. Thanks to hpoussineau for helping with this bug. Modified: trunk/reactos/subsys/system/dhcp/dhclient.c _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-17 19:45:06 UTC (rev 14656) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-17 19:47:44 UTC (rev 14657) @@ -685,7 +685,7 @@ /* Timeout of zero means no timeout (some implementations seem to use * one day). */ - if( ip->client->active->renewal ) + if( ip->client->active->renewal - cur_time ) add_timeout(ip->client->active->renewal, state_bound, ip); note("bound to %s -- renewal in %d seconds.",

19 years, 8 months

[ekohl] 14656: Support out-pointers to structs.

by ekohl＠svn.reactos.com

Support out-pointers to structs. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-04-17 19:33:50 UTC (rev 14655) +++ trunk/reactos/tools/widl/ChangeLog 2005-04-17 19:45:06 UTC (rev 14656) @@ -1,5 +1,11 @@ ChangeLog +2005-04-17 ekohl + + tools/widl/server.c + +Support out-pointers to structs. + 2005-04-15 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-04-17 19:33:50 UTC (rev 14655) +++ trunk/reactos/tools/widl/server.c 2005-04-17 19:45:06 UTC (rev 14656) @@ -412,7 +412,7 @@ } -static void print_message_buffer_size(func_t *func) +static void print_message_buffer_size(func_t *func, unsigned int *type_offset) { unsigned int alignment = 0; int size = 0; @@ -423,6 +423,11 @@ int empty_line; var_t *var; + int start_new_line = 0; + int add_plus = 0; + + unsigned int local_type_offset = *type_offset; + fprintf(server, "\n"); print_server("_StubMsg.BufferLength ="); if (func->args) @@ -436,7 +441,7 @@ { if (is_base_type(var->type)) { - if (size != 0 && last_size != 0) + if (start_new_line) { print_server("_StubMsg.BufferLength +="); } @@ -480,21 +485,23 @@ return; } - if (last_size != -1) + if (add_plus) fprintf(server, " +"); fprintf(server, " %dU", (size == 0) ? 0 : size + alignment); last_size = size; + start_new_line = 0; + add_plus = 1; } else if (var->type->type == RPC_FC_RP) { if (size == 0) { - fprintf(server, " 0;\n"); + fprintf(server, " 12U;\n"); } else if (last_size != 0) { - fprintf(server, ";\n"); + fprintf(server, " + 12U;\n"); last_size = 0; } @@ -504,10 +511,38 @@ print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", - 0); /* FIXME */ + local_type_offset + 4); /* FIXME */ indent--; fprintf(server,"\n"); + + start_new_line = 1; } + + /* calculate the next type offset */ + if (var->ptr_level == 0) + { + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + local_type_offset += tsize; + } + } + else if (var->ptr_level == 1) + { + local_type_offset += 4; + } } } } @@ -515,6 +550,12 @@ /* return value size */ if (!is_void(func->def->type, NULL)) { + if (start_new_line) + { + print_server("_StubMsg.BufferLength +="); + add_plus = 0; + } + switch(func->def->type->type) { case RPC_FC_BYTE: @@ -544,7 +585,7 @@ return; } - if (last_size != -1) + if (add_plus) fprintf(server, " +"); fprintf(server, " %dU", (size == 0) ? 0 : size + alignment); @@ -1296,7 +1337,7 @@ /* allocate and fill the return message buffer */ if (use_return_buffer(func)) { - print_message_buffer_size(func); + print_message_buffer_size(func, &type_offset); print_server("_pRpcMessage->BufferLength = _StubMsg.BufferLength;\n"); fprintf(server, "\n"); print_server("_Status = I_RpcGetBuffer(_pRpcMessage);\n");

19 years, 8 months

[weiden] 14655: fixed warning and minor portability fix

by weiden＠svn.reactos.com

fixed warning and minor portability fix Modified: trunk/reactos/apps/utils/net/finger/net.c _____ Modified: trunk/reactos/apps/utils/net/finger/net.c --- trunk/reactos/apps/utils/net/finger/net.c 2005-04-17 19:32:24 UTC (rev 14654) +++ trunk/reactos/apps/utils/net/finger/net.c 2005-04-17 19:33:50 UTC (rev 14655) @@ -56,14 +56,14 @@ struct hostent *hp, def; struct servent *sp; struct sockaddr_in sin; - int s; + SOCKET s; char *alist[1], *host; /* If this is a local request */ if (!(host = rindex(name, '@'))) return; - *host++ = NULL; + *host++ = '\0'; if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) { def.h_name = host; def.h_addr_list = alist; @@ -84,7 +84,7 @@ sin.sin_family = hp->h_addrtype; bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length); sin.sin_port = sp->s_port; - if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) { + if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) == INVALID_SOCKET) { perror("finger: socket"); return; }

19 years, 8 months

[weiden] 14654: fixed warning and minor portability fix

by weiden＠svn.reactos.com

fixed warning and minor portability fix Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ftp/ftp.c _____ Modified: trunk/reactos/apps/utils/net/ftp/fake.c --- trunk/reactos/apps/utils/net/ftp/fake.c 2005-04-17 19:16:39 UTC (rev 14653) +++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-04-17 19:32:24 UTC (rev 14654) @@ -235,7 +235,7 @@ static char input[256]; HANDLE in; HANDLE err; - int count; + DWORD count; in = GetStdHandle (STD_INPUT_HANDLE); err = GetStdHandle (STD_ERROR_HANDLE); _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-04-17 19:16:39 UTC (rev 14653) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-04-17 19:32:24 UTC (rev 14654) @@ -97,7 +97,7 @@ sig_t lostpeer(); off_t restart_point = 0; -int cin, cout; +SOCKET cin, cout; int dataconn(char *mode); int command(char *fmt, ...); @@ -113,7 +113,8 @@ char *hookup(char *host, int port) { register struct hostent *hp = 0; - int s,len; + int len; + SOCKET s; static char hostnamebuf[80]; bzero((char *)&hisctladdr, sizeof (hisctladdr)); @@ -136,7 +137,7 @@ } hostname = hostnamebuf; s = socket(hisctladdr.sin_family, SOCK_STREAM, 0); - if (s < 0) { + if (s == INVALID_SOCKET) { perror("ftp: socket"); code = -1; return (0); @@ -1327,8 +1328,8 @@ char name[MAXHOSTNAMELEN]; struct sockaddr_in mctl; struct sockaddr_in hctl; - FILE *in; - FILE *out; + SOCKET in; + SOCKET out; int tpe; int cpnd; int sunqe; @@ -1371,10 +1372,10 @@ hisctladdr = op->hctl; ip->mctl = myctladdr; myctladdr = op->mctl; - (int) ip->in = cin; // What the hell am I looking at...? - cin = (int) op->in; - (int) ip->out = cout; // Same again... - cout = (int) op->out; + ip->in = cin; + cin = op->in; + ip->out = cout; + cout = op->out; ip->tpe = type; type = op->tpe; if (!type)

19 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
48
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 April 2005