Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[ion] 13805: Fix bug with registry loading on bootcd (Thanks Steven). Properly implement Profile Objects with Ex/Ke architecture (structures are a guess, and code is based on dwelch and some simple testing/common sense, but not ready for primetime (NT doesnt even use theirs). Optimize Device Queues a bit and use the inserted field properly.

by ion＠svn.reactos.com

Fix bug with registry loading on bootcd (Thanks Steven). Properly implement Profile Objects with Ex/Ke architecture (structures are a guess, and code is based on dwelch and some simple testing/common sense, but not ready for primetime (NT doesnt even use theirs). Optimize Device Queues a bit and use the inserted field properly. Modified: branches/alex_devel_branch/reactos/include/ntos/zwtypes.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/cm/registry.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/profile.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ke.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/kqueue.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/profile.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/timer.c _____ Modified: branches/alex_devel_branch/reactos/include/ntos/zwtypes.h --- branches/alex_devel_branch/reactos/include/ntos/zwtypes.h 2005-03-03 02:46:43 UTC (rev 13804) +++ branches/alex_devel_branch/reactos/include/ntos/zwtypes.h 2005-03-03 03:57:59 UTC (rev 13805) @@ -58,6 +58,7 @@ ProfileTime } KPROFILE_SOURCE; + // file disposition values #define FILE_SUPERSEDE 0x0000 _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/cm/registry.c --- branches/alex_devel_branch/reactos/ntoskrnl/cm/registry.c 2005-03-03 02:46:43 UTC (rev 13804) +++ branches/alex_devel_branch/reactos/ntoskrnl/cm/registry.c 2005-03-03 03:57:59 UTC (rev 13805) @@ -248,10 +248,12 @@ { PCHAR BaseAddress; - /* Load Registry Hives */ - BaseAddress = (PCHAR)CachedModules[SystemRegistry]->ModStart; - CmImportSystemHive(BaseAddress, - CachedModules[SystemRegistry]->ModEnd - (ULONG_PTR)BaseAddress); + /* Load Registry Hives. This one can be missing. */ + if (CachedModules[SystemRegistry]) { + BaseAddress = (PCHAR)CachedModules[SystemRegistry]->ModStart; + CmImportSystemHive(BaseAddress, + CachedModules[SystemRegistry]->ModEnd - (ULONG_PTR)BaseAddress); + } BaseAddress = (PCHAR)CachedModules[HardwareRegistry]->ModStart; CmImportHardwareHive(BaseAddress, _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/profile.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/profile.c 2005-03-03 02:46:43 UTC (rev 13804) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/profile.c 2005-03-03 03:57:59 UTC (rev 13805) @@ -1,11 +1,10 @@ -/* $Id:$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/nt/profile.c - * PURPOSE: Support for profiling + * FILE: ntoskrnl/ex/profile.c + * PURPOSE: Support for Executive Profile Objects * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Alex Ionescu */ /* INCLUDES *****************************************************************/ @@ -13,369 +12,448 @@ #include <ntoskrnl.h> #include <internal/debug.h> -/* TYPES ********************************************************************/ +/* This structure is a *GUESS* -- Alex */ +typedef struct _EPROFILE { + PEPROCESS Process; + PVOID ImageBase; + ULONG ImageSize; + ULONG BucketSize; + PVOID Buffer; + ULONG BufferSize; + PKPROFILE KeProfile; + KPROFILE_SOURCE ProfileSource; + KAFFINITY Affinity; + PMDL Mdl; + PVOID LockedBuffer; +} EPROFILE, *PEPROFILE; /* GLOBALS *******************************************************************/ POBJECT_TYPE EXPORTED ExProfileObjectType = NULL; -static GENERIC_MAPPING ExpProfileMapping = { - STANDARD_RIGHTS_READ, - STANDARD_RIGHTS_WRITE, - STANDARD_RIGHTS_EXECUTE, - STANDARD_RIGHTS_ALL}; +static KMUTEX ExpProfileMutex; -/* - * Size of the profile hash table. - */ -#define PROFILE_HASH_TABLE_SIZE (32) +#define PROFILE_CONTROL 1 -/* - * Table of lists of per-process profiling data structures hashed by PID. - */ -LIST_ENTRY ProcessProfileListHashTable[PROFILE_HASH_TABLE_SIZE]; +static GENERIC_MAPPING ExpProfileMapping = { + STANDARD_RIGHTS_READ | PROFILE_CONTROL, + STANDARD_RIGHTS_WRITE | PROFILE_CONTROL, + STANDARD_RIGHTS_EXECUTE | PROFILE_CONTROL, + STANDARD_RIGHTS_ALL}; -/* - * Head of the list of profile data structures for the kernel. - */ -LIST_ENTRY SystemProfileList; - -/* - * Lock that protects the profiling data structures. - */ -KSPIN_LOCK ProfileListLock; - -/* - * Timer interrupts happen before we have initialized the profiling - * data structures so just ignore them before that. - */ -BOOLEAN ProfileInitDone = FALSE; - -VOID INIT_FUNCTION -ExpInitializeProfileImplementation(VOID) +VOID +STDCALL +ExpDeleteProfile(PVOID ObjectBody) { - ULONG i; + PEPROFILE Profile; - InitializeListHead(&SystemProfileList); + /* Typecast the Object */ + Profile = (PEPROFILE)ObjectBody; + + /* Check if there if the Profile was started */ + if (Profile->LockedBuffer) { + + /* Stop the Profile */ + KeStopProfile(Profile->KeProfile); + + /* Unmap the Locked Buffer */ + MmUnmapLockedPages(Profile->LockedBuffer, Profile->Mdl); + MmUnlockPages(Profile->Mdl); + ExFreePool(Profile->Mdl); + } - for (i = 0; i < PROFILE_HASH_TABLE_SIZE; i++) - { - InitializeListHead(&ProcessProfileListHashTable[i]); + /* Check if a Process is associated */ + if (Profile->Process != NULL) { + + /* Dereference it */ + ObDereferenceObject(Profile->Process); + Profile->Process = NULL; } +} - KeInitializeSpinLock(&ProfileListLock); - ProfileInitDone = TRUE; - - ExProfileObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - - RtlpCreateUnicodeString(&ExProfileObjectType->TypeName, L"Profile", NonPagedPool); - - ExProfileObjectType->Tag = TAG('P', 'R', 'O', 'F'); - ExProfileObjectType->PeakObjects = 0; - ExProfileObjectType->PeakHandles = 0; - ExProfileObjectType->TotalObjects = 0; - ExProfileObjectType->TotalHandles = 0; - ExProfileObjectType->PagedPoolCharge = 0; - ExProfileObjectType->NonpagedPoolCharge = sizeof(KPROFILE); - ExProfileObjectType->Mapping = &ExpProfileMapping; - ExProfileObjectType->Dump = NULL; - ExProfileObjectType->Open = NULL; - ExProfileObjectType->Close = NULL; - ExProfileObjectType->Delete = KiDeleteProfile; - ExProfileObjectType->Parse = NULL; - ExProfileObjectType->Security = NULL; - ExProfileObjectType->QueryName = NULL; - ExProfileObjectType->OkayToClose = NULL; - ExProfileObjectType->Create = NULL; - - ObpCreateTypeObject(ExProfileObjectType); +VOID +INIT_FUNCTION +ExpInitializeProfileImplementation(VOID) +{ + /* Initialize the Mutex to lock the States */ + KeInitializeMutex(&ExpProfileMutex, 0x40); + + /* Create the Object Type */ + ExProfileObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); + RtlpCreateUnicodeString(&ExProfileObjectType->TypeName, L"Profile", NonPagedPool); + ExProfileObjectType->Tag = TAG('P', 'R', 'O', 'F'); + ExProfileObjectType->PeakObjects = 0; + ExProfileObjectType->PeakHandles = 0; + ExProfileObjectType->TotalObjects = 0; + ExProfileObjectType->TotalHandles = 0; + ExProfileObjectType->PagedPoolCharge = 0; + ExProfileObjectType->NonpagedPoolCharge = sizeof(EPROFILE); + ExProfileObjectType->Mapping = &ExpProfileMapping; + ExProfileObjectType->Dump = NULL; + ExProfileObjectType->Open = NULL; + ExProfileObjectType->Close = NULL; + ExProfileObjectType->Delete = ExpDeleteProfile; + ExProfileObjectType->Parse = NULL; + ExProfileObjectType->Security = NULL; + ExProfileObjectType->QueryName = NULL; + ExProfileObjectType->OkayToClose = NULL; + ExProfileObjectType->Create = NULL; + ObpCreateTypeObject(ExProfileObjectType); } -NTSTATUS STDCALL +NTSTATUS +STDCALL NtCreateProfile(OUT PHANDLE ProfileHandle, - IN HANDLE Process OPTIONAL, - IN PVOID ImageBase, - IN ULONG ImageSize, - IN ULONG BucketSize, - IN PVOID Buffer, - IN ULONG BufferSize, - IN KPROFILE_SOURCE ProfileSource, - IN KAFFINITY Affinity) + IN HANDLE Process OPTIONAL, + IN PVOID ImageBase, + IN ULONG ImageSize, + IN ULONG BucketSize, + IN PVOID Buffer, + IN ULONG BufferSize, + IN KPROFILE_SOURCE ProfileSource, + IN KAFFINITY Affinity) { - HANDLE hProfile; - PKPROFILE Profile; - PEPROCESS pProcess; - KPROCESSOR_MODE PreviousMode; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status = STATUS_SUCCESS; + HANDLE hProfile; + PEPROFILE Profile; + PEPROCESS pProcess; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); - PreviousMode = ExGetPreviousMode(); - - if(BufferSize == 0) - { - return STATUS_INVALID_PARAMETER_7; - } - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(ProfileHandle, - sizeof(HANDLE), - sizeof(ULONG)); - ProbeForWrite(Buffer, - BufferSize, - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Easy way out */ + if(BufferSize == 0) return STATUS_INVALID_PARAMETER_7; + + /* Check the Parameters for validity */ + if(PreviousMode != KernelMode) { + + _SEH_TRY { + + ProbeForWrite(ProfileHandle, + sizeof(HANDLE), + sizeof(ULONG)); + + ProbeForWrite(Buffer, + BufferSize, + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; + if(!NT_SUCCESS(Status)) return Status; } - } - /* - * Reference the associated process - */ - if (Process != NULL) - { - Status = ObReferenceObjectByHandle(Process, - PROCESS_QUERY_INFORMATION, - PsProcessType, - PreviousMode, - (PVOID*)&pProcess, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + /* Check if a process was specified */ + if (Process) { + + /* Reference it */ + Status = ObReferenceObjectByHandle(Process, + PROCESS_QUERY_INFORMATION, + PsProcessType, + PreviousMode, + (PVOID*)&pProcess, + NULL); + if (!NT_SUCCESS(Status)) return(Status); + + } else { + + /* No process was specified, which means a System-Wide Profile */ + pProcess = NULL; + + /* For this, we need to check the Privilege */ + if(!SeSinglePrivilegeCheck(SeSystemProfilePrivilege, PreviousMode)) { + + DPRINT1("NtCreateProfile: Caller requires the SeSystemProfilePrivilege privilege!\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } } - else - { - pProcess = NULL; - if(!SeSinglePrivilegeCheck(SeSystemProfilePrivilege, - PreviousMode)) - { - DPRINT1("NtCreateProfile: Caller requires the SeSystemProfilePrivilege privilege!\n"); - return STATUS_PRIVILEGE_NOT_HELD; - } - } - /* - * Check the parameters - */ - if ((pProcess == NULL && ImageBase < (PVOID)KERNEL_BASE) || - (pProcess != NULL && ImageBase >= (PVOID)KERNEL_BASE)) - { - return(STATUS_INVALID_PARAMETER_3); - } - if (((ImageSize >> BucketSize) * 4) >= BufferSize) - { - return(STATUS_BUFFER_TOO_SMALL); - } - if (ProfileSource != ProfileTime) - { - return(STATUS_INVALID_PARAMETER_9); - } - if (Affinity != 0) - { - return(STATUS_INVALID_PARAMETER_10); - } + /* Create the object */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + Status = ObCreateObject(KernelMode, + ExProfileObjectType, + &ObjectAttributes, + PreviousMode, + NULL, + sizeof(EPROFILE), + 0, + 0, + (PVOID*)&Profile); + if (!NT_SUCCESS(Status)) return(Status); - /* - * Create the object - */ - InitializeObjectAttributes(&ObjectAttributes, + /* Initialize it */ + Profile->ImageBase = ImageBase; + Profile->ImageSize = ImageSize; + Profile->Buffer = Buffer; + Profile->BufferSize = BufferSize; + Profile->BucketSize = BucketSize; + Profile->LockedBuffer = NULL; + Profile->Affinity = Affinity; + Profile->Process = pProcess; + + /* Insert into the Object Tree */ + Status = ObInsertObject ((PVOID)Profile, NULL, + PROFILE_CONTROL, 0, NULL, - NULL); - - Status = ObCreateObject(KernelMode, - ExProfileObjectType, - &ObjectAttributes, - PreviousMode, - NULL, - sizeof(KPROFILE), - 0, - 0, - (PVOID*)&Profile); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - /* - * Initialize it - */ - Profile->Base = ImageBase; - Profile->Size = ImageSize; - Profile->BucketShift = BucketSize; - Profile->BufferMdl = MmCreateMdl(NULL, Buffer, BufferSize); - if(Profile->BufferMdl == NULL) { - DPRINT("MmCreateMdl: Out of memory!"); - ObDereferenceObject (Profile); - return(STATUS_NO_MEMORY); - } - MmProbeAndLockPages(Profile->BufferMdl, UserMode, IoWriteAccess); - Profile->Buffer = MmGetSystemAddressForMdl(Profile->BufferMdl); - Profile->BufferSize = BufferSize; - Profile->ProcessorMask = Affinity; - Profile->Started = FALSE; - Profile->Process = pProcess; - - /* - * Insert the profile into the profile list data structures - */ - KiInsertProfile(Profile); - - Status = ObInsertObject ((PVOID)Profile, - NULL, - STANDARD_RIGHTS_ALL, - 0, - NULL, - &hProfile); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject (Profile); - return Status; + &hProfile); + ObDereferenceObject(Profile); + + /* Check for Success */ + if (!NT_SUCCESS(Status)) { + + /* Dereference Process on failure */ + if (pProcess) ObDereferenceObject(pProcess); + return Status; } + + /* Copy the created handle back to the caller*/ + _SEH_TRY { + + *ProfileHandle = hProfile; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + } _SEH_END; - /* - * Copy the created handle back to the caller - */ - _SEH_TRY - { - *ProfileHandle = hProfile; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - ObDereferenceObject(Profile); - - return Status; + /* Return Status */ + return Status; } -NTSTATUS STDCALL -NtQueryIntervalProfile(IN KPROFILE_SOURCE ProfileSource, - OUT PULONG Interval) +NTSTATUS +STDCALL +NtQueryPerformanceCounter(OUT PLARGE_INTEGER PerformanceCounter, + OUT PLARGE_INTEGER PerformanceFrequency OPTIONAL) { - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + LARGE_INTEGER PerfFrequency; - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(Interval, - sizeof(ULONG), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Check the Parameters for validity */ + if(PreviousMode != KernelMode) { + + _SEH_TRY { + + ProbeForWrite(PerformanceCounter, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + + ProbeForWrite(PerformanceFrequency, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; + if(!NT_SUCCESS(Status)) return Status; } - } - if (ProfileSource == ProfileTime) - { - ULONG ReturnInterval; - - /* FIXME: What units does this use, for now nanoseconds */ - ReturnInterval = 100; - - _SEH_TRY - { - *Interval = ReturnInterval; - } - _SEH_HANDLE - { + _SEH_TRY { + + /* Query the Kernel */ + *PerformanceCounter = KeQueryPerformanceCounter(&PerfFrequency); + + /* Return Frequency if requested */ + if(PerformanceFrequency) { + + *PerformanceFrequency = PerfFrequency; + } + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - return Status; - } - return STATUS_INVALID_PARAMETER_2; -} + + } _SEH_END; -NTSTATUS STDCALL -NtSetIntervalProfile(IN ULONG Interval, - IN KPROFILE_SOURCE Source) -{ - return(STATUS_NOT_IMPLEMENTED); + return Status; } -NTSTATUS STDCALL +NTSTATUS +STDCALL NtStartProfile(IN HANDLE ProfileHandle) { - PKPROFILE Profile; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; + PEPROFILE Profile; + PKPROFILE KeProfile; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PVOID TempLockedBuffer; + NTSTATUS Status; - PAGED_CODE(); + PAGED_CODE(); - PreviousMode = ExGetPreviousMode(); - - Status = ObReferenceObjectByHandle(ProfileHandle, - STANDARD_RIGHTS_ALL, - ExProfileObjectType, - PreviousMode, - (PVOID*)&Profile, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); + /* Get the Object */ + Status = ObReferenceObjectByHandle(ProfileHandle, + PROFILE_CONTROL, + ExProfileObjectType, + PreviousMode, + (PVOID*)&Profile, + NULL); + if (!NT_SUCCESS(Status)) return(Status); + + /* To avoid a Race, wait on the Mutex */ + KeWaitForSingleObject(&ExpProfileMutex, + Executive, + KernelMode, + FALSE, + NULL); + + /* The Profile can still be enabled though, so handle that */ + if (Profile->LockedBuffer) { + + /* Release our lock, dereference and return */ + KeReleaseMutex(&ExpProfileMutex, FALSE); + ObDereferenceObject(Profile); + return STATUS_PROFILING_NOT_STOPPED; } - Profile->Started = TRUE; - ObDereferenceObject(Profile); - return(STATUS_SUCCESS); + + /* Allocate a Kernel Profile Object. */ + KeProfile = ExAllocatePoolWithTag(NonPagedPool, + sizeof(EPROFILE), + TAG('P', 'r', 'o', 'f')); + + /* Allocate the Mdl Structure */ + Profile->Mdl = MmCreateMdl(NULL, Profile->Buffer, Profile->BufferSize); + + /* Probe and Lock for Write Access */ + MmProbeAndLockPages(Profile->Mdl, PreviousMode, IoWriteAccess); + + /* Map the pages */ + TempLockedBuffer = MmMapLockedPages(Profile->Mdl, KernelMode); + + /* Initialize the Kernel Profile Object */ + Profile->KeProfile = KeProfile; + KeInitializeProfile(KeProfile, + (PKPROCESS)Profile->Process, + Profile->ImageBase, + Profile->ImageSize, + Profile->BucketSize, + Profile->ProfileSource, + Profile->Affinity); + + /* Start the Profiling */ + KeStartProfile(KeProfile, TempLockedBuffer); + + /* Now it's safe to save this */ + Profile->LockedBuffer = TempLockedBuffer; + + /* Release mutex, dereference and return */ + KeReleaseMutex(&ExpProfileMutex, FALSE); + ObDereferenceObject(Profile); + return STATUS_SUCCESS; } -NTSTATUS STDCALL +NTSTATUS +STDCALL NtStopProfile(IN HANDLE ProfileHandle) { - PKPROFILE Profile; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; + PEPROFILE Profile; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status; - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); - Status = ObReferenceObjectByHandle(ProfileHandle, - STANDARD_RIGHTS_ALL, - ExProfileObjectType, - PreviousMode, - (PVOID*)&Profile, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); + /* Get the Object */ + Status = ObReferenceObjectByHandle(ProfileHandle, + PROFILE_CONTROL, + ExProfileObjectType, + PreviousMode, + (PVOID*)&Profile, + NULL); + if (!NT_SUCCESS(Status)) return(Status); + + /* Get the Mutex */ + KeWaitForSingleObject(&ExpProfileMutex, + Executive, + KernelMode, + FALSE, + NULL); + + /* Make sure the Profile Object is really Started */ + if (!Profile->LockedBuffer) { + + Status = STATUS_PROFILING_NOT_STARTED; + goto Exit; } - Profile->Started = FALSE; - ObDereferenceObject(Profile); - return(STATUS_SUCCESS); + + /* Stop the Profile */ + KeStopProfile(Profile->KeProfile); + + /* Unlock the Buffer */ + MmUnmapLockedPages(Profile->LockedBuffer, Profile->Mdl); + MmUnlockPages(Profile->Mdl); + ExFreePool(Profile->KeProfile); + + /* Clear the Locked Buffer pointer, meaning the Object is Stopped */ + Profile->LockedBuffer = NULL; + +Exit: + /* Release Mutex, Dereference and Return */ + KeReleaseMutex(&ExpProfileMutex, FALSE); + ObDereferenceObject(Profile); + return Status; } +NTSTATUS +STDCALL +NtQueryIntervalProfile(IN KPROFILE_SOURCE ProfileSource, + OUT PULONG Interval) +{ + KPROCESSOR_MODE PreviousMode= ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + ULONG ReturnInterval; + + PAGED_CODE(); + + /* Check the Parameters for validity */ + if(PreviousMode != KernelMode) { + + _SEH_TRY { + + ProbeForWrite(Interval, + sizeof(ULONG), + sizeof(ULONG)); + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + if(!NT_SUCCESS(Status)) return Status; + } + + /* Query the Interval */ + ReturnInterval = KeQueryIntervalProfile(ProfileSource); + /* Return the data */ + _SEH_TRY { + + *Interval = ReturnInterval; + + } _SEH_HANDLE { + + Status = _SEH_GetExceptionCode(); + + } _SEH_END; + + /* Return Success */ + return STATUS_SUCCESS; +} + +NTSTATUS +STDCALL +NtSetIntervalProfile(IN ULONG Interval, + IN KPROFILE_SOURCE Source) +{ + /* Let the Kernel do the job */ + KeSetIntervalProfile(Interval, Source); + + /* Nothing can go wrong */ + return STATUS_SUCCESS; +} _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ke.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ke.h 2005-03-03 02:46:43 UTC (rev 13804) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/ke.h 2005-03-03 03:57:59 UTC (rev 13805) @@ -64,56 +64,26 @@ /* next file ***************************************************************/ -typedef struct _KPROCESS_PROFILE -/* - * List of the profile data structures associated with a process. - */ -{ - LIST_ENTRY ProfileListHead; - LIST_ENTRY ListEntry; - HANDLE Pid; -} KPROCESS_PROFILE, *PKPROCESS_PROFILE; +typedef struct _KPROFILE_SOURCE_OBJECT { + KPROFILE_SOURCE Source; + LIST_ENTRY ListEntry; +} KPROFILE_SOURCE_OBJECT, *PKPROFILE_SOURCE_OBJECT; -typedef struct _KPROFILE /* * Describes a contiguous region of process memory that is being profiled. */ -{ - CSHORT Type; - CSHORT Name; - - /* Entry in the list of profile data structures for this process. */ - LIST_ENTRY ListEntry; - - /* Base of the region being profiled. */ - PVOID Base; - - /* Size of the region being profiled. */ - ULONG Size; - - /* Shift of offsets from the region to buckets in the profiling buffer. */ - ULONG BucketShift; - - /* MDL which described the buffer that receives profiling data. */ - struct _MDL *BufferMdl; - - /* System alias for the profiling buffer. */ - PULONG Buffer; - - /* Size of the buffer for profiling data. */ - ULONG BufferSize; - - /* - * Mask of processors for which profiling data should be collected. - * Currently unused. - */ - ULONG ProcessorMask; - - /* TRUE if profiling has been started for this region. */ - BOOLEAN Started; - - /* Pointer (and reference) to the process which is being profiled. */ - struct _EPROCESS *Process; +typedef struct _KPROFILE { + CSHORT Type; + CSHORT Size; + LIST_ENTRY ListEntry; + PVOID RegionStart; + ULONG RegionEnd; + ULONG BucketShift; + PVOID Buffer; + CSHORT Source; + ULONG Affinity; + BOOLEAN Active; + struct _KPROCESS *Process; } KPROFILE, *PKPROFILE; /* Cached modules from the loader block */ @@ -130,8 +100,36 @@ VOID STDCALL DbgBreakPointNoBugCheck(VOID); +STDCALL VOID +KeInitializeProfile(struct _KPROFILE* Profile, + struct _KPROCESS* Process, + PVOID ImageBase, + ULONG ImageSize, + ULONG BucketSize, + KPROFILE_SOURCE ProfileSource, + KAFFINITY Affinity); + STDCALL +VOID +KeStartProfile(struct _KPROFILE* Profile, + PVOID Buffer); + +STDCALL +VOID +KeStopProfile(struct _KPROFILE* Profile); + +STDCALL +ULONG +KeQueryIntervalProfile(KPROFILE_SOURCE ProfileSource); + +STDCALL +VOID +KeSetIntervalProfile(KPROFILE_SOURCE ProfileSource, + ULONG Interval); + +VOID +STDCALL KeProfileInterrupt( PKTRAP_FRAME TrapFrame ); @@ -143,14 +141,6 @@ IN KPROFILE_SOURCE Source ); -VOID KiAddProfileEventToProcess(PLIST_ENTRY ListHead, PVOID Eip); -VOID KiAddProfileEvent(KPROFILE_SOURCE Source, ULONG Eip); -VOID KiInsertProfileIntoProcess(PLIST_ENTRY ListHead, PKPROFILE Profile); -VOID KiInsertProfile(PKPROFILE Profile); -VOID KiRemoveProfile(PKPROFILE Profile); -VOID STDCALL KiDeleteProfile(PVOID ObjectBody); - - VOID STDCALL KeUpdateSystemTime(PKTRAP_FRAME TrapFrame, KIRQL Irql); VOID STDCALL KeUpdateRunTime(PKTRAP_FRAME TrapFrame, KIRQL Irql); _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/kqueue.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/kqueue.c 2005-03-03 02:46:43 UTC (rev 13804) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/kqueue.c 2005-03-03 03:57:59 UTC (rev 13805) @@ -1,11 +1,13 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PURPOSE: ReactOS kernel * FILE: ntoskrnl/ke/kqueue.c * PURPOSE: Implement device queues * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Several optimizations and implement + * usage of Inserted flag + reformat and + * add debug output. + * David Welch (welch(a)mcmail.com) */ /* INCLUDES ****************************************************************/ @@ -16,216 +18,255 @@ /* FUNCTIONS *****************************************************************/ +/* + * @implemented + * + * FUNCTION: Intializes a device queue + * ARGUMENTS: + * DeviceQueue = Device queue to initialize + */ +VOID +STDCALL +KeInitializeDeviceQueue(IN PKDEVICE_QUEUE DeviceQueue) +{ + /* Initialize the Header */ + DeviceQueue->Type = DeviceQueueObject; + DeviceQueue->Size = sizeof(KDEVICE_QUEUE); + + /* Initialize the Listhead and Spinlock */ + InitializeListHead(&DeviceQueue->DeviceListHead); + KeInitializeSpinLock(&DeviceQueue->Lock); + + /* Set it as busy */ + DeviceQueue->Busy=FALSE; +} + /* * @implemented + * + * FUNCTION: Inserts an entry in a device queue + * ARGUMENTS: + * DeviceQueue = Queue to insert the entry in + * DeviceQueueEntry = Entry to insert + * RETURNS: False is the device queue wasn't busy + * True otherwise */ [truncated at 1000 lines; 947 more skipped]

19 years, 9 months

[royce] 13804: fix spelling mistakes

by royce＠svn.reactos.com

fix spelling mistakes Modified: trunk/reactos/config _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-03-02 22:56:41 UTC (rev 13803) +++ trunk/reactos/config 2005-03-03 02:46:43 UTC (rev 13804) @@ -7,12 +7,12 @@ # -# Which cpu should reactos optimze for +# Which cpu should reactos optimize for # example : i486, i586, pentium, pentium2, pentium3, pentium4 # athlon-xp, athlon-mp, k6-2, # -# see gcc manual for more cpu name and which cpu it can -# be optimze for. +# see gcc manual for more cpu names and which cpus it can +# be optimized for. # OARCH := i486

19 years, 9 months

[chorns] 13803: Copy bootstrap files to cd

by chorns＠svn.reactos.com

Copy bootstrap files to cd Modified: branches/xmlbuildsystem/reactos/Makefile Added: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/bootsect.xml Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml Modified: branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml Modified: branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml Modified: branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml Modified: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml Added: branches/xmlbuildsystem/reactos/subsys/system/reactos/reactos.xml Added: branches/xmlbuildsystem/reactos/subsys/system/usetup/usetup.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/welcome/welcome.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-02 22:56:41 UTC (rev 13803) @@ -16,6 +16,7 @@ dlltool = mingw32-dlltool windres = mingw32-windres rm = rm -f + cp = cp NUL = /dev/null else # mingw32-windows EXEPREFIX = @@ -30,6 +31,7 @@ dlltool = dlltool windres = windres rm = del /f /q + cp = copy /y NUL = NUL endif _____ Added: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/bootsect.xml --- branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/bootsect.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/bootsect.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -0,0 +1,20 @@ +<module name="dosmbr" type="bootsector" > + <bootstrap base="loader" nameoncd="dosmbr.bin" /> + <file>dosmbr.asm</file> +</module> +<module name="ext2" type="bootsector"> + <bootstrap base="loader" nameoncd="ext2.bin" /> + <file>ext2.asm</file> +</module> +<module name="fat32" type="bootsector"> + <bootstrap base="loader" nameoncd="fat32.bin" /> + <file>fat32.asm</file> +</module> +<module name="fat" type="bootsector"> + <bootstrap base="loader" nameoncd="fat.bin" /> + <file>fat.asm</file> +</module> +<module name="isoboot" type="bootsector"> + <bootstrap base="loader" nameoncd="isoboot.bin" /> + <file>isoboot.asm</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,14 +1,6 @@ -<module name="bootsector" type="bootsector"> - <directory name="bootsect"> - <file>dosmbr.asm</file> - <file>ext2.asm</file> - <file>fat32.asm</file> - <file>fat.asm</file> - <file>isoboot.asm</file> - <file>win2k.asm</file> - <file>wxpfat16.asm</file> - </directory> -</module> +<directory name="bootsect"> + <xi:include href="bootsect/bootsect.xml" /> +</directory> <directory name="freeldr"> <xi:include href="freeldr/freeldr_startup.xml" /> <xi:include href="freeldr/freeldr_base64k.xml" /> _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml --- branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/dd/blue/blue.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="blue" type="kernelmodedriver"> + <bootstrap base="reactos" /> <library>ntoskrnl</library> <library>hal</library> <file>blue.c</file> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/fs/cdfs/cdfs.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="cdfs" type="kernelmodedriver"> + <bootstrap base="reactos" /> <include base="cdfs">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/fs/ntfs/ntfs.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="ntfs" type="kernelmodedriver"> + <bootstrap base="reactos" /> <include base="ntfs">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml --- branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfatfs.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="vfatfs" type="kernelmodedriver"> + <bootstrap base="reactos" /> <include base="vfatfs">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml --- branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="keyboard" type="kernelmodedriver"> + <bootstrap base="reactos" /> <include base="keyboard">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml --- branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="atapi" type="kernelmodedriver"> + <bootstrap base="reactos" /> <include base="atapi">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml --- branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="cdrom" type="kernelmodedriver"> + <bootstrap base="reactos" /> <library>ntoskrnl</library> <library>hal</library> <library>class2</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml --- branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="class2" type="kernelmodedriver"> + <bootstrap base="reactos" /> <importlibrary definition="class2.def" /> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml --- branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="disk" type="kernelmodedriver"> + <bootstrap base="reactos" /> <library>ntoskrnl</library> <library>hal</library> <library>class2</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml --- branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="diskdump" type="kernelmodedriver"> + <bootstrap base="reactos" /> <library definition="diskdump.def" /> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml --- branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="floppy" type="kernelmodedriver"> + <bootstrap base="reactos" /> <include base="floppy">.</include> <library>ntoskrnl</library> <library>hal</library> _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml --- branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="scsiport" type="kernelmodedriver"> + <bootstrap base="reactos" /> <importlibrary definition="scsiport.def" /> <include base="scsiport">.</include> <library>ntoskrnl</library> _____ Modified: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml --- branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="ntdll" type="nativedll" baseaddress="${BASEADDRESS_NTDLL}"> + <bootstrap base="reactos/system32" /> <importlibrary definition="def/ntdll.def" /> <define name="__NTDLL__" /> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="ntoskrnl" type="kernel"> + <bootstrap base="reactos" /> <importlibrary definition="ntoskrnl.def" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml --- branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -40,6 +40,9 @@ <directory name="userinit"> <xi:include href="userinit/userinit.xml" /> </directory> +<directory name="usetup"> + <xi:include href="usetup/usetup.xml" /> +</directory> <directory name="vmwinst"> <xi:include href="vmwinst/vmwinst.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/reactos/reactos.xml --- branches/xmlbuildsystem/reactos/subsys/system/reactos/reactos.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/subsys/system/reactos/reactos.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -0,0 +1,12 @@ +<module name="reactos" type="win32gui"> + <bootstrap base="reactos" /> + <include base="reactos">.</include> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <file>reactos.c</file> + <file>reactos.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/usetup/usetup.xml --- branches/xmlbuildsystem/reactos/subsys/system/usetup/usetup.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/subsys/system/usetup/usetup.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -0,0 +1,27 @@ +<module name="usetup" type="nativecui"> + <bootstrap base="reactos/system32" nameoncd="smss.exe" /> + <include base="usetup">.</include> + <include base="zlib">.</include> + <define name="_DISABLE_TIDENTS" /> + <linkerflag>-lgcc</linkerflag> + <library>zlib</library> + <library>vfatlib</library> + <library>ntdll</library> + <file>bootsup.c</file> + <file>cabinet.c</file> + <file>console.c</file> + <file>drivesup.c</file> + <file>filequeue.c</file> + <file>filesup.c</file> + <file>format.c</file> + <file>fslist.c</file> + <file>genlist.c</file> + <file>infcache.c</file> + <file>inicache.c</file> + <file>partlist.c</file> + <file>progress.c</file> + <file>registry.c</file> + <file>settings.c</file> + <file>usetup.c</file> + <file>usetup.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/welcome/welcome.xml --- branches/xmlbuildsystem/reactos/subsys/system/welcome/welcome.xml 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/subsys/system/welcome/welcome.xml 2005-03-02 22:56:41 UTC (rev 13803) @@ -1,4 +1,5 @@ <module name="welcome" type="win32gui"> + <bootstrap base="reactos" /> <include base="welcome">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-02 22:56:41 UTC (rev 13803) @@ -1989,6 +1989,24 @@ return directories; } +string +MingwIsoModuleHandler::GetCdFiles ( const string bootcdDirectory, + const Module& module ) const +{ + string files; + for ( size_t i = 0; i < module.project.modules.size (); i++ ) + { + const Module& m = *module.project.modules[i]; + if ( m.bootstrap != NULL ) + { + if ( files.size () > 0 ) + files += " "; + files += FixupTargetFilename ( m.GetPath () ); + } + } + return files; +} + void MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module ) { @@ -2001,14 +2019,17 @@ string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" ); string cdDirectories = bootcdReactos + " " + GetCdDirectories ( bootcdDirectory, module ); + string cdFiles = GetCdFiles ( bootcdDirectory, + module ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, - "%s: all %s %s\n", + "%s: all %s %s %s\n", module.name.c_str (), isoboot.c_str (), - cdDirectories.c_str () ); + cdDirectories.c_str (), + cdFiles.c_str () ); fprintf ( fMakefile, "\t${cabman} /C %s /L %s /I\n", reactosDff.c_str (), _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-02 22:56:41 UTC (rev 13803) @@ -293,6 +293,8 @@ void GenerateIsoModuleTarget ( const Module& module ); std::string GetCdDirectories ( const std::string bootcdDirectory, const Module& module ) const; + std::string GetCdFiles ( const std::string bootcdDirectory, + const Module& module ) const; void OutputBootstrapfileCopyCommands ( const std::string bootcdDirectory, const Module& module ) const; }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp 2005-03-02 22:29:11 UTC (rev 13802) +++ branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp 2005-03-02 22:56:41 UTC (rev 13803) @@ -32,12 +32,12 @@ case Win32CUI: case Win32GUI: case KernelModeDriver: + case BootSector: return true; case BuildTool: case StaticLibrary: case ObjectLibrary: case BootLoader: - case BootSector: case Iso: return false; }

19 years, 9 months

[navaraf] 13802: Fix W->A conversions in EnumDisplaySettingsExA. This is dedicated to Caroline!

by navaraf＠svn.reactos.com

Fix W->A conversions in EnumDisplaySettingsExA. This is dedicated to Caroline! Modified: trunk/reactos/lib/user32/misc/display.c _____ Modified: trunk/reactos/lib/user32/misc/display.c --- trunk/reactos/lib/user32/misc/display.c 2005-03-02 22:17:34 UTC (rev 13801) +++ trunk/reactos/lib/user32/misc/display.c 2005-03-02 22:29:11 UTC (rev 13802) @@ -200,22 +200,32 @@ { BOOL rc; UNICODE_STRING DeviceName; + LPDEVMODEW lpDevModeW; + lpDevModeW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DEVMODEW) + lpDevMode->dmDriverExtra); + if ( lpDevModeW == NULL ) + { + SetLastError ( ERROR_OUTOFMEMORY ); + return FALSE; + } + if ( !RtlCreateUnicodeStringFromAsciiz ( &DeviceName, (PCSZ)lpszDeviceName ) ) { SetLastError ( ERROR_OUTOFMEMORY ); return FALSE; } - /* - * NOTE: We don't need to convert between DEVMODEW and DEVMODEA because - * only dmBitsPerPel, dmPelsWidth, dmPelsHeight, dmDisplayFlags and - * dmDisplayFrequency fields are set. - */ - rc = NtUserEnumDisplaySettings ( &DeviceName, iModeNum, (LPDEVMODEW)lpDevMode, + lpDevModeW->dmSize = sizeof(DEVMODEW); + lpDevModeW->dmDriverExtra = 0; + + rc = NtUserEnumDisplaySettings ( &DeviceName, iModeNum, lpDevModeW, dwFlags ); + RosRtlDevModeW2A ( lpDevMode, lpDevModeW ); + RtlFreeUnicodeString ( &DeviceName ); + HeapFree ( GetProcessHeap(), 0, lpDevModeW ); return rc; }

19 years, 9 months

[ea] 13801: Mispelled word and wrong past tense in a comment.

by ea＠svn.reactos.com

Mispelled word and wrong past tense in a comment. Modified: trunk/reactos/subsys/smss/smapiexec.c _____ Modified: trunk/reactos/subsys/smss/smapiexec.c --- trunk/reactos/subsys/smss/smapiexec.c 2005-03-02 22:09:53 UTC (rev 13800) +++ trunk/reactos/subsys/smss/smapiexec.c 2005-03-02 22:17:34 UTC (rev 13801) @@ -127,8 +127,8 @@ * ARGUMENTS * Name: name of the program to run, that is a value's name in * the SM registry key Subsystems; - * Data: what the registry gived back for Name; - * DataLength: how much Data the registry retruns; + * Data: what the registry gave back for Name; + * DataLength: how much Data the registry returns; * DataType: what is Data? * Expand: set it TRUE if you want this function to use the env * to possibly expand Data before giving it back.

19 years, 9 months

[ea] 13800: Kmode subsystem no more hardwired.

by ea＠svn.reactos.com

Kmode subsystem no more hardwired. Modified: trunk/reactos/subsys/smss/initss.c Modified: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smss.h _____ Modified: trunk/reactos/subsys/smss/initss.c --- trunk/reactos/subsys/smss/initss.c 2005-03-02 21:54:58 UTC (rev 13799) +++ trunk/reactos/subsys/smss/initss.c 2005-03-02 22:09:53 UTC (rev 13800) @@ -32,6 +32,10 @@ #define NDEBUG #include <debug.h> +/* SM handle for its own \SmApiPort */ +HANDLE hSmApiPort = (HANDLE) 0; + + /* TODO: this file should be totally rewritten * * a) look if a special option is set for smss.exe in @@ -40,9 +44,6 @@ * b) make smss register with itself for IMAGE_SUBSYSTEM_NATIVE * (programmatically) * - * c) make smss load win32k.sys as set in Kmode key - * HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems - * * d) make smss initialize Debug (DBGSS) and Windows (CSRSS) as described * in the registry key Required="Debug Windows" * HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems @@ -56,30 +57,41 @@ NTSTATUS SmLoadSubsystems(VOID) { - SYSTEM_LOAD_AND_CALL_IMAGE ImageInfo; - NTSTATUS Status; + SYSTEM_LOAD_AND_CALL_IMAGE ImageInfo; + NTSTATUS Status = STATUS_SUCCESS; + WCHAR Data [MAX_PATH + 1]; + ULONG DataLength = sizeof Data; + ULONG DataType = 0; - DPRINT("SM: loading subsystems\n"); + + DPRINT("SM: loading subsystems\n"); - /* Load kernel mode subsystem (aka win32k.sys) */ - RtlRosInitUnicodeStringFromLiteral(&ImageInfo.ModuleName, - L"\\SystemRoot\\system32\\win32k.sys"); + /* Load Kmode subsystem (aka win32k.sys) */ + Status = SmLookupSubsystem (L"Kmode", + Data, + & DataLength, + & DataType, + TRUE); + if((STATUS_SUCCESS == Status) && (DataLength > sizeof Data[0])) + { + WCHAR ImagePath [MAX_PATH + 1] = {0}; - Status = NtSetSystemInformation(SystemLoadAndCallImage, - &ImageInfo, - sizeof(SYSTEM_LOAD_AND_CALL_IMAGE)); - - DPRINT("SMSS: Loaded win32k.sys (Status %lx)\n", Status); -#if 0 - if (!NT_SUCCESS(Status)) - { - return(Status); - } -#endif - - /* FIXME: load more subsystems (csrss!) */ - - return(Status); + wcscpy (ImagePath, L"\\??\\"); + wcscat (ImagePath, Data); + RtlZeroMemory (& ImageInfo, sizeof ImageInfo); + RtlInitUnicodeString (& ImageInfo.ModuleName, ImagePath); + Status = NtSetSystemInformation(SystemLoadAndCallImage, + & ImageInfo, + sizeof ImageInfo); + if(!NT_SUCCESS(Status)) + { + DPRINT("SM: loading Kmode failed (Status=0x%08lx)\n", + Status); + return Status; + } + } + /* TODO: load Required subsystems (Debug Windows) */ + return Status; } NTSTATUS _____ Modified: trunk/reactos/subsys/smss/smapiexec.c --- trunk/reactos/subsys/smss/smapiexec.c 2005-03-02 21:54:58 UTC (rev 13799) +++ trunk/reactos/subsys/smss/smapiexec.c 2005-03-02 22:09:53 UTC (rev 13800) @@ -1,13 +1,29 @@ -/* $Id: $ +/* $Id$ * * smapiexec.c - SM_API_EXECUTE_PROGRAM * * Reactos Session Manager * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- */ - #include "smss.h" -#include <rosrtl/string.h> #define NDEBUG #include <debug.h> @@ -100,14 +116,204 @@ } /********************************************************************** + * NAME + * SmLookupSubsystem/5 + * + * DESCRIPTION + * Read from the registry key + * \Registry\SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems + * the value which name is Name. + * + * ARGUMENTS + * Name: name of the program to run, that is a value's name in + * the SM registry key Subsystems; + * Data: what the registry gived back for Name; + * DataLength: how much Data the registry retruns; + * DataType: what is Data? + * Expand: set it TRUE if you want this function to use the env + * to possibly expand Data before giving it back. + */ +NTSTATUS STDCALL +SmLookupSubsystem (IN PWSTR Name, + IN OUT PWSTR Data, + IN OUT PULONG DataLength, + IN OUT PULONG DataType, + IN BOOLEAN Expand) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING usKeyName = {0}; + OBJECT_ATTRIBUTES Oa = {0}; + HANDLE hKey = (HANDLE) 0; + + DPRINT("SM: %s called\n", __FUNCTION__); + /* + * Prepare the key name to scan and + * related object attributes. + */ + RtlInitUnicodeString (& usKeyName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\SubSystems"); + + InitializeObjectAttributes (& Oa, + & usKeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + /* + * Open the key. This MUST NOT fail, if the + * request is for a legitimate subsystem. + */ + Status = NtOpenKey (& hKey, + MAXIMUM_ALLOWED, + & Oa); + if(NT_SUCCESS(Status)) + { + UNICODE_STRING usValueName = {0}; + WCHAR KeyValueInformation [1024] = {L'\0'}; + ULONG ResultLength = 0L; + PKEY_VALUE_PARTIAL_INFORMATION + kvpi = (PKEY_VALUE_PARTIAL_INFORMATION) KeyValueInformation; + + + RtlInitUnicodeString (& usValueName, Name); + Status = NtQueryValueKey (hKey, + & usValueName, + KeyValuePartialInformation, + KeyValueInformation, + sizeof KeyValueInformation, + & ResultLength); + if(NT_SUCCESS(Status)) + { + DPRINT("nkvpi.TitleIndex = %ld\n", kvpi->TitleIndex); + DPRINT("kvpi.Type = %ld\n", kvpi->Type); + DPRINT("kvpi.DataLength = %ld\n", kvpi->DataLength); + + if((NULL != Data) && (NULL != DataLength) && (NULL != DataType)) + { + *DataType = kvpi->Type; + if((Expand) && (REG_EXPAND_SZ == *DataType)) + { + UNICODE_STRING Source; + WCHAR DestinationBuffer [2048] = {0}; + UNICODE_STRING Destination; + ULONG Length = 0; + + DPRINT("SM: %s: value will be expanded\n", __FUNCTION__); + + Source.Length = kvpi->DataLength; + Source.MaximumLength = kvpi->DataLength; + Source.Buffer = (PWCHAR) & kvpi->Data; + + Destination.Length = 0; + Destination.MaximumLength = sizeof DestinationBuffer; + Destination.Buffer = DestinationBuffer; + + Status = RtlExpandEnvironmentStrings_U (SmSystemEnvironment, + & Source, + & Destination, + & Length); + if(NT_SUCCESS(Status)) + { + *DataLength = min(*DataLength, Destination.Length); + RtlCopyMemory (Data, Destination.Buffer, *DataLength); + } + + }else{ + DPRINT("SM: %s: value won't be expanded\n", __FUNCTION__); + *DataLength = min(*DataLength, kvpi->DataLength); + RtlCopyMemory (Data, & kvpi->Data, *DataLength); + } + *DataType = kvpi->Type; + }else{ + DPRINT1("SM: %s: Data or DataLength or DataType is NULL!\n", __FUNCTION__); + Status = STATUS_INVALID_PARAMETER; + } + }else{ + DPRINT1("%s: NtQueryValueKey failed (Status=0x%08lx)\n", __FUNCTION__, Status); + } + NtClose (hKey); + }else{ + DPRINT1("%s: NtOpenKey failed (Status=0x%08lx)\n", __FUNCTION__, Status); + } + return Status; +} + + +/********************************************************************** * SmExecPgm/1 API */ SMAPI(SmExecPgm) { + PSM_PORT_MESSAGE_EXECPGM ExecPgm = NULL; + WCHAR Name [SM_EXEXPGM_MAX_LENGTH + 1]; + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("SM: %s called\n",__FUNCTION__); - Request->Status = STATUS_NOT_IMPLEMENTED; - return STATUS_SUCCESS; + + if(NULL == Request) + { + DPRINT1("SM: %s: Request == NULL!\n", __FUNCTION__); + return STATUS_INVALID_PARAMETER; + } + DPRINT("SM: %s called from CID(%lx|%lx)\n", + __FUNCTION__, Request->Header.ClientId.UniqueProcess, + Request->Header.ClientId.UniqueThread); + ExecPgm = & Request->ExecPgm; + /* Check if the name lenght is valid */ + if((ExecPgm->NameLength > 0) && + (ExecPgm->NameLength <= SM_EXEXPGM_MAX_LENGTH) && + TRUE /* TODO: check LPC payload size */) + { + + RtlZeroMemory (Name, sizeof Name); + RtlCopyMemory (Name, + ExecPgm->Name, + (sizeof ExecPgm->Name[0] * ExecPgm->NameLength)); + DPRINT("SM: %s: Name=[%wZ]\n", __FUNCTION__, Name); + /* + * Check if program name is internal + * (Is this correct? Debug is in the registry too) + */ + if(0 == _wcsicmp(L"DEBUG", Name)) + { + /* + * Initialize DBGSS. + * NOTE: probably in early prototypes it was an + * independent process; now it is embedded in the + * SM for performance or security. + */ + Request->Status = SmInitializeDbgSs(); + } + else + { + WCHAR ImagePath [1024] = {0}; + ULONG ImagePathLength = sizeof ImagePath; + ULONG ImagePathType = REG_EXPAND_SZ; + + /* Lookup Name in the registry */ + Status = SmLookupSubsystem (Name, + ImagePath, + & ImagePathLength, + & ImagePathType, + TRUE); /* expand */ + if(NT_SUCCESS(Status)) + { + /* Create native process */ + Request->Status = SmCreateUserProcess(ImagePath, + L"", /* FIXME */ + FALSE, /* wait */ + NULL, + FALSE, /* terminate */ + NULL); + }else{ + Request->Status = Status; + } + } + } + else + { + Request->Status = Status = STATUS_INVALID_PARAMETER; + } + return Status; } - /* EOF */ _____ Modified: trunk/reactos/subsys/smss/smss.h --- trunk/reactos/subsys/smss/smss.h 2005-03-02 21:54:58 UTC (rev 13799) +++ trunk/reactos/subsys/smss/smss.h 2005-03-02 22:09:53 UTC (rev 13800) @@ -63,6 +63,12 @@ PLARGE_INTEGER Timeout OPTIONAL, BOOLEAN TerminateIt, PRTL_PROCESS_INFO ProcessInfo OPTIONAL); +NTSTATUS STDCALL +SmLookupSubsystem (IN PWSTR Name, + IN OUT PWSTR Data, + IN OUT PULONG DataLength, + IN OUT PULONG DataType, + IN BOOLEAN Expand); NTSTATUS FASTCALL SmExecPgm(PSM_PORT_MESSAGE); /* smapicomp.c */

19 years, 9 months

[ion] 13799: Make this header shared internally.

by ion＠svn.reactos.com

Make this header shared internally. Added: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/kdb.h _____ Added: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/kdb.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/kdb.h 2005-03-02 21:54:28 UTC (rev 13798) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/kdb.h 2005-03-02 21:54:58 UTC (rev 13799) @@ -0,0 +1,73 @@ +#define NTOS_MODE_KERNEL +#include <ntos.h> + +typedef struct _KDB_MODULE_INFO +{ + WCHAR Name[256]; + ULONG_PTR Base; + ULONG Size; + PROSSYM_INFO RosSymInfo; +} KDB_MODULE_INFO, *PKDB_MODULE_INFO; + +/* from kdb_symbols.c */ + +BOOLEAN +KdbpSymFindModuleByAddress(IN PVOID Address, + OUT PKDB_MODULE_INFO pInfo); + +BOOLEAN +KdbpSymFindModuleByName(IN LPCWSTR Name, + OUT PKDB_MODULE_INFO pInfo); + +BOOLEAN +KdbpSymFindModuleByIndex(IN INT Index, + OUT PKDB_MODULE_INFO pInfo); + +BOOLEAN +KdbSymPrintAddress(IN PVOID Address); + +NTSTATUS +KdbSymGetAddressInformation(IN PROSSYM_INFO RosSymInfo, + IN ULONG_PTR RelativeAddress, + OUT PULONG LineNumber OPTIONAL, + OUT PCH FileName OPTIONAL, + OUT PCH FunctionName OPTIONAL); + +/* other functions */ +#define KdbpSafeReadMemory(dst, src, size) MmSafeCopyFromUser(dst, src, size) +#define KdbpSafeWriteMemory(dst, src, size) MmSafeCopyToUser(dst, src, size) +CHAR +KdbTryGetCharKeyboard(PULONG ScanCode); +ULONG +KdbTryGetCharSerial(VOID); +VOID +KdbEnter(VOID); +VOID +DbgRDebugInit(VOID); +VOID +DbgShowFiles(VOID); +VOID +DbgEnableFile(PCH Filename); +VOID +DbgDisableFile(PCH Filename); +VOID +KdbInitProfiling(); +VOID +KdbInitProfiling2(); +VOID +KdbDisableProfiling(); +VOID +KdbEnableProfiling(); +VOID +KdbProfileInterrupt(ULONG_PTR Eip); + +VOID +KdbModuleLoaded(IN PUNICODE_STRING Name); + + +struct KDB_BPINFO { + DWORD Addr; + DWORD Type; + DWORD Size; + DWORD Enabled; +};

19 years, 9 months

[ion] 13798: Make ASSERTs bugcheck properly. Thanks Steven

by ion＠svn.reactos.com

Make ASSERTs bugcheck properly. Thanks Steven Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/debug.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/kill.c _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/include/internal/debug.h --- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/debug.h 2005-03-02 21:24:02 UTC (rev 13797) +++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/debug.h 2005-03-02 21:54:28 UTC (rev 13798) @@ -38,11 +38,11 @@ /* Assert only on "checked" version */ #ifndef NASSERT #ifdef CONFIG_SMP -#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber), KeBugCheck(0); } -#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber), KeBugCheck(0); } +#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber), DbgBreakPoint(); } +#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber), DbgBreakPoint(); } #else -#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); KeBugCheck(0); } -#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); KeBugCheck(0); } +#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); } +#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); } #endif #define assertmsg(_c_, _m_) \ _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/kill.c --- branches/alex_devel_branch/reactos/ntoskrnl/ps/kill.c 2005-03-02 21:24:02 UTC (rev 13797) +++ branches/alex_devel_branch/reactos/ntoskrnl/ps/kill.c 2005-03-02 21:54:28 UTC (rev 13798) @@ -219,12 +219,6 @@ } oldIrql = KeAcquireDispatcherDatabaseLock(); - -#ifdef _ENABLE_THRDEVTPAIR - ExpSwapThreadEventPair(CurrentThread, NULL); /* Release the associated eventpair object, if there was one */ -#endif /* _ENABLE_THRDEVTPAIR */ - - ASSERT(CurrentThread->Tcb.WaitBlockList == NULL); PsDispatchThreadNoLock(THREAD_STATE_TERMINATED_1); DPRINT1("Unexpected return, CurrentThread %x PsGetCurrentThread() %x\n", CurrentThread, PsGetCurrentThread());

19 years, 9 months

[chorns] 13797: Add bootstrap tag to specify that files are to be copied to the CD

by chorns＠svn.reactos.com

Add bootstrap tag to specify that files are to be copied to the CD Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Added: branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/linkerflag.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-02 20:35:18 UTC (rev 13796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-02 21:24:02 UTC (rev 13797) @@ -1873,7 +1873,7 @@ { static string ros_junk ( "$(ROS_TEMPORARY)" ); string targetName ( module.GetTargetName () ); - string target ( FixupTargetFilename (module.GetPath ()) ); + string target ( FixupTargetFilename ( module.GetPath () ) ); string workingDirectory = GetWorkingDirectory (); string junk_tmp = ros_junk + module.name + ".junk.tmp"; string objectsMacro = GetObjectsMacro ( module ); @@ -1952,6 +1952,44 @@ } void +MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( const string bootcdDirectory, + const Module& module ) const +{ + for ( size_t i = 0; i < module.project.modules.size (); i++ ) + { + const Module& m = *module.project.modules[i]; + if ( m.bootstrap != NULL ) + { + string targetFilenameNoFixup = bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd; + string targetFilename = PassThruCacheDirectory ( FixupTargetFilename ( targetFilenameNoFixup ) ); + fprintf ( fMakefile, + "\t${cp} %s %s\n", + m.GetPath ().c_str (), + targetFilename.c_str () ); + } + } +} + +string +MingwIsoModuleHandler::GetCdDirectories ( const string bootcdDirectory, + const Module& module ) const +{ + string directories; + for ( size_t i = 0; i < module.project.modules.size (); i++ ) + { + const Module& m = *module.project.modules[i]; + if ( m.bootstrap != NULL ) + { + string targetDirecctory = bootcdDirectory + SSEP + m.bootstrap->base; + if ( directories.size () > 0 ) + directories += " "; + directories += FixupTargetFilename ( targetDirecctory ); + } + } + return directories; +} + +void MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module ) { string bootcdDirectory = "cd"; @@ -1961,6 +1999,8 @@ PassThruCacheDirectory ( bootcdReactos + SSEP ); string reactosInf = FixupTargetFilename ( bootcdReactosNoFixup + "/reactos.inf" ); string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" ); + string cdDirectories = bootcdReactos + " " + GetCdDirectories ( bootcdDirectory, + module ); fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); @@ -1968,7 +2008,7 @@ "%s: all %s %s\n", module.name.c_str (), isoboot.c_str (), - bootcdReactos.c_str () ); + cdDirectories.c_str () ); fprintf ( fMakefile, "\t${cabman} /C %s /L %s /I\n", reactosDff.c_str (), @@ -1981,6 +2021,8 @@ fprintf ( fMakefile, "\t- ${rm} %s\n", reactosInf.c_str () ); + OutputBootstrapfileCopyCommands ( bootcdDirectory, + module ); fprintf ( fMakefile, "\t${cdmake} -v -m -b %s %s REACTOS ReactOS.iso\n", isoboot.c_str (), _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-02 20:35:18 UTC (rev 13796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-02 21:24:02 UTC (rev 13797) @@ -291,6 +291,10 @@ virtual void Process ( const Module& module ); private: void GenerateIsoModuleTarget ( const Module& module ); + std::string GetCdDirectories ( const std::string bootcdDirectory, + const Module& module ) const; + void OutputBootstrapfileCopyCommands ( const std::string bootcdDirectory, + const Module& module ) const; }; #endif /* MINGW_MODULEHANDLER_H */ _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp 2005-03-02 20:35:18 UTC (rev 13796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/bootstrap.cpp 2005-03-02 21:24:02 UTC (rev 13797) @@ -0,0 +1,74 @@ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" + +using std::string; + +Bootstrap::Bootstrap ( const Project& project_, + const Module* module_, + const XMLElement& bootstrapNode ) + : project(project_), + module(module_), + node(bootstrapNode) +{ + Initialize(); +} + +Bootstrap::~Bootstrap () +{ +} + +bool +Bootstrap::IsSupportedModuleType ( ModuleType type ) +{ + switch ( type ) + { + case Kernel: + case KernelModeDLL: + case NativeDLL: + case NativeCUI: + case Win32DLL: + case Win32CUI: + case Win32GUI: + case KernelModeDriver: + return true; + case BuildTool: + case StaticLibrary: + case ObjectLibrary: + case BootLoader: + case BootSector: + case Iso: + return false; + } + throw InvalidOperationException ( __FILE__, + __LINE__ ); +} + +void +Bootstrap::Initialize () +{ + if ( !IsSupportedModuleType ( module->type ) ) + { + throw InvalidBuildFileException ( + node.location, + "<bootstrap> is not applicable for this module type." ); + } + + const XMLAttribute* att = node.GetAttribute ( "base", false ); + if ( att != NULL ) + base = att->value; + else + base = ""; + + att = node.GetAttribute ( "nameoncd", false ); + if ( att != NULL ) + nameoncd = att->value; + else + nameoncd = module->GetTargetName (); +} + +void +Bootstrap::ProcessXML() +{ +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/linkerflag.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/linkerflag.cpp 2005-03-02 20:35:18 UTC (rev 13796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/linkerflag.cpp 2005-03-02 21:24:02 UTC (rev 13797) @@ -30,14 +30,14 @@ } void -LinkerFlag::Initialize() +LinkerFlag::Initialize () { } void -LinkerFlag::ProcessXML() +LinkerFlag::ProcessXML () { - if (node.value.size () == 0) + if ( node.value.size () == 0 ) { throw InvalidBuildFileException ( node.location, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-02 20:35:18 UTC (rev 13796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-02 21:24:02 UTC (rev 13797) @@ -21,6 +21,7 @@ RBUILD_BASE_SOURCES = \ $(RBUILD_BACKEND_BASE_SOURCES) \ automaticdependency.cpp \ + bootstrap.cpp \ compilerflag.cpp \ define.cpp \ exception.cpp \ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-02 20:35:18 UTC (rev 13796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-03-02 21:24:02 UTC (rev 13797) @@ -55,7 +55,8 @@ const string& modulePath ) : project (project), node (moduleNode), - importLibrary (NULL) + importLibrary (NULL), + bootstrap (NULL) { if ( node.name != "module" ) throw Exception ( "internal tool error: Module created with non-<module> node" ); @@ -261,6 +262,11 @@ e.location, "<property> is not a valid sub-element of <module>" ); } + else if ( e.name == "bootstrap" ) + { + bootstrap = new Bootstrap ( project, this, e ); + subs_invalid = true; + } if ( subs_invalid && e.subElements.size() > 0 ) throw InvalidBuildFileException ( e.location, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-02 20:35:18 UTC (rev 13796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-02 21:24:02 UTC (rev 13797) @@ -51,6 +51,7 @@ class LinkerFlag; class Property; class AutomaticDependency; +class Bootstrap; class SourceFileTest; @@ -127,6 +128,7 @@ ModuleType type; ImportLibrary* importLibrary; bool mangledSymbols; + Bootstrap* bootstrap; std::vector<File*> files; std::vector<Library*> libraries; std::vector<Include*> includes; @@ -450,6 +452,26 @@ }; +class Bootstrap +{ +public: + const Project& project; + const Module* module; + const XMLElement& node; + std::string base; + std::string nameoncd; + + Bootstrap ( const Project& project, + const Module* module, + const XMLElement& bootstrapNode ); + ~Bootstrap (); + void ProcessXML(); +private: + bool IsSupportedModuleType ( ModuleType type ); + void Initialize(); +}; + + extern std::string FixSeparator ( const std::string& s ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-03-02 20:35:18 UTC (rev 13796) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-03-02 21:24:02 UTC (rev 13797) @@ -123,7 +123,7 @@ None. Elements: - define, dependency, directory, file, if, importlibrary, include, invoke, library, property. + bootstrap, define, dependency, directory, file, if, importlibrary, include, invoke, library, property. Module types @@ -143,6 +143,24 @@ iso - Builds a bootable CD. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type. +Bootstrap element +----------------- +A bootstrap element specifies that the generated file should be put on the bootable CD as a bootstrap file. + +Syntax: + <bootstrap base="reactos" nameoncd="halmp.dll" /> + +Attributes: + base - Put file in this directory on the bootable CD. This attribute is optional. + nameoncd - Name of file on the bootable CD. This attribute is optional. + +Value: + None. + +Elements: + None. + + Define element -------------- A define element specifies the name and (optionally) value of a define for the C/C++ compiler and resource compiler.

19 years, 9 months

[hbirr] 13796: Fixed smp boot.

by hbirr＠svn.reactos.com

Fixed smp boot. Modified: trunk/reactos/ntoskrnl/ke/i386/main.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/main.S --- trunk/reactos/ntoskrnl/ke/i386/main.S 2005-03-02 07:11:26 UTC (rev 13795) +++ trunk/reactos/ntoskrnl/ke/i386/main.S 2005-03-02 20:35:18 UTC (rev 13796) @@ -6,6 +6,8 @@ #include <internal/i386/mm.h> #include <internal/i386/fpu.h> +#define AP_MAGIC (0x12481020) + .globl _NtProcessStartup _NtProcessStartup: @@ -17,7 +19,25 @@ /* Load the PCR selector */ movl $PCR_SELECTOR, %eax movl %eax, %fs - + + cmpl $AP_MAGIC, %ecx + jne .m1 + + pushl $0 + popfl + + /* + * Reserve space for the floating point save area. + */ + subl $SIZEOF_FX_SAVE_AREA, %esp + + /* + * Call the application processor initialization code + */ + pushl $0 + call _KiSystemStartup + +.m1: /* Load the initial kernel stack */ lea _kernel_stack, %eax add $0x1000, %eax

19 years, 9 months

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 March 2005