Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 20427: - Fix some small formatting issues.
by ion＠svn.reactos.org 29 Dec '05

29 Dec '05

- Fix some small formatting issues. Modified: trunk/reactos/ntoskrnl/ex/lookas.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/ex/zone.c _____ Modified: trunk/reactos/ntoskrnl/ex/lookas.c --- trunk/reactos/ntoskrnl/ex/lookas.c 2005-12-29 17:55:31 UTC (rev 20426) +++ trunk/reactos/ntoskrnl/ex/lookas.c 2005-12-29 17:57:11 UTC (rev 20427) @@ -3,7 +3,6 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/lookas.c * PURPOSE: Lookaside lists - * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) * Casper S. Hornstrup (chorns(a)users.sourceforge.net) @@ -28,7 +27,7 @@ /* FUNCTIONS *****************************************************************/ -VOID +VOID INIT_FUNCTION STDCALL ExpInitLookasideLists() @@ -185,7 +184,6 @@ &ExpNonPagedLookasideListLock); } - /* * @implemented */ _____ Modified: trunk/reactos/ntoskrnl/ex/win32k.c --- trunk/reactos/ntoskrnl/ex/win32k.c 2005-12-29 17:55:31 UTC (rev 20426) +++ trunk/reactos/ntoskrnl/ex/win32k.c 2005-12-29 17:57:11 UTC (rev 20427) @@ -1,12 +1,9 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ex/win32k.c - * PURPOSE: Executive Win32 subsystem support - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Moved callbacks to win32k and cleanup. - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PURPOSE: Executive Win32 Object Support (Desktop/WinStation) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ #include <ntoskrnl.h> @@ -104,7 +101,7 @@ ExpDesktopCreate(PVOID ObjectBody, PVOID Parent, PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes) + POBJECT_ATTRIBUTES ObjectAttributes) { /* Call the Registered Callback */ return ExpDesktopObjectCreate(ObjectBody, @@ -128,9 +125,8 @@ { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; + DPRINT("Creating Win32 Object Types\n"); - DPRINT("Creating window station Object Type\n"); - /* Create the window station Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"WindowStation"); @@ -140,7 +136,9 @@ ObjectTypeInitializer.OpenProcedure = ExpWinStaObjectOpen; ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExWindowStationObjectType); + ObpCreateTypeObject(&ObjectTypeInitializer, + &Name, + &ExWindowStationObjectType); /* Create desktop object type */ RtlInitUnicodeString(&Name, L"Desktop"); @@ -148,7 +146,6 @@ ObjectTypeInitializer.OpenProcedure = NULL; ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; ObjectTypeInitializer.ParseProcedure = NULL; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExDesktopObjectType); } _____ Modified: trunk/reactos/ntoskrnl/ex/zone.c --- trunk/reactos/ntoskrnl/ex/zone.c 2005-12-29 17:55:31 UTC (rev 20426) +++ trunk/reactos/ntoskrnl/ex/zone.c 2005-12-29 17:57:11 UTC (rev 20427) @@ -3,7 +3,6 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/zone.c * PURPOSE: Implements zone buffers - * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) */ @@ -32,8 +31,8 @@ * BlockSize and Segment must be 8-byte aligned. * Blocksize cannot exceed Segment Size. */ - if (((ULONG_PTR)Segment & 7) || - (SegmentSize & 7) || + if (((ULONG_PTR)Segment & 7) || + (SegmentSize & 7) || (Zone->BlockSize > SegmentSize)) { DPRINT1("Invalid ExExtendZone Alignment and/or Size\n"); @@ -41,7 +40,8 @@ } /* Link the Zone and Segment */ - PushEntryList(&Zone->SegmentList,&((PZONE_SEGMENT_HEADER)Segment)->Segme ntList); + PushEntryList(&Zone->SegmentList, + &((PZONE_SEGMENT_HEADER)Segment)->SegmentList); /* Get to the first entry */ Entry = (ULONG_PTR)Segment + sizeof(ZONE_SEGMENT_HEADER); @@ -65,7 +65,6 @@ return STATUS_SUCCESS; } - /* * @implemented */ @@ -74,7 +73,7 @@ ExInterlockedExtendZone(PZONE_HEADER Zone, PVOID Segment, ULONG SegmentSize, - PKSPIN_LOCK Lock) + PKSPIN_LOCK Lock) { NTSTATUS Status; KIRQL OldIrql; @@ -90,7 +89,6 @@ return Status; } - /* * FUNCTION: Initalizes a zone header * ARGUMENTS: @@ -130,7 +128,8 @@ /* Link empty list */ Zone->FreeList.Next = NULL; Zone->SegmentList.Next = NULL; - PushEntryList(&Zone->SegmentList, &((PZONE_SEGMENT_HEADER)InitialSegment)->SegmentList); + PushEntryList(&Zone->SegmentList, + &((PZONE_SEGMENT_HEADER)InitialSegment)->SegmentList); ((PZONE_SEGMENT_HEADER)InitialSegment)->Reserved = NULL; /* Get first entry */

1 0

[ion] 20426: Move some profile stuff to NDK and fix some bugs in the executive implementation, as well as support segmented profile objects
by ion＠svn.reactos.org 29 Dec '05

29 Dec '05

Move some profile stuff to NDK and fix some bugs in the executive implementation, as well as support segmented profile objects Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-12-29 15:14:50 UTC (rev 20425) +++ trunk/reactos/include/ndk/extypes.h 2005-12-29 17:55:31 UTC (rev 20426) @@ -55,46 +55,58 @@ // // Invalid Handle Value Constant // -#define INVALID_HANDLE_VALUE (HANDLE)-1 +#define INVALID_HANDLE_VALUE (HANDLE)-1 #endif // // Increments // -#define MUTANT_INCREMENT 1 +#define MUTANT_INCREMENT 1 // // Callback Object Access Mask // -#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) -#define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) -#define CALLBACK_WRITE (STANDARD_RIGHTS_WRITE|SYNCHRONIZE|0x0001) -#define CALLBACK_READ (STANDARD_RIGHTS_READ|SYNCHRONIZE|0x0001) +#define CALLBACK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x0001) +#define CALLBACK_EXECUTE (STANDARD_RIGHTS_EXECUTE|SYNCHRONIZE|0x0001) +#define CALLBACK_WRITE (STANDARD_RIGHTS_WRITE|SYNCHRONIZE|0x0001) +#define CALLBACK_READ (STANDARD_RIGHTS_READ|SYNCHRONIZE|0x0001) // // Event Object Access Masks // #ifdef NTOS_MODE_USER -#define EVENT_QUERY_STATE 0x0001 +#define EVENT_QUERY_STATE 0x0001 // // Semaphore Object Acess Masks // -#define SEMAPHORE_QUERY_STATE 0x0001 +#define SEMAPHORE_QUERY_STATE 0x0001 #endif // // Event Pair Access Masks // -#define EVENT_PAIR_ALL_ACCESS 0x1F0000L +#define EVENT_PAIR_ALL_ACCESS 0x1F0000L // +// Profile Object Access Masks +// +#define PROFILE_CONTROL 0x0001 +#define PROFILE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | PROFILE_CONTROL) + +// // Maximum Parameters for NtRaiseHardError // -#define MAXIMUM_HARDERROR_PARAMETERS 4 +#define MAXIMUM_HARDERROR_PARAMETERS 4 // +// Pushlock Wait Block Flags +// +#define EX_PUSH_LOCK_FLAGS_EXCLUSIVE 1 +#define EX_PUSH_LOCK_FLAGS_WAIT 2 + +// // Shutdown types for NtShutdownSystem // typedef enum _SHUTDOWN_ACTION @@ -271,8 +283,21 @@ } EX_FAST_REF, *PEX_FAST_REF; // -// Executive Fast Reference Wait Block +// Executive Cache-Aware Rundown Reference Descriptor // +typedef struct _EX_RUNDOWN_REF_CACHE_AWARE +{ + union + { + ULONG_PTR Count; + PVOID Ptr; + }; + PVOID PoolToFree; +} EX_RUNDOWN_REF_CACHE_AWARE, *PEX_RUNDOWN_REF_CACHE_AWARE; + +// +// Executive Rundown Wait Block +// typedef struct _EX_RUNDOWN_WAIT_BLOCK { ULONG_PTR Count; @@ -280,6 +305,32 @@ } EX_RUNDOWN_WAIT_BLOCK, *PEX_RUNDOWN_WAIT_BLOCK; // +// Executive Pushlock Wait Block +// +#ifndef __GNUC__ // WARNING! PUSHLOCKS WILL NOT WORK IN GCC FOR NOW!!! +__declspec(align(16)) +#endif +typedef struct _EX_PUSH_LOCK_WAIT_BLOCK +{ + union + { + KGATE WakeGate; + KEVENT WakeEvent; + }; + struct _EX_PUSH_LOCK_WAIT_BLOCK *Next; + struct _EX_PUSH_LOCK_WAIT_BLOCK *Last; + struct _EX_PUSH_LOCK_WAIT_BLOCK *Previous; + LONG ShareCount; + LONG Flags; +#if DBG + BOOL Signaled; + EX_PUSH_LOCK NewValue; + EX_PUSH_LOCK OldValue; + PEX_PUSH_LOCK PushLock; +#endif +} EX_PUSH_LOCK_WAIT_BLOCK, *PEX_PUSH_LOCK_WAIT_BLOCK; + +// // Callback Object // typedef struct _CALLBACK_OBJECT @@ -291,6 +342,25 @@ } CALLBACK_OBJECT , *PCALLBACK_OBJECT; // +// Profile OBject +// +typedef struct _EPROFILE +{ + PEPROCESS Process; + PVOID ImageBase; + SIZE_T ImageSize; + PVOID Buffer; + ULONG BufferSize; + ULONG BucketSize; + PKPROFILE KeProfile; + PVOID LockedBuffer; + PMDL Mdl; + ULONG Segment; + KPROFILE_SOURCE ProfileSource; + KAFFINITY Affinity; +} EPROFILE, *PEPROFILE; + +// // Handle Table Structures // typedef struct _HANDLE_TABLE_ENTRY_INFO _____ Modified: trunk/reactos/ntoskrnl/ex/profile.c --- trunk/reactos/ntoskrnl/ex/profile.c 2005-12-29 15:14:50 UTC (rev 20425) +++ trunk/reactos/ntoskrnl/ex/profile.c 2005-12-29 17:55:31 UTC (rev 20426) @@ -1,65 +1,55 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ex/profile.c * PURPOSE: Support for Executive Profile Objects - * - * PROGRAMMERS: Alex Ionescu + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * Thomas Weidenmueller */ /* INCLUDES *****************************************************************/ +#include <ntoskrnl.h> #define NDEBUG -#include <ntoskrnl.h> #include <internal/debug.h> #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, ExpInitializeProfileImplementation) #endif -/* FIXME: NDK 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; +#define TAG_PROFILE TAG('P', 'r', 'o', 'f') /* GLOBALS *******************************************************************/ POBJECT_TYPE ExProfileObjectType = NULL; +KMUTEX ExpProfileMutex; -static KMUTEX ExpProfileMutex; - -#define PROFILE_CONTROL 1 - -static GENERIC_MAPPING ExpProfileMapping = { +GENERIC_MAPPING ExpProfileMapping = +{ STANDARD_RIGHTS_READ | PROFILE_CONTROL, STANDARD_RIGHTS_WRITE | PROFILE_CONTROL, STANDARD_RIGHTS_EXECUTE | PROFILE_CONTROL, - STANDARD_RIGHTS_ALL}; + PROFILE_ALL_ACCESS +}; +/* FUNCTIONS *****************************************************************/ + VOID -STDCALL +NTAPI ExpDeleteProfile(PVOID ObjectBody) { PEPROFILE Profile; + ULONG State; /* Typecast the Object */ Profile = (PEPROFILE)ObjectBody; /* Check if there if the Profile was started */ - if (Profile->LockedBuffer) { - + if (Profile->LockedBuffer) + { /* Stop the Profile */ - KeStopProfile(Profile->KeProfile); + State = KeStopProfile(Profile->KeProfile); + ASSERT(State != FALSE); /* Unmap the Locked Buffer */ MmUnmapLockedPages(Profile->LockedBuffer, Profile->Mdl); @@ -67,28 +57,22 @@ ExFreePool(Profile->Mdl); } - /* Check if a Process is associated */ - if (Profile->Process != NULL) { - - /* Dereference it */ - ObDereferenceObject(Profile->Process); - Profile->Process = NULL; - } + /* Check if a Process is associated and reference it */ + if (Profile->Process) ObDereferenceObject(Profile->Process); } VOID INIT_FUNCTION -STDCALL +NTAPI ExpInitializeProfileImplementation(VOID) { OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - + DPRINT("Creating Profile Object Type\n"); + /* Initialize the Mutex to lock the States */ - KeInitializeMutex(&ExpProfileMutex, 0x40); + KeInitializeMutex(&ExpProfileMutex, 64); - DPRINT("Creating Profile Object Type\n"); - /* Create the Event Pair Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Profile"); @@ -97,12 +81,12 @@ ObjectTypeInitializer.GenericMapping = ExpProfileMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile; - ObjectTypeInitializer.ValidAccessMask = STANDARD_RIGHTS_ALL; + ObjectTypeInitializer.ValidAccessMask = PROFILE_ALL_ACCESS; ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExProfileObjectType); } NTSTATUS -STDCALL +NTAPI NtCreateProfile(OUT PHANDLE ProfileHandle, IN HANDLE Process OPTIONAL, IN PVOID ImageBase, @@ -119,33 +103,79 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status = STATUS_SUCCESS; - + ULONG Segment = 0, Log2 = 0; PAGED_CODE(); /* Easy way out */ - if(BufferSize == 0) return STATUS_INVALID_PARAMETER_7; + if(!BufferSize) return STATUS_INVALID_PARAMETER_7; - /* Check the Parameters for validity */ - if(PreviousMode != KernelMode) { + /* Check if this is a low-memory profile */ + if ((!BucketSize) && (ImageBase < (PVOID)(0x10000))) + { + /* Validate size */ + if (BufferSize < sizeof(ULONG)) return STATUS_INVALID_PARAMETER_7; - _SEH_TRY { + /* This will become a segmented profile object */ + Segment = (ULONG)ImageBase; + ImageBase = 0; + /* Recalculate the bucket size */ + BucketSize = ImageSize / (BufferSize / sizeof(ULONG)); + + /* Convert it to log2 */ + BucketSize--; + while (BucketSize >>= 1) Log2++; + BucketSize += Log2 + 1; + } + + /* Validate bucket size */ + if ((BucketSize > 31) || (BucketSize < 2)) + { + DPRINT1("Bucket size invalid\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Make sure that the buckets can map the range */ + if ((ImageSize >> (BucketSize - 2)) > BufferSize) + { + DPRINT1("Bucket size too small\n"); + return STATUS_BUFFER_TOO_SMALL; + } + + /* Make sure that the range isn't too gigantic */ + if (((ULONG_PTR)ImageBase + ImageSize) < ImageSize) + { + DPRINT1("Range too big\n"); + return STATUS_BUFFER_OVERFLOW; + } + + /* Check if we were called from user-mode */ + if(PreviousMode != KernelMode) + { + /* Entry SEH */ + _SEH_TRY + { + /* Make sure that the handle pointer is valid */ ProbeForWriteHandle(ProfileHandle); + /* Check if the buffer is valid */ ProbeForWrite(Buffer, BufferSize, sizeof(ULONG)); - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; + /* Bail out if we failed */ if(!NT_SUCCESS(Status)) return Status; } /* Check if a process was specified */ - if (Process) { - + if (Process) + { /* Reference it */ Status = ObReferenceObjectByHandle(Process, PROCESS_QUERY_INFORMATION, @@ -154,15 +184,18 @@ (PVOID*)&pProcess, NULL); if (!NT_SUCCESS(Status)) return(Status); + } + else + { + /* Segmented profile objects cannot be used system-wide */ + if (Segment) return STATUS_INVALID_PARAMETER; - } 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)) { - + if(!SeSinglePrivilegeCheck(SeSystemProfilePrivilege, PreviousMode)) + { DPRINT1("NtCreateProfile: Caller requires the SeSystemProfilePrivilege privilege!\n"); return STATUS_PRIVILEGE_NOT_HELD; } @@ -181,7 +214,7 @@ NULL, sizeof(EPROFILE), 0, - 0, + sizeof(EPROFILE) + sizeof(KPROFILE), (PVOID*)&Profile); if (!NT_SUCCESS(Status)) return(Status); @@ -192,6 +225,8 @@ Profile->BufferSize = BufferSize; Profile->BucketSize = BucketSize; Profile->LockedBuffer = NULL; + Profile->Segment = Segment; + Profile->ProfileSource = ProfileSource; Profile->Affinity = Affinity; Profile->Process = pProcess; @@ -205,29 +240,31 @@ ObDereferenceObject(Profile); /* Check for Success */ - if (!NT_SUCCESS(Status)) { - + if (!NT_SUCCESS(Status)) + { /* Dereference Process on failure */ if (pProcess) ObDereferenceObject(pProcess); return Status; } - /* Copy the created handle back to the caller*/ - _SEH_TRY { - + /* Enter SEH */ + _SEH_TRY + { + /* Copy the created handle back to the caller*/ *ProfileHandle = hProfile; - - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; /* Return Status */ return Status; } NTSTATUS -STDCALL +NTAPI NtQueryPerformanceCounter(OUT PLARGE_INTEGER PerformanceCounter, OUT PLARGE_INTEGER PerformanceFrequency OPTIONAL) { @@ -235,43 +272,50 @@ LARGE_INTEGER PerfFrequency; NTSTATUS Status = STATUS_SUCCESS; - /* Check the Parameters for validity */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - + /* Check if we were called from user-mode */ + if(PreviousMode != KernelMode) + { + /* Entry SEH Block */ + _SEH_TRY + { + /* Make sure the counter and frequency are valid */ ProbeForWriteLargeInteger(PerformanceCounter); - - ProbeForWriteLargeInteger(PerformanceFrequency); - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + if (PerformanceFrequency) + { + ProbeForWriteLargeInteger(PerformanceFrequency); + } + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; + /* If the pointers are invalid, bail out */ if(!NT_SUCCESS(Status)) return Status; } - _SEH_TRY { - + /* Enter a new SEH Block */ + _SEH_TRY + { /* Query the Kernel */ *PerformanceCounter = KeQueryPerformanceCounter(&PerfFrequency); /* Return Frequency if requested */ - if(PerformanceFrequency) { - - *PerformanceFrequency = PerfFrequency; - } - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + if(PerformanceFrequency) *PerformanceFrequency = PerfFrequency; + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); + } + _SEH_END; - } _SEH_END; - + /* Return status to caller */ return Status; } NTSTATUS -STDCALL +NTAPI NtStartProfile(IN HANDLE ProfileHandle) { PEPROFILE Profile; @@ -279,7 +323,6 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PVOID TempLockedBuffer; NTSTATUS Status; - PAGED_CODE(); /* Get the Object */ @@ -299,8 +342,8 @@ NULL); /* The Profile can still be enabled though, so handle that */ - if (Profile->LockedBuffer) { - + if (Profile->LockedBuffer) + { /* Release our lock, dereference and return */ KeReleaseMutex(&ExpProfileMutex, FALSE); ObDereferenceObject(Profile); @@ -310,7 +353,7 @@ /* Allocate a Kernel Profile Object. */ KeProfile = ExAllocatePoolWithTag(NonPagedPool, sizeof(EPROFILE), - TAG('P', 'r', 'o', 'f')); + TAG_PROFILE); /* Allocate the Mdl Structure */ Profile->Mdl = MmCreateMdl(NULL, Profile->Buffer, Profile->BufferSize); @@ -344,13 +387,12 @@ } NTSTATUS -STDCALL +NTAPI NtStopProfile(IN HANDLE ProfileHandle) { PEPROFILE Profile; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; - PAGED_CODE(); /* Get the Object */ @@ -370,8 +412,8 @@ NULL); /* Make sure the Profile Object is really Started */ - if (!Profile->LockedBuffer) { - + if (!Profile->LockedBuffer) + { Status = STATUS_PROFILING_NOT_STARTED; goto Exit; } @@ -395,51 +437,55 @@ } NTSTATUS -STDCALL -NtQueryIntervalProfile(IN KPROFILE_SOURCE ProfileSource, +NTAPI +NtQueryIntervalProfile(IN KPROFILE_SOURCE ProfileSource, OUT PULONG Interval) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); ULONG ReturnInterval; NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - /* Check the Parameters for validity */ - if(PreviousMode != KernelMode) { - - _SEH_TRY { - + /* Check if we were called from user-mode */ + if(PreviousMode != KernelMode) + { + /* Enter SEH Block */ + _SEH_TRY + { + /* Validate interval */ ProbeForWriteUlong(Interval); - - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; + /* If pointer was invalid, bail out */ if(!NT_SUCCESS(Status)) return Status; } /* Query the Interval */ ReturnInterval = KeQueryIntervalProfile(ProfileSource); - /* Return the data */ - _SEH_TRY { - + /* Enter SEH block for return */ + _SEH_TRY + { + /* Return the data */ *Interval = ReturnInterval; - - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { Status = _SEH_GetExceptionCode(); + } + _SEH_END; - } _SEH_END; - /* Return Success */ return STATUS_SUCCESS; } NTSTATUS -STDCALL +NTAPI NtSetIntervalProfile(IN ULONG Interval, IN KPROFILE_SOURCE Source) { _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-12-29 15:14:50 UTC (rev 20425) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-12-29 17:55:31 UTC (rev 20426) @@ -188,7 +188,7 @@ PVOID Buffer ); -VOID +BOOLEAN STDCALL KeStopProfile(struct _KPROFILE* Profile);

1 0

[greatlrd] 20425: revert my last change to RtlClearAllBits for win32k do handle all case with NULL to it now.
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

revert my last change to RtlClearAllBits for win32k do handle all case with NULL to it now. Modified: trunk/reactos/lib/rtl/bitmap.c _____ Modified: trunk/reactos/lib/rtl/bitmap.c --- trunk/reactos/lib/rtl/bitmap.c 2005-12-29 14:15:36 UTC (rev 20424) +++ trunk/reactos/lib/rtl/bitmap.c 2005-12-29 15:14:50 UTC (rev 20425) @@ -125,15 +125,10 @@ VOID NTAPI RtlClearAllBits(IN OUT PRTL_BITMAP BitMapHeader) { - if (BitMapHeader != NULL) - { - if (BitMapHeader->Buffer != NULL) - { - memset(BitMapHeader->Buffer, - 0x00, - ROUND_UP(BitMapHeader->SizeOfBitMap, 8) / 8); - } - } + memset(BitMapHeader->Buffer, + 0x00, + ROUND_UP(BitMapHeader->SizeOfBitMap, 8) / 8); + }

1 0

[greatlrd] 20422: InitTimerImpl did not check for NULL pointer when it alloc memory.
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

InitTimerImpl did not check for NULL pointer when it alloc memory. Modified: trunk/reactos/subsys/win32k/ntuser/timer.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/timer.c --- trunk/reactos/subsys/win32k/ntuser/timer.c 2005-12-29 13:43:25 UTC (rev 20421) +++ trunk/reactos/subsys/win32k/ntuser/timer.c 2005-12-29 13:53:35 UTC (rev 20422) @@ -181,8 +181,13 @@ ExInitializeFastMutex(&Mutex); - BitmapBytes = ROUND_UP(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8; + BitmapBytes = ROUND_UP(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8; WindowLessTimersBitMapBuffer = ExAllocatePoolWithTag(PagedPool, BitmapBytes, TAG_TIMERBMP); + if (WindowLessTimersBitMapBuffer == NULL) + { + return STATUS_UNSUCCESSFUL; + } + RtlInitializeBitMap(&WindowLessTimersBitMap, WindowLessTimersBitMapBuffer, BitmapBytes * 8);

1 0

[greatlrd] 20424: PALETTE_SetMapping do not write the palette color to NULL pointer.
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

PALETTE_SetMapping do not write the palette color to NULL pointer. Modified: trunk/reactos/subsys/win32k/objects/palette.c _____ Modified: trunk/reactos/subsys/win32k/objects/palette.c --- trunk/reactos/subsys/win32k/objects/palette.c 2005-12-29 14:00:12 UTC (rev 20423) +++ trunk/reactos/subsys/win32k/objects/palette.c 2005-12-29 14:15:36 UTC (rev 20424) @@ -329,7 +329,10 @@ } if( !prevMapping || palPtr->mapping[uStart] != index ) iRemapped++; - palPtr->mapping[uStart] = index; + if (palPtr->mapping != NULL) + { + palPtr->mapping[uStart] = index; + } } return iRemapped;

1 0

[greatlrd] 20423: NtGdiCreatePalette did not check for NULL pointer when it alloc memory.
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

NtGdiCreatePalette did not check for NULL pointer when it alloc memory. Modified: trunk/reactos/subsys/win32k/objects/color.c _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-12-29 13:53:35 UTC (rev 20422) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-12-29 14:00:12 UTC (rev 20423) @@ -173,6 +173,9 @@ palette->palNumEntries, (PULONG)palette->palPalEntry, 0, 0, 0); + + if (NewPalette == NULL) + return NULL; PalGDI = (PPALGDI) PALETTE_LockPalette(NewPalette); /* FIXME - Handle PalGDI == NULL!!!! */

1 0

[greatlrd] 20421: some case from win32k can call to RtlClearAllBits with NULL pointer. and check for null pointer after RtlClearAllBits. This take care of those case for moment.
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

some case from win32k can call to RtlClearAllBits with NULL pointer. and check for null pointer after RtlClearAllBits. This take care of those case for moment. Modified: trunk/reactos/lib/rtl/bitmap.c _____ Modified: trunk/reactos/lib/rtl/bitmap.c --- trunk/reactos/lib/rtl/bitmap.c 2005-12-29 13:13:14 UTC (rev 20420) +++ trunk/reactos/lib/rtl/bitmap.c 2005-12-29 13:43:25 UTC (rev 20421) @@ -125,9 +125,15 @@ VOID NTAPI RtlClearAllBits(IN OUT PRTL_BITMAP BitMapHeader) { - memset(BitMapHeader->Buffer, - 0x00, - ROUND_UP(BitMapHeader->SizeOfBitMap, 8) / 8); + if (BitMapHeader != NULL) + { + if (BitMapHeader->Buffer != NULL) + { + memset(BitMapHeader->Buffer, + 0x00, + ROUND_UP(BitMapHeader->SizeOfBitMap, 8) / 8); + } + } }

1 0

[greatlrd] 20420: Fix memory leak in NtUserMonitorFromRect when it return in one case.
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

Fix memory leak in NtUserMonitorFromRect when it return in one case. Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c --- trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-12-29 12:40:31 UTC (rev 20419) +++ trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-12-29 13:13:14 UTC (rev 20420) @@ -778,7 +778,7 @@ HMONITOR hMonitor = NULL; RECT rect; NTSTATUS status; - + /* get rect */ status = MmCopyFromCaller(&rect, pRect, sizeof (RECT)); if (!NT_SUCCESS(status)) @@ -838,6 +838,8 @@ numMonitors, 0); if (numMonitors <= 0) { + ExFreePool(hMonitorList); + ExFreePool(rectList); return (HMONITOR)NULL; }

1 0

[greatlrd] 20419: IntRegisterClass did not check for NULL pointer when it alloc memory.
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

IntRegisterClass did not check for NULL pointer when it alloc memory. Modified: trunk/reactos/subsys/win32k/ntuser/class.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-12-29 12:13:02 UTC (rev 20418) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-12-29 12:40:31 UTC (rev 20419) @@ -208,6 +208,27 @@ Class->hIconSm = lpwcx->hIconSm; Class->Atom = Atom; + if (MenuName->Length == 0) + { + Class->lpszMenuName.Length = + Class->lpszMenuName.MaximumLength = 0; + Class->lpszMenuName.Buffer = MenuName->Buffer; + } + else + { + Class->lpszMenuName.Length = + Class->lpszMenuName.MaximumLength = MenuName->MaximumLength; + Class->lpszMenuName.Buffer = ExAllocatePoolWithTag(PagedPool, Class->lpszMenuName.MaximumLength, TAG_STRING); + + if (Class->lpszMenuName.Buffer == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return(FALSE); + } + + RtlCopyUnicodeString(&Class->lpszMenuName, MenuName); + } + if (wpExtra == NULL) { if (Flags & REGISTERCLASS_ANSI) @@ -235,19 +256,7 @@ } } - if (MenuName->Length == 0) - { - Class->lpszMenuName.Length = - Class->lpszMenuName.MaximumLength = 0; - Class->lpszMenuName.Buffer = MenuName->Buffer; - } - else - { - Class->lpszMenuName.Length = - Class->lpszMenuName.MaximumLength = MenuName->MaximumLength; - Class->lpszMenuName.Buffer = ExAllocatePoolWithTag(PagedPool, Class->lpszMenuName.MaximumLength, TAG_STRING); - RtlCopyUnicodeString(&Class->lpszMenuName, MenuName); - } + /* Extra class data */ if (Class->cbClsExtra)

1 0

[greatlrd] 20418: DRIVER_RegisterDriver did not check for NULL pointer when it alloc memory.
by greatlrd＠svn.reactos.org 29 Dec '05

29 Dec '05

DRIVER_RegisterDriver did not check for NULL pointer when it alloc memory. Modified: trunk/reactos/subsys/win32k/misc/driver.c _____ Modified: trunk/reactos/subsys/win32k/misc/driver.c --- trunk/reactos/subsys/win32k/misc/driver.c 2005-12-29 11:20:30 UTC (rev 20417) +++ trunk/reactos/subsys/win32k/misc/driver.c 2005-12-29 12:13:02 UTC (rev 20418) @@ -54,6 +54,13 @@ Driver->Name = ExAllocatePoolWithTag(PagedPool, (wcslen(Name) + 1) * sizeof(WCHAR), TAG_DRIVER); + if (Driver->Name == NULL) + { + DPRINT1("Out of memory\n"); + ExFreePool(Driver); + return FALSE; + } + wcscpy(Driver->Name, Name); Driver->Next = DriverList; DriverList = Driver;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs