Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[ion] 22723: [AUDIT] - iocomp.c, event.c, iowork.c, mdl.c, timer.c, symlink.c are all simple wrappers around either executive, kernel or object manager code, and they are trivial implementations usually less then 10 lines and heavily documented in public sources.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 22:16:27 2006 New Revision: 22723 URL: http://svn.reactos.org/svn/reactos?rev=22723&view=rev Log: [AUDIT] - iocomp.c, event.c, iowork.c, mdl.c, timer.c, symlink.c are all simple wrappers around either executive, kernel or object manager code, and they are trivial implementations usually less then 10 lines and heavily documented in public sources. Modified: trunk/reactos/ntoskrnl/io/iocomp.c (props changed) Propchange: trunk/reactos/ntoskrnl/io/iocomp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22722: - Io*SymbolicLink should use OBJ_CASE_INSENSITIVE - Use DELETE instead of SYMBOLIC_LINK_ALL_ACCESS when deleting. - Fix formatting in timer.c - Clear the IO_TIMER structure when creating it.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 22:14:54 2006 New Revision: 22722 URL: http://svn.reactos.org/svn/reactos?rev=22722&view=rev Log: - Io*SymbolicLink should use OBJ_CASE_INSENSITIVE - Use DELETE instead of SYMBOLIC_LINK_ALL_ACCESS when deleting. - Fix formatting in timer.c - Clear the IO_TIMER structure when creating it. Modified: trunk/reactos/ntoskrnl/io/iocomp.c trunk/reactos/ntoskrnl/io/symlink.c (contents, props changed) trunk/reactos/ntoskrnl/io/timer.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/io/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iocomp.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iocomp.c Fri Jun 30 22:14:54 2006 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/event.c - * PURPOSE: I/O Wrappers for the Executive Event Functions + * FILE: ntoskrnl/io/iocomp.c + * PURPOSE: I/O Wrappers (called Completion Ports) for Kernel Queues * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller (w3seek(a)reactos.org) */ Modified: trunk/reactos/ntoskrnl/io/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/symlink.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/io/symlink.c (original) +++ trunk/reactos/ntoskrnl/io/symlink.c Fri Jun 30 22:14:54 2006 @@ -1,11 +1,10 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/io/symlink.c - * PURPOSE: Implements symbolic links - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers for Symbolic Links + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -14,170 +13,106 @@ #define NDEBUG #include <internal/debug.h> - /* FUNCTIONS ****************************************************************/ -/********************************************************************** - * NAME EXPORTED - * IoCreateSymbolicLink - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * +/* * @implemented */ -NTSTATUS STDCALL -IoCreateSymbolicLink(PUNICODE_STRING SymbolicLinkName, - PUNICODE_STRING DeviceName) +NTSTATUS +NTAPI +IoCreateSymbolicLink(IN PUNICODE_STRING SymbolicLinkName, + IN PUNICODE_STRING DeviceName) { - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE Handle; - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + NTSTATUS Status; + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); + /* Initialize the object attributes and create the link */ + InitializeObjectAttributes(&ObjectAttributes, + SymbolicLinkName, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + NULL, + SePublicDefaultSd); + Status = ZwCreateSymbolicLinkObject(&Handle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + DeviceName); + if (NT_SUCCESS(Status)) ZwClose(Handle); - DPRINT("IoCreateSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n", - SymbolicLinkName, - DeviceName); - - InitializeObjectAttributes(&ObjectAttributes, - SymbolicLinkName, - OBJ_PERMANENT, - NULL, - SePublicDefaultSd); - - Status = ZwCreateSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - DeviceName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwCreateSymbolicLinkObject() failed (Status %lx)\n", Status); - return(Status); - } - - ZwClose(Handle); - - return(STATUS_SUCCESS); + /* Return status */ + return Status; } - -/********************************************************************** - * NAME EXPORTED - * IoCreateUnprotectedSymbolicLink - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * +/* * @implemented */ -NTSTATUS STDCALL -IoCreateUnprotectedSymbolicLink(PUNICODE_STRING SymbolicLinkName, - PUNICODE_STRING DeviceName) +NTSTATUS +NTAPI +IoCreateUnprotectedSymbolicLink(IN PUNICODE_STRING SymbolicLinkName, + IN PUNICODE_STRING DeviceName) { - SECURITY_DESCRIPTOR SecurityDescriptor; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE Handle; - NTSTATUS Status; + SECURITY_DESCRIPTOR SecurityDescriptor; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + NTSTATUS Status; + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); + /* Create an SD */ + Status = RtlCreateSecurityDescriptor(&SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) return Status; - DPRINT("IoCreateUnprotectedSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n", - SymbolicLinkName, - DeviceName); + /* Set the DACL */ + Status = RtlSetDaclSecurityDescriptor(&SecurityDescriptor, + TRUE, + NULL, + TRUE); + if (!NT_SUCCESS(Status)) return Status; - Status = RtlCreateSecurityDescriptor(&SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlCreateSecurityDescriptor() failed (Status %lx)\n", Status); - return(Status); - } + /* Initialize the object attributes and create the link */ + InitializeObjectAttributes(&ObjectAttributes, + SymbolicLinkName, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + NULL, + &SecurityDescriptor); + Status = ZwCreateSymbolicLinkObject(&Handle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + DeviceName); + if (NT_SUCCESS(Status)) ZwClose(Handle); - Status = RtlSetDaclSecurityDescriptor(&SecurityDescriptor, - TRUE, - NULL, - TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlSetDaclSecurityDescriptor() failed (Status %lx)\n", Status); - return(Status); - } - - InitializeObjectAttributes(&ObjectAttributes, - SymbolicLinkName, - OBJ_PERMANENT, - NULL, - &SecurityDescriptor); - - Status = ZwCreateSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - DeviceName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwCreateSymbolicLinkObject() failed (Status %lx)\n", Status); - return(Status); - } - - ZwClose(Handle); - - return(STATUS_SUCCESS); + /* Return status */ + return Status; } - -/********************************************************************** - * NAME EXPORTED - * IoDeleteSymbolicLink - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * +/* * @implemented */ -NTSTATUS STDCALL -IoDeleteSymbolicLink(PUNICODE_STRING SymbolicLinkName) +NTSTATUS +NTAPI +IoDeleteSymbolicLink(IN PUNICODE_STRING SymbolicLinkName) { - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE Handle; - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + NTSTATUS Status; + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); + /* Initialize the object attributes and open the link */ + InitializeObjectAttributes(&ObjectAttributes, + SymbolicLinkName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenSymbolicLinkObject(&Handle, DELETE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) return Status; - DPRINT("IoDeleteSymbolicLink (SymbolicLinkName %S)\n", - SymbolicLinkName->Buffer); + /* Make the link temporary and close its handle */ + Status = ZwMakeTemporaryObject(Handle); + if (NT_SUCCESS(Status)) ZwClose(Handle); - InitializeObjectAttributes(&ObjectAttributes, - SymbolicLinkName, - OBJ_OPENLINK, - NULL, - NULL); - - Status = ZwOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return(Status); - - Status = ZwMakeTemporaryObject(Handle); - ZwClose(Handle); - - return(Status); + /* Return status */ + return Status; } /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/symlink.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/timer.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/timer.c (original) +++ trunk/reactos/ntoskrnl/io/timer.c Fri Jun 30 22:14:54 2006 @@ -1,12 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/timer.c - * PURPOSE: IO timers - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - * Alex Ionescu (alex(a)relsoft.net) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/iocomp.c + * PURPOSE: I/O Wrappers for Executive Timers + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -28,196 +25,181 @@ /* Keep count of how many timers we have */ ULONG IopTimerCount = 0; -/* FUNCTIONS *****************************************************************/ - -static VOID STDCALL +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI IopTimerDispatch(IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - KIRQL OldIrql; - PLIST_ENTRY TimerEntry; - PIO_TIMER Timer; - ULONG i; - - DPRINT("Dispatching IO Timers. There are: %x \n", IopTimerCount); - - /* Check if any Timers are actualyl enabled as of now */ - if (IopTimerCount) { - - /* Lock the Timers */ - KeAcquireSpinLock(&IopTimerLock, &OldIrql); - - /* Call the Timer Routine of each enabled Timer */ - for(TimerEntry = IopTimerQueueHead.Flink, i = IopTimerCount; - (TimerEntry != &IopTimerQueueHead) && i; - TimerEntry = TimerEntry->Flink) { - - Timer = CONTAINING_RECORD(TimerEntry, IO_TIMER, IoTimerList); - if (Timer->TimerEnabled) { - DPRINT("Dispatching a Timer Routine: 0x%p for Device Object: 0x%p \n", - Timer->TimerRoutine, - Timer->DeviceObject); - Timer->TimerRoutine(Timer->DeviceObject, Timer->Context); - i--; - } - } - - /* Unlock the Timers */ - KeReleaseSpinLock(&IopTimerLock, OldIrql); - } -} - -VOID -STDCALL -IopRemoveTimerFromTimerList( - IN PIO_TIMER Timer -) -{ - KIRQL OldIrql; - - /* Lock Timers */ - KeAcquireSpinLock(&IopTimerLock, &OldIrql); - - /* Remove Timer from the List and Drop the Timer Count if Enabled */ - RemoveEntryList(&Timer->IoTimerList); - if (Timer->TimerEnabled) IopTimerCount--; - - /* Unlock the Timers */ - KeReleaseSpinLock(&IopTimerLock, OldIrql); + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + KIRQL OldIrql; + PLIST_ENTRY TimerEntry; + PIO_TIMER Timer; + ULONG i; + + /* Check if any Timers are actualyl enabled as of now */ + if (IopTimerCount) + { + /* Lock the Timers */ + KeAcquireSpinLock(&IopTimerLock, &OldIrql); + + /* Call the Timer Routine of each enabled Timer */ + for (TimerEntry = IopTimerQueueHead.Flink, i = IopTimerCount; + (TimerEntry != &IopTimerQueueHead) && i; + TimerEntry = TimerEntry->Flink) + { + /* Get the timer and check if it's enabled */ + Timer = CONTAINING_RECORD(TimerEntry, IO_TIMER, IoTimerList); + if (Timer->TimerEnabled) + { + /* Call the timer routine */ + Timer->TimerRoutine(Timer->DeviceObject, Timer->Context); + i--; + } + } + + /* Unlock the Timers */ + KeReleaseSpinLock(&IopTimerLock, OldIrql); + } +} + +VOID +NTAPI +IopRemoveTimerFromTimerList(IN PIO_TIMER Timer) +{ + KIRQL OldIrql; + + /* Lock Timers */ + KeAcquireSpinLock(&IopTimerLock, &OldIrql); + + /* Remove Timer from the List and Drop the Timer Count if Enabled */ + RemoveEntryList(&Timer->IoTimerList); + if (Timer->TimerEnabled) IopTimerCount--; + + /* Unlock the Timers */ + KeReleaseSpinLock(&IopTimerLock, OldIrql); } VOID FASTCALL IopInitTimerImplementation(VOID) -/* FUNCTION: Initializes the IO Timer Object Implementation - * RETURNS: NOTHING - */ -{ - LARGE_INTEGER ExpireTime; - - /* Initialize Timer List Lock */ - KeInitializeSpinLock(&IopTimerLock); - - /* Initialize Timer List */ - InitializeListHead(&IopTimerQueueHead); - - /* Initialize the DPC/Timer which will call the other Timer Routines */ - ExpireTime.QuadPart = -10000000; - KeInitializeDpc(&IopTimerDpc, IopTimerDispatch, NULL); - KeInitializeTimerEx(&IopTimer, SynchronizationTimer); - KeSetTimerEx(&IopTimer, ExpireTime, 1000, &IopTimerDpc); -} +{ + LARGE_INTEGER ExpireTime; + + /* Initialize Timer List Lock */ + KeInitializeSpinLock(&IopTimerLock); + + /* Initialize Timer List */ + InitializeListHead(&IopTimerQueueHead); + + /* Initialize the DPC/Timer which will call the other Timer Routines */ + ExpireTime.QuadPart = -10000000; + KeInitializeDpc(&IopTimerDpc, IopTimerDispatch, NULL); + KeInitializeTimerEx(&IopTimer, SynchronizationTimer); + KeSetTimerEx(&IopTimer, ExpireTime, 1000, &IopTimerDpc); +} + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented */ NTSTATUS -STDCALL -IoInitializeTimer(PDEVICE_OBJECT DeviceObject, - PIO_TIMER_ROUTINE TimerRoutine, - PVOID Context) -/* - * FUNCTION: Sets up a driver-supplied IoTimer routine associated with a given - * device object - * ARGUMENTS: - * DeviceObject = Device object whose timer is be initialized - * TimerRoutine = Driver supplied routine which will be called once per - * second if the timer is active - * Context = Driver supplied context to be passed to the TimerRoutine - * RETURNS: Status - */ -{ - DPRINT("IoInitializeTimer() called for Device Object: 0x%p with Routine: 0x%p \n", DeviceObject, TimerRoutine); - - /* Allocate Timer */ - if (!DeviceObject->Timer) { - DeviceObject->Timer = ExAllocatePoolWithTag(NonPagedPool, - sizeof(IO_TIMER), - TAG_IO_TIMER); - if (!DeviceObject->Timer) return STATUS_INSUFFICIENT_RESOURCES; - - /* Set up the Timer Structure */ - DeviceObject->Timer->Type = IO_TYPE_TIMER; - DeviceObject->Timer->DeviceObject = DeviceObject; - } - - DeviceObject->Timer->TimerRoutine = TimerRoutine; - DeviceObject->Timer->Context = Context; - DeviceObject->Timer->TimerEnabled = FALSE; - - /* Add it to the Timer List */ - ExInterlockedInsertTailList(&IopTimerQueueHead, - &DeviceObject->Timer->IoTimerList, - &IopTimerLock); - - /* Return Success */ - DPRINT("IoInitializeTimer() Completed\n"); - return(STATUS_SUCCESS); +NTAPI +IoInitializeTimer(IN PDEVICE_OBJECT DeviceObject, + IN PIO_TIMER_ROUTINE TimerRoutine, + IN PVOID Context) +{ + PIO_TIMER IoTimer = DeviceObject->Timer; + PAGED_CODE(); + + /* Check if we don't have a timer yet */ + if (!IoTimer) + { + /* Allocate Timer */ + IoTimer = ExAllocatePoolWithTag(NonPagedPool, + sizeof(IO_TIMER), + TAG_IO_TIMER); + if (!IoTimer) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set up the Timer Structure */ + RtlZeroMemory(IoTimer, sizeof(IO_TIMER)); + IoTimer->Type = IO_TYPE_TIMER; + IoTimer->DeviceObject = DeviceObject; + DeviceObject->Timer = IoTimer; + } + + /* Setup the timer routine and context */ + IoTimer->TimerRoutine = TimerRoutine; + IoTimer->Context = Context; + + /* Add it to the Timer List */ + ExInterlockedInsertTailList(&IopTimerQueueHead, + &IoTimer->IoTimerList, + &IopTimerLock); + + /* Return Success */ + return STATUS_SUCCESS; } /* * @implemented */ VOID -STDCALL -IoStartTimer(PDEVICE_OBJECT DeviceObject) -/* - * FUNCTION: Starts a timer so the driver-supplied IoTimer routine will be - * called once per second - * ARGUMENTS: - * DeviceObject = Device whose timer is to be started - */ -{ - KIRQL OldIrql; - - DPRINT("IoStartTimer for Device Object: 0x%p\n", DeviceObject); - - /* Lock Timers */ - KeAcquireSpinLock(&IopTimerLock, &OldIrql); - - /* If the timer isn't already enabled, enable it and increase IO Timer Count*/ - if (!DeviceObject->Timer->TimerEnabled) { - DeviceObject->Timer->TimerEnabled = TRUE; - IopTimerCount++; - } - - /* Unlock Timers */ - KeReleaseSpinLock(&IopTimerLock, OldIrql); - DPRINT("IoStartTimer Completed for Device Object: 0x%p New Count: %x \n", DeviceObject, IopTimerCount); +NTAPI +IoStartTimer(IN PDEVICE_OBJECT DeviceObject) +{ + KIRQL OldIrql; + PIO_TIMER IoTimer = DeviceObject->Timer; + + /* Make sure the device isn't unloading */ + if (!(((PEXTENDED_DEVOBJ_EXTENSION)(DeviceObject->DeviceObjectExtension))-> + ExtensionFlags & (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED))) + { + /* Lock Timers */ + KeAcquireSpinLock(&IopTimerLock, &OldIrql); + + /* Check if the timer isn't already enabled */ + if (!IoTimer->TimerEnabled) + { + /* Enable it and increase the timer count */ + IoTimer->TimerEnabled = TRUE; + IopTimerCount++; + } + + /* Unlock Timers */ + KeReleaseSpinLock(&IopTimerLock, OldIrql); + } } /* * @implemented */ VOID -STDCALL +NTAPI IoStopTimer(PDEVICE_OBJECT DeviceObject) -/* - * FUNCTION: Disables for a specified device object so the driver-supplied - * IoTimer is not called - * ARGUMENTS: - * DeviceObject = Device whose timer is to be stopped - */ -{ - KIRQL OldIrql; - - DPRINT("IoStopTimer for Device Object: 0x%p\n", DeviceObject); - - /* Lock Timers */ - KeAcquireSpinLock(&IopTimerLock, &OldIrql); - - /* If the timer is enabled, disable it and decrease IO Timer Count*/ - if (DeviceObject->Timer->TimerEnabled) { - DeviceObject->Timer->TimerEnabled = FALSE; - IopTimerCount--; - } - - /* Unlock Timers */ - KeReleaseSpinLock(&IopTimerLock, OldIrql); - DPRINT("IoStopTimer Completed for Device Object: 0x%p New Count: %x \n", DeviceObject, IopTimerCount); -} - +{ + KIRQL OldIrql; + PIO_TIMER IoTimer = DeviceObject->Timer; + + /* Lock Timers */ + KeAcquireSpinLock(&IopTimerLock, &OldIrql); + + /* Check if the timer is enabled */ + if (IoTimer->TimerEnabled) + { + /* Disable it and decrease the timer count */ + IoTimer->TimerEnabled = FALSE; + IopTimerCount--; + } + + /* Unlock Timers */ + KeReleaseSpinLock(&IopTimerLock, OldIrql); +} /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/timer.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22721: - Fix formatting/function order - Use only one SEH block in NtRemoveIoCompletion - Get the completion status from the IRP, not from the Mini-Packet, if the completion came from an IRP and not a Mini-Packet.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 21:53:00 2006 New Revision: 22721 URL: http://svn.reactos.org/svn/reactos?rev=22721&view=rev Log: - Fix formatting/function order - Use only one SEH block in NtRemoveIoCompletion - Get the completion status from the IRP, not from the Mini-Packet, if the completion came from an IRP and not a Mini-Packet. Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iocomp.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iocomp.c Fri Jun 30 21:53:00 2006 @@ -1,10 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/iocomp.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/event.c + * PURPOSE: I/O Wrappers for the Executive Event Functions + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Thomas Weidenmueller (w3seek(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -17,7 +17,7 @@ NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; -static GENERIC_MAPPING IopCompletionMapping = +GENERIC_MAPPING IopCompletionMapping = { STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, @@ -25,50 +25,52 @@ IO_COMPLETION_ALL_ACCESS }; -static const INFORMATION_CLASS_INFO IoCompletionInfoClass[] = { - +static const INFORMATION_CLASS_INFO IoCompletionInfoClass[] = +{ /* IoCompletionBasicInformation */ - ICI_SQ_SAME( sizeof(IO_COMPLETION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), + ICI_SQ_SAME(sizeof(IO_COMPLETION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY), }; -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ VOID -STDCALL +NTAPI IopFreeIoCompletionPacket(PIO_COMPLETION_PACKET Packet) { PKPRCB Prcb = KeGetCurrentPrcb(); PNPAGED_LOOKASIDE_LIST List; - + /* Use the P List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[LookasideCompletionList].P; + List = (PNPAGED_LOOKASIDE_LIST)Prcb-> + PPLookasideList[LookasideCompletionList].P; List->L.TotalFrees++; - + /* Check if the Free was within the Depth or not */ if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) { /* Let the balancer know */ List->L.FreeMisses++; - + /* Use the L List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[LookasideCompletionList].L; + List = (PNPAGED_LOOKASIDE_LIST)Prcb-> + PPLookasideList[LookasideCompletionList].L; List->L.TotalFrees++; /* Check if the Free was within the Depth or not */ if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) - { + { /* All lists failed, use the pool */ List->L.FreeMisses++; ExFreePool(Packet); } } - + /* The free was within dhe Depth */ InterlockedPushEntrySList(&List->L.ListHead, (PSINGLE_LIST_ENTRY)Packet); } VOID -STDCALL +NTAPI IopDeleteIoCompletion(PVOID ObjectBody) { PKQUEUE Queue = ObjectBody; @@ -77,19 +79,18 @@ PIRP Irp; PIO_COMPLETION_PACKET Packet; - DPRINT("IopDeleteIoCompletion()\n"); - /* Rundown the Queue */ FirstEntry = KeRundownQueue(Queue); - - /* Clean up the IRPs */ - if (FirstEntry) { - + if (FirstEntry) + { + /* Loop the packets */ CurrentEntry = FirstEntry; - do { - + do + { /* Get the Packet */ - Packet = CONTAINING_RECORD(CurrentEntry, IO_COMPLETION_PACKET, ListEntry); + Packet = CONTAINING_RECORD(CurrentEntry, + IO_COMPLETION_PACKET, + ListEntry); /* Go to next Entry */ CurrentEntry = CurrentEntry->Flink; @@ -110,93 +111,6 @@ } } -/* - * @implemented - */ -NTSTATUS -STDCALL -IoSetIoCompletion(IN PVOID IoCompletion, - IN PVOID KeyContext, - IN PVOID ApcContext, - IN NTSTATUS IoStatus, - IN ULONG_PTR IoStatusInformation, - IN BOOLEAN Quota) -{ - PKQUEUE Queue = (PKQUEUE)IoCompletion; - PNPAGED_LOOKASIDE_LIST List; - PKPRCB Prcb = KeGetCurrentPrcb(); - PIO_COMPLETION_PACKET Packet; - - /* Get the P List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[LookasideCompletionList].P; - - /* Try to allocate the Packet */ - List->L.TotalAllocates++; - Packet = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); - - /* Check if that failed, use the L list if it did */ - if (!Packet) - { - /* Let the balancer know */ - List->L.AllocateMisses++; - - /* Get L List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[LookasideCompletionList].L; - - /* Try to allocate the Packet */ - List->L.TotalAllocates++; - Packet = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); - } - - /* Still failed, use pool */ - if (!Packet) - { - /* Let the balancer know */ - List->L.AllocateMisses++; - - /* Allocate from Nonpaged Pool */ - Packet = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Packet), IOC_TAG); - } - - /* Make sure we have one by now... */ - if (Packet) - { - /* Set up the Packet */ - Packet->PacketType = IrpMiniCompletionPacket; - Packet->Key = KeyContext; - Packet->Context = ApcContext; - Packet->IoStatus.Status = IoStatus; - Packet->IoStatus.Information = IoStatusInformation; - - /* Insert the Queue */ - KeInsertQueue(Queue, &Packet->ListEntry); - } - else - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Return Success */ - return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoSetCompletionRoutineEx(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_COMPLETION_ROUTINE CompletionRoutine, - IN PVOID Context, - IN BOOLEAN InvokeOnSuccess, - IN BOOLEAN InvokeOnError, - IN BOOLEAN InvokeOnCancel) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - VOID FASTCALL IopInitIoCompletionImplementation(VOID) @@ -204,8 +118,6 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT("Creating IoCompletion Object Type\n"); - /* Initialize the Driver object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"IoCompletion"); @@ -219,34 +131,129 @@ ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoCompletionType); } -NTSTATUS -STDCALL +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +IoSetIoCompletion(IN PVOID IoCompletion, + IN PVOID KeyContext, + IN PVOID ApcContext, + IN NTSTATUS IoStatus, + IN ULONG_PTR IoStatusInformation, + IN BOOLEAN Quota) +{ + PKQUEUE Queue = (PKQUEUE)IoCompletion; + PNPAGED_LOOKASIDE_LIST List; + PKPRCB Prcb = KeGetCurrentPrcb(); + PIO_COMPLETION_PACKET Packet; + + /* Get the P List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb-> + PPLookasideList[LookasideCompletionList].P; + + /* Try to allocate the Packet */ + List->L.TotalAllocates++; + Packet = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); + + /* Check if that failed, use the L list if it did */ + if (!Packet) + { + /* Let the balancer know */ + List->L.AllocateMisses++; + + /* Get L List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb-> + PPLookasideList[LookasideCompletionList].L; + + /* Try to allocate the Packet */ + List->L.TotalAllocates++; + Packet = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); + } + + /* Still failed, use pool */ + if (!Packet) + { + /* Let the balancer know */ + List->L.AllocateMisses++; + + /* Allocate from Nonpaged Pool */ + Packet = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Packet), IOC_TAG); + } + + /* Make sure we have one by now... */ + if (Packet) + { + /* Set up the Packet */ + Packet->PacketType = IrpMiniCompletionPacket; + Packet->Key = KeyContext; + Packet->Context = ApcContext; + Packet->IoStatus.Status = IoStatus; + Packet->IoStatus.Information = IoStatusInformation; + + /* Insert the Queue */ + KeInsertQueue(Queue, &Packet->ListEntry); + } + else + { + /* Out of memory, fail */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return Success */ + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoSetCompletionRoutineEx(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_COMPLETION_ROUTINE CompletionRoutine, + IN PVOID Context, + IN BOOLEAN InvokeOnSuccess, + IN BOOLEAN InvokeOnError, + IN BOOLEAN InvokeOnCancel) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI NtCreateIoCompletion(OUT PHANDLE IoCompletionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG NumberOfConcurrentThreads) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG NumberOfConcurrentThreads) { PKQUEUE Queue; HANDLE hIoCompletionHandle; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - if (PreviousMode != KernelMode) { - - _SEH_TRY { - + /* Check if this was a user-mode call */ + if (PreviousMode != KernelMode) + { + /* Wrap probing in SEH */ + _SEH_TRY + { + /* Probe the handle */ ProbeForWriteHandle(IoCompletionHandle); - } _SEH_HANDLE { - + } + _SEH_HANDLE + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if (!NT_SUCCESS(Status)) { - - return Status; - } + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status)) return Status; } /* Create the Object */ @@ -259,10 +266,8 @@ 0, 0, (PVOID*)&Queue); - - /* Check for success */ - if (NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Initialize the Queue */ KeInitializeQueue(Queue, NumberOfConcurrentThreads); @@ -273,16 +278,20 @@ 0, NULL, &hIoCompletionHandle); - - if (NT_SUCCESS(Status)) { - - _SEH_TRY { - + if (NT_SUCCESS(Status)) + { + /* Protect writing the handle in SEH */ + _SEH_TRY + { + /* Write the handle back */ *IoCompletionHandle = hIoCompletionHandle; - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; } } @@ -291,7 +300,7 @@ } NTSTATUS -STDCALL +NTAPI NtOpenIoCompletion(OUT PHANDLE IoCompletionHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) @@ -299,23 +308,26 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); HANDLE hIoCompletionHandle; NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - if(PreviousMode != KernelMode) { - - _SEH_TRY { - + /* Check if this was a user-mode call */ + if (PreviousMode != KernelMode) + { + /* Wrap probing in SEH */ + _SEH_TRY + { + /* Probe the handle */ ProbeForWriteHandle(IoCompletionHandle); - } _SEH_HANDLE { - + } + _SEH_HANDLE + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if(!NT_SUCCESS(Status)) { - - return Status; - } + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status)) return Status; } /* Open the Object */ @@ -326,25 +338,28 @@ DesiredAccess, NULL, &hIoCompletionHandle); - - if (NT_SUCCESS(Status)) { - - _SEH_TRY { - + if (NT_SUCCESS(Status)) + { + /* Protect writing the handle in SEH */ + _SEH_TRY + { + /* Write the handle back */ *IoCompletionHandle = hIoCompletionHandle; - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; } /* Return Status */ return Status; } - -NTSTATUS -STDCALL +NTSTATUS +NTAPI NtQueryIoCompletion(IN HANDLE IoCompletionHandle, IN IO_COMPLETION_INFORMATION_CLASS IoCompletionInformationClass, OUT PVOID IoCompletionInformation, @@ -354,22 +369,18 @@ PKQUEUE Queue; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); /* Check buffers and parameters */ Status = DefaultQueryInfoBufferCheck(IoCompletionInformationClass, IoCompletionInfoClass, - sizeof(IoCompletionInfoClass) / sizeof(IoCompletionInfoClass[0]), + sizeof(IoCompletionInfoClass) / + sizeof(IoCompletionInfoClass[0]), IoCompletionInformation, IoCompletionInformationLength, ResultLength, PreviousMode); - if(!NT_SUCCESS(Status)) { - - DPRINT1("NtQueryMutant() failed, Status: 0x%x\n", Status); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Get the Object */ Status = ObReferenceObjectByHandle(IoCompletionHandle, @@ -378,41 +389,43 @@ PreviousMode, (PVOID*)&Queue, NULL); - - /* Check for Success */ - if (NT_SUCCESS(Status)) { - - _SEH_TRY { - + if (NT_SUCCESS(Status)) + { + /* Protect write in SEH */ + _SEH_TRY + { /* Return Info */ - ((PIO_COMPLETION_BASIC_INFORMATION)IoCompletionInformation)->Depth = KeReadStateQueue(Queue); + ((PIO_COMPLETION_BASIC_INFORMATION)IoCompletionInformation)-> + Depth = KeReadStateQueue(Queue); + + /* Dereference the queue */ ObDereferenceObject(Queue); /* Return Result Length if needed */ - if (ResultLength) { - + if (ResultLength) + { *ResultLength = sizeof(IO_COMPLETION_BASIC_INFORMATION); } - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; } /* Return Status */ return Status; } -/* - * Dequeues an I/O completion message from an I/O completion object - */ -NTSTATUS -STDCALL -NtRemoveIoCompletion(IN HANDLE IoCompletionHandle, - OUT PVOID *CompletionKey, - OUT PVOID *CompletionContext, +NTSTATUS +NTAPI +NtRemoveIoCompletion(IN HANDLE IoCompletionHandle, + OUT PVOID *KeyContext, + OUT PVOID *ApcContext, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER Timeout OPTIONAL) + IN PLARGE_INTEGER Timeout OPTIONAL) { LARGE_INTEGER SafeTimeout; PKQUEUE Queue; @@ -420,32 +433,41 @@ PLIST_ENTRY ListEntry; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - + PIRP Irp; + PVOID Apc, Key; + IO_STATUS_BLOCK IoStatus; PAGED_CODE(); - if (PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForWritePointer(CompletionKey); - ProbeForWritePointer(CompletionContext); + /* Check if the call was from user mode */ + if (PreviousMode != KernelMode) + { + /* Protect probes in SEH */ + _SEH_TRY + { + /* Probe the pointers */ + ProbeForWritePointer(KeyContext); + ProbeForWritePointer(ApcContext); + + /* Probe the I/O Status Block */ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); - if (Timeout != NULL) { - + if (Timeout) + { + /* Probe and capture the timeout */ SafeTimeout = ProbeForReadLargeInteger(Timeout); Timeout = &SafeTimeout; } - } _SEH_HANDLE { - + } + _SEH_HANDLE + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if (!NT_SUCCESS(Status)) { - - return Status; - } + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status)) return Status; } /* Open the Object */ @@ -455,57 +477,66 @@ PreviousMode, (PVOID*)&Queue, NULL); - - /* Check for success */ - if (NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Remove queue */ ListEntry = KeRemoveQueue(Queue, PreviousMode, Timeout); /* If we got a timeout or user_apc back, return the status */ - if ((NTSTATUS)ListEntry == STATUS_TIMEOUT || (NTSTATUS)ListEntry == STATUS_USER_APC) { - + if (((NTSTATUS)ListEntry == STATUS_TIMEOUT) || + ((NTSTATUS)ListEntry == STATUS_USER_APC)) + { + /* Set this as the status */ Status = (NTSTATUS)ListEntry; - - } else { - + } + else + { /* Get the Packet Data */ - Packet = CONTAINING_RECORD(ListEntry, IO_COMPLETION_PACKET, ListEntry); + Packet = CONTAINING_RECORD(ListEntry, + IO_COMPLETION_PACKET, + ListEntry); /* Check if this is piggybacked on an IRP */ if (Packet->PacketType == IrpCompletionPacket) { /* Get the IRP */ - PIRP Irp = NULL; - Irp = CONTAINING_RECORD(ListEntry, IRP, Tail.Overlay.ListEntry); - - /* Return values to user */ - _SEH_TRY { - - *CompletionKey = Irp->Tail.CompletionKey; - *CompletionContext = Irp->Overlay.AsynchronousParameters.UserApcContext; - *IoStatusBlock = Packet->IoStatus; - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - - Status = _SEH_GetExceptionCode(); - } _SEH_END; - + Irp = CONTAINING_RECORD(ListEntry, + IRP, + Tail.Overlay.ListEntry); + + /* Save values */ + Key = Irp->Tail.CompletionKey; + Apc = Irp->Overlay.AsynchronousParameters.UserApcContext; + IoStatus = Irp->IoStatus; + + /* Free the IRP */ IoFreeIrp(Irp); } else { - /* This is a user-mode generated or API generated mini-packet */ - _SEH_TRY { - - *CompletionKey = Packet->Key; - *CompletionContext = Packet->Context; - *IoStatusBlock = Packet->IoStatus; - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - Status = _SEH_GetExceptionCode(); - } _SEH_END; - + /* Save values */ + Key = Packet->Key; + Apc = Packet->Context; + IoStatus = Packet->IoStatus; + + /* Free the packet */ IopFreeIoCompletionPacket(Packet); } + + /* Enter SEH to write back the values */ + _SEH_TRY + { + /* Write the values to caller */ + *ApcContext = Apc; + *KeyContext = Key; + *IoStatusBlock = IoStatus; + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } /* Dereference the Object */ @@ -516,11 +547,8 @@ return Status; } -/* - * Queues an I/O completion message to an I/O completion object - */ -NTSTATUS -STDCALL +NTSTATUS +NTAPI NtSetIoCompletion(IN HANDLE IoCompletionPortHandle, IN PVOID CompletionKey, IN PVOID CompletionContext, @@ -529,7 +557,6 @@ { NTSTATUS Status; PKQUEUE Queue; - PAGED_CODE(); /* Get the Object */ @@ -539,10 +566,8 @@ ExGetPreviousMode(), (PVOID*)&Queue, NULL); - - /* Check for Success */ - if (NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Set the Completion */ Status = IoSetIoCompletion(Queue, CompletionKey, @@ -550,6 +575,8 @@ CompletionStatus, CompletionInformation, TRUE); + + /* Dereference the object */ ObDereferenceObject(Queue); }

1 0

[hpoussin] 22720: Don't try to allocate 0 byte (spotted by Alex Ionescu)
by hpoussin＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: hpoussin Date: Fri Jun 30 21:38:12 2006 New Revision: 22720 URL: http://svn.reactos.org/svn/reactos?rev=22720&view=rev Log: Don't try to allocate 0 byte (spotted by Alex Ionescu) Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Fri Jun 30 21:38:12 2006 @@ -432,45 +432,58 @@ LPWSTR lpPasswordW = NULL; DWORD dwDependenciesLength = 0; DWORD dwLength; + int len; LPSTR lpStr; - int len = MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, NULL, 0); - lpServiceNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpServiceNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, lpServiceNameW, len); - - len = MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, NULL, 0); - lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpDisplayNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpDisplayNameW, len); - - len = MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, NULL, 0); - lpBinaryPathNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpBinaryPathNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpBinaryPathNameW, len); - - len = MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, NULL, 0); - lpLoadOrderGroupW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpLoadOrderGroupW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, lpLoadOrderGroupW, len); - - if (lpDependencies != NULL) + if (lpServiceName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, NULL, 0); + lpServiceNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpServiceNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, lpServiceNameW, len); + } + + if (lpDisplayName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, NULL, 0); + lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpDisplayNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpDisplayNameW, len); + } + + if (lpBinaryPathName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, NULL, 0); + lpBinaryPathNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpBinaryPathNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpBinaryPathNameW, len); + } + + if (lpLoadOrderGroup) + { + len = MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, NULL, 0); + lpLoadOrderGroupW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpLoadOrderGroupW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, lpLoadOrderGroupW, len); + } + + if (lpDependencies) { lpStr = (LPSTR)lpDependencies; while (*lpStr) @@ -480,33 +493,39 @@ lpStr = lpStr + dwLength; } dwDependenciesLength++; - } - - lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, dwDependenciesLength * sizeof(WCHAR)); - if (!lpDependenciesW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, lpDependenciesW, dwDependenciesLength); - - len = MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, NULL, 0); - lpServiceStartName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpServiceStartNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, lpServiceStartNameW, len); - - len = MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, NULL, 0); - lpPasswordW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpPasswordW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, lpPasswordW, len); + + lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, dwDependenciesLength * sizeof(WCHAR)); + if (!lpDependenciesW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, lpDependenciesW, dwDependenciesLength); + } + + if (lpServiceStartName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, NULL, 0); + lpServiceStartName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpServiceStartNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, lpServiceStartNameW, len); + } + + if (lpPassword) + { + len = MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, NULL, 0); + lpPasswordW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpPasswordW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, lpPasswordW, len); + } RetVal = CreateServiceW(hSCManager, lpServiceNameW,

1 0

[ion] 22719: - Refactor Io*Event APIs to call an internal worker function instead of duplicating the same code twice. - Optimize Io*Work APIs and initialize the event on allocation, not on queue!!
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 20:56:18 2006 New Revision: 22719 URL: http://svn.reactos.org/svn/reactos?rev=22719&view=rev Log: - Refactor Io*Event APIs to call an internal worker function instead of duplicating the same code twice. - Optimize Io*Work APIs and initialize the event on allocation, not on queue!! Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/event.c (contents, props changed) trunk/reactos/ntoskrnl/io/iowork.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Fri Jun 30 20:56:18 2006 @@ -196,6 +196,17 @@ PVOID Context; IO_STATUS_BLOCK IoStatus; } IO_COMPLETION_PACKET, *PIO_COMPLETION_PACKET; + +// +// I/O Wrapper around the Executive Work Item +// +typedef struct _IO_WORKITEM +{ + WORK_QUEUE_ITEM Item; + PDEVICE_OBJECT DeviceObject; + PIO_WORKITEM_ROUTINE WorkerRoutine; + PVOID Context; +} IO_WORKITEM, *PIO_WORKITEM; // // Dummy File Object used inside the Open Packet so that OB knows how to Modified: trunk/reactos/ntoskrnl/io/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/event.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/event.c (original) +++ trunk/reactos/ntoskrnl/io/event.c Fri Jun 30 20:56:18 2006 @@ -1,11 +1,10 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/io/event.c - * PURPOSE: Implements named events - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers for the Executive Event Functions + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -13,92 +12,73 @@ #include <ntoskrnl.h> #include <internal/debug.h> -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ + +PKEVENT +NTAPI +IopCreateEvent(IN PUNICODE_STRING EventName, + IN PHANDLE EventHandle, + IN EVENT_TYPE Type) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + PKEVENT Event; + HANDLE Handle; + NTSTATUS Status; + PAGED_CODE(); + + /* Initialize the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + EventName, + OBJ_OPENIF, + NULL, + NULL); + + /* Create the event */ + Status = ZwCreateEvent(&Handle, + EVENT_ALL_ACCESS, + &ObjectAttributes, + Type, + TRUE); + if (!NT_SUCCESS(Status)) return NULL; + + /* Get a handle to it */ + ObReferenceObjectByHandle(Handle, + 0, + ExEventObjectType, + KernelMode, + (PVOID*)&Event, + NULL); + + /* Dereference the extra count, and return the handle */ + ObDereferenceObject(Event); + *EventHandle = Handle; + return Event; +} + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented */ -PKEVENT STDCALL -IoCreateNotificationEvent(PUNICODE_STRING EventName, - PHANDLE EventHandle) +PKEVENT +NTAPI +IoCreateNotificationEvent(IN PUNICODE_STRING EventName, + IN PHANDLE EventHandle) { - OBJECT_ATTRIBUTES ObjectAttributes; - PKEVENT Event; - HANDLE Handle; - NTSTATUS Status; - - InitializeObjectAttributes(&ObjectAttributes, - EventName, - OBJ_OPENIF, - NULL, - NULL); - - Status = ZwCreateEvent(&Handle, - EVENT_ALL_ACCESS, - &ObjectAttributes, - NotificationEvent, - TRUE); - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - ObReferenceObjectByHandle(Handle, - 0, - ExEventObjectType, - KernelMode, - (PVOID*)&Event, - NULL); - ObDereferenceObject(Event); - - *EventHandle = Handle; - - return Event; + /* Call the internal API */ + return IopCreateEvent(EventName, EventHandle, NotificationEvent); } /* * @implemented */ -PKEVENT STDCALL -IoCreateSynchronizationEvent(PUNICODE_STRING EventName, - PHANDLE EventHandle) +PKEVENT +NTAPI +IoCreateSynchronizationEvent(IN PUNICODE_STRING EventName, + IN PHANDLE EventHandle) { - OBJECT_ATTRIBUTES ObjectAttributes; - KPROCESSOR_MODE PreviousMode; - PKEVENT Event; - HANDLE Handle; - NTSTATUS Status; - - PreviousMode = ExGetPreviousMode(); - - InitializeObjectAttributes(&ObjectAttributes, - EventName, - OBJ_OPENIF, - NULL, - NULL); - - Status = ZwCreateEvent(&Handle, - EVENT_ALL_ACCESS, - &ObjectAttributes, - SynchronizationEvent, - TRUE); - - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - ObReferenceObjectByHandle(Handle, - 0, - ExEventObjectType, - KernelMode, - (PVOID*)&Event, - NULL); - ObDereferenceObject(Event); - - *EventHandle = Handle; - - return Event; + /* Call the internal API */ + return IopCreateEvent(EventName, EventHandle, SynchronizationEvent); } /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/event.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/iowork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iowork.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/iowork.c (original) +++ trunk/reactos/ntoskrnl/io/iowork.c Fri Jun 30 20:56:18 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/io/iowork.c - * PURPOSE: Manage IO system work queues - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers for the Executive Work Item Functions + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Robert Dickenson (odin(a)pnc.com.au) */ @@ -15,80 +13,81 @@ #define NDEBUG #include <internal/debug.h> -/* TYPES ********************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ -typedef struct _IO_WORKITEM +VOID +NTAPI +IopWorkItemCallback(IN PVOID Parameter) { - WORK_QUEUE_ITEM Item; - PDEVICE_OBJECT DeviceObject; - PIO_WORKITEM_ROUTINE WorkerRoutine; - PVOID Context; -} IO_WORKITEM; + PIO_WORKITEM IoWorkItem = (PIO_WORKITEM)Parameter; + PDEVICE_OBJECT DeviceObject = IoWorkItem->DeviceObject; + PAGED_CODE(); -/* FUNCTIONS ****************************************************************/ + /* Call the work routine */ + IoWorkItem->WorkerRoutine(DeviceObject, IoWorkItem->Context); -VOID STATIC STDCALL -IoWorkItemCallback(PVOID Parameter) + /* Dereferenece the device object */ + ObDereferenceObject(DeviceObject); +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +IoQueueWorkItem(IN PIO_WORKITEM IoWorkItem, + IN PIO_WORKITEM_ROUTINE WorkerRoutine, + IN WORK_QUEUE_TYPE QueueType, + IN PVOID Context) { - PIO_WORKITEM IoWorkItem = (PIO_WORKITEM)Parameter; - PDEVICE_OBJECT DeviceObject = IoWorkItem->DeviceObject; - IoWorkItem->WorkerRoutine(IoWorkItem->DeviceObject, IoWorkItem->Context); - ObDereferenceObject(DeviceObject); + /* Make sure we're called at DISPATCH or lower */ + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Reference the device object */ + ObReferenceObject(IoWorkItem->DeviceObject); + + /* Setup the work item */ + IoWorkItem->WorkerRoutine = WorkerRoutine; + IoWorkItem->Context = Context; + + /* Queue the work item */ + ExQueueWorkItem(&IoWorkItem->Item, QueueType); } /* * @implemented */ -VOID STDCALL -IoQueueWorkItem(IN PIO_WORKITEM IoWorkItem, - IN PIO_WORKITEM_ROUTINE WorkerRoutine, - IN WORK_QUEUE_TYPE QueueType, - IN PVOID Context) -/* - * FUNCTION: Inserts a work item in a queue for one of the system worker - * threads to process - * ARGUMENTS: - * IoWorkItem = Item to insert - * QueueType = Queue to insert it in - */ +VOID +NTAPI +IoFreeWorkItem(IN PIO_WORKITEM IoWorkItem) { - ExInitializeWorkItem(&IoWorkItem->Item, IoWorkItemCallback, - (PVOID)IoWorkItem); - IoWorkItem->WorkerRoutine = WorkerRoutine; - IoWorkItem->Context = Context; - ObReferenceObjectByPointer(IoWorkItem->DeviceObject, - FILE_ALL_ACCESS, - NULL, - KernelMode); - ExQueueWorkItem(&IoWorkItem->Item, QueueType); + /* Free the work item */ + ExFreePool(IoWorkItem); } /* * @implemented */ -VOID STDCALL -IoFreeWorkItem(PIO_WORKITEM IoWorkItem) +PIO_WORKITEM +NTAPI +IoAllocateWorkItem(IN PDEVICE_OBJECT DeviceObject) { - ExFreePool(IoWorkItem); -} + PIO_WORKITEM IoWorkItem; -/* - * @implemented - */ -PIO_WORKITEM STDCALL -IoAllocateWorkItem(PDEVICE_OBJECT DeviceObject) -{ - PIO_WORKITEM IoWorkItem = NULL; + /* Allocate the work item */ + IoWorkItem = ExAllocatePoolWithTag(NonPagedPool, + sizeof(IO_WORKITEM), + TAG_IOWI); + if (!IoWorkItem) return NULL; - IoWorkItem = - ExAllocatePoolWithTag(NonPagedPool, sizeof(IO_WORKITEM), TAG_IOWI); - if (IoWorkItem == NULL) - { - return(NULL); - } - RtlZeroMemory(IoWorkItem, sizeof(IO_WORKITEM)); - IoWorkItem->DeviceObject = DeviceObject; - return(IoWorkItem); + /* Initialize it */ + IoWorkItem->DeviceObject = DeviceObject; + ExInitializeWorkItem(&IoWorkItem->Item, IopWorkItemCallback, IoWorkItem); + + /* Return it */ + return IoWorkItem; } /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/iowork.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22718: Small clean up 1. Remove goto in the code, goto is slow and should be avoid. 2. reformat for adding {} around some code. 3. remove some NULL check after I did remove goto that is not longer need it.
by greatlrd＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: greatlrd Date: Fri Jun 30 20:42:21 2006 New Revision: 22718 URL: http://svn.reactos.org/svn/reactos?rev=22718&view=rev Log: Small clean up 1. Remove goto in the code, goto is slow and should be avoid. 2. reformat for adding {} around some code. 3. remove some NULL check after I did remove goto that is not longer need it. Modified: trunk/reactos/base/services/eventlog/eventlog.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Fri Jun 30 20:42:21 2006 @@ -61,7 +61,7 @@ DWORD MaxValueLen, ValueLen, Type, ExpandedLen; WCHAR *Buf = NULL, *Expanded = NULL; LONG Result; - BOOL ret = FALSE; + BOOL ret = TRUE; PLOGFILE pLogf; DPRINT("LoadLogFile: %S\n", LogName); @@ -88,12 +88,14 @@ if(Result != ERROR_SUCCESS) { DPRINT1("RegQueryValueEx failed: %d\n", GetLastError()); - goto cleanup; + HeapFree(MyHeap, 0, Buf); + return FALSE; } if(Type != REG_EXPAND_SZ && Type != REG_SZ) { DPRINT1("%S\\File - value of wrong type %x.\n", LogName, Type); - goto cleanup; + HeapFree(MyHeap, 0, Buf); + return FALSE; } ExpandedLen = ExpandEnvironmentStrings(Buf, NULL, 0); @@ -102,7 +104,8 @@ if(!Expanded) { DPRINT1("Can't allocate heap!\n"); - goto cleanup; + HeapFree(MyHeap, 0, Buf); + return FALSE; } ExpandEnvironmentStrings(Buf, Expanded, ExpandedLen); @@ -114,14 +117,11 @@ if(pLogf == NULL) { DPRINT1("Failed to create %S!\n", Expanded); - goto cleanup; - } - - ret = TRUE; - -cleanup: + ret = FALSE; + } + HeapFree(MyHeap, 0, Buf); - if(Expanded) HeapFree(MyHeap, 0, Expanded); + HeapFree(MyHeap, 0, Expanded); return ret; } @@ -129,8 +129,7 @@ { LONG result; DWORD MaxLognameLen, LognameLen; - WCHAR *Buf = NULL; - BOOL ret = FALSE; + WCHAR *Buf = NULL; INT i; RegQueryInfoKey(eventlogKey, NULL, NULL, NULL, NULL, &MaxLognameLen, @@ -143,7 +142,7 @@ if(!Buf) { DPRINT1("Error: can't allocate heap!\n"); - return ret; + return FALSE; } i = 0; @@ -159,7 +158,8 @@ if(result != ERROR_SUCCESS) { DPRINT1("Failed to open %S key.\n", Buf); - goto cleanup; + HeapFree(MyHeap, 0, Buf); + return FALSE; } if(!LoadLogFile(SubKey, Buf)) @@ -171,18 +171,14 @@ i++; } - ret = TRUE; - -cleanup: HeapFree(MyHeap, 0, Buf); - return ret; + return TRUE; } INT main() { WCHAR LogPath[MAX_PATH]; - PLOGFILE pLogf; - INT RetCode = 0; + PLOGFILE pLogf; LONG result; HKEY elogKey; @@ -193,8 +189,15 @@ if(MyHeap==NULL) { DPRINT1("FATAL ERROR, can't create heap.\n"); - RetCode = 1; - goto bye_bye; + + DeleteCriticalSection(&LogListCs); + // Close all log files. + for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) + { + LogfClose(pLogf); + } + + return 1; } GetWindowsDirectory(LogPath, MAX_PATH); @@ -214,8 +217,17 @@ if(result != ERROR_SUCCESS) { DPRINT1("Fatal error: can't open eventlog registry key.\n"); - RetCode = 1; - goto bye_bye; + + DeleteCriticalSection(&LogListCs); + + // Close all log files. + for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) + { + LogfClose(pLogf); + } + + HeapDestroy(MyHeap); + return 1; } LoadLogFiles(elogKey); @@ -223,16 +235,16 @@ StartServiceCtrlDispatcher(ServiceTable); -bye_bye: DeleteCriticalSection(&LogListCs); // Close all log files. for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) + { LogfClose(pLogf); + } - if(MyHeap) HeapDestroy(MyHeap); - - return RetCode; + HeapDestroy(MyHeap); + return 0; } VOID EventTimeToSystemTime(DWORD EventTime,

1 0

[ion] 22717: - Fix IRP/Completion packet lookaside allocation. We weren't setting a zone size, and I/O Completion packets were also using the wrong size. - Rewrite I/O MDl support to use lookaside lists for allocations below 23 pages (same as on NT). This is is an incredible performance optimization because MDLs are often allocated and de-allocated during I/O operations, and using the lookaside list decreases pool fragmentation and slowdown. - Rewrite IoBuildPartialMdl. It did not work like docu
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 19:59:06 2006 New Revision: 22717 URL: http://svn.reactos.org/svn/reactos?rev=22717&view=rev Log: - Fix IRP/Completion packet lookaside allocation. We weren't setting a zone size, and I/O Completion packets were also using the wrong size. - Rewrite I/O MDl support to use lookaside lists for allocations below 23 pages (same as on NT). This is is an incredible performance optimization because MDLs are often allocated and de-allocated during I/O operations, and using the lookaside list decreases pool fragmentation and slowdown. - Rewrite IoBuildPartialMdl. It did not work like documented in the DDK and also had a bug documented by Microsoft as being in XP. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/io/mdl.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Fri Jun 30 19:59:06 2006 @@ -47,6 +47,14 @@ // Number of partition tables in the Boot Record // #define PARTITION_TBL_SIZE 4 + +// +// We can call the Ob Inlined API, it's the same thing +// +#define IopAllocateMdlFromLookaside \ + ObpAllocateCapturedAttributes +#define IopFreeMdlFromLookaside \ + ObpFreeCapturedAttributes // // Returns the size of a CM_RESOURCE_LIST @@ -830,4 +838,4 @@ extern POBJECT_TYPE IoCompletionType; extern PDEVICE_NODE IopRootDeviceNode; extern ULONG IopTraceLevel; - +extern NPAGED_LOOKASIDE_LIST IopMdlLookasideList; Modified: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr.c Fri Jun 30 19:59:06 2006 @@ -41,6 +41,7 @@ extern POBJECT_TYPE IoAdapterObjectType; NPAGED_LOOKASIDE_LIST IoLargeIrpLookaside; NPAGED_LOOKASIDE_LIST IoSmallIrpLookaside; +NPAGED_LOOKASIDE_LIST IopMdlLookasideList; VOID INIT_FUNCTION IopInitLookasideLists(VOID); @@ -74,7 +75,7 @@ INIT_FUNCTION IopInitLookasideLists(VOID) { - ULONG LargeIrpSize, SmallIrpSize; + ULONG LargeIrpSize, SmallIrpSize, MdlSize; LONG i; PKPRCB Prcb; PNPAGED_LOOKASIDE_LIST CurrentList = NULL; @@ -82,6 +83,7 @@ /* Calculate the sizes */ LargeIrpSize = sizeof(IRP) + (8 * sizeof(IO_STACK_LOCATION)); SmallIrpSize = sizeof(IRP) + sizeof(IO_STACK_LOCATION); + MdlSize = sizeof(MDL) + (23 * sizeof(PFN_NUMBER)); /* Initialize the Lookaside List for Large IRPs */ ExInitializeNPagedLookasideList(&IoLargeIrpLookaside, @@ -90,7 +92,7 @@ 0, LargeIrpSize, IO_LARGEIRP, - 0); + 64); /* Initialize the Lookaside List for Small IRPs */ ExInitializeNPagedLookasideList(&IoSmallIrpLookaside, @@ -99,7 +101,7 @@ 0, SmallIrpSize, IO_SMALLIRP, - 0); + 32); /* Initialize the Lookaside List for I\O Completion */ ExInitializeNPagedLookasideList(&IoCompletionPacketLookaside, @@ -108,7 +110,16 @@ 0, sizeof(IO_COMPLETION_PACKET), IOC_TAG1, - 0); + 32); + + /* Initialize the Lookaside List for MDLs */ + ExInitializeNPagedLookasideList(&IopMdlLookasideList, + NULL, + NULL, + 0, + MdlSize, + TAG_MDL, + 128); /* Now allocate the per-processor lists */ for (i = 0; i < KeNumberProcessors; i++) @@ -131,7 +142,7 @@ 0, LargeIrpSize, IO_LARGEIRP_CPU, - 0); + 64); } else { @@ -146,14 +157,14 @@ IO_SMALLIRP_CPU); if (CurrentList) { - /* Initialize the Lookaside List for Large IRPs */ + /* Initialize the Lookaside List for Small IRPs */ ExInitializeNPagedLookasideList(CurrentList, NULL, NULL, 0, SmallIrpSize, IO_SMALLIRP_CPU, - 0); + 32); } else { @@ -173,15 +184,37 @@ NULL, NULL, 0, + sizeof(IO_COMPLETION_PACKET), + IO_SMALLIRP_CPU, + 32); + } + else + { + CurrentList = &IoCompletionPacketLookaside; + } + Prcb->PPLookasideList[LookasideCompletionList].P = &CurrentList->L; + + /* Set the MDL Completion List */ + Prcb->PPLookasideList[LookasideMdlList].L = &IopMdlLookasideList.L; + CurrentList = ExAllocatePoolWithTag(NonPagedPool, + sizeof(NPAGED_LOOKASIDE_LIST), + TAG_MDL); + if (CurrentList) + { + /* Initialize the Lookaside List for MDLs */ + ExInitializeNPagedLookasideList(CurrentList, + NULL, + NULL, + 0, SmallIrpSize, - IOC_CPU, - 0); + TAG_MDL, + 128); } else { - CurrentList = &IoCompletionPacketLookaside; - } - Prcb->PPLookasideList[LookasideCompletionList].P = &CurrentList->L; + CurrentList = &IopMdlLookasideList; + } + Prcb->PPLookasideList[LookasideMdlList].P = &CurrentList->L; } DPRINT("Done allocation\n"); Modified: trunk/reactos/ntoskrnl/io/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/mdl.c?rev=2271… ============================================================================== --- trunk/reactos/ntoskrnl/io/mdl.c (original) +++ trunk/reactos/ntoskrnl/io/mdl.c Fri Jun 30 19:59:06 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/io/mdl.c - * PURPOSE: Io manager mdl functions - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers for MDL Allocation and Deallocation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -20,116 +18,143 @@ * @implemented */ PMDL -STDCALL -IoAllocateMdl(PVOID VirtualAddress, - ULONG Length, - BOOLEAN SecondaryBuffer, - BOOLEAN ChargeQuota, - PIRP Irp) +NTAPI +IoAllocateMdl(IN PVOID VirtualAddress, + IN ULONG Length, + IN BOOLEAN SecondaryBuffer, + IN BOOLEAN ChargeQuota, + IN PIRP Irp) { - PMDL Mdl; + PMDL Mdl = NULL, p; + ULONG Flags = 0; + ULONG Size; - if (ChargeQuota) - { -// Mdl = ExAllocatePoolWithQuota(NonPagedPool, -// MmSizeOfMdl(VirtualAddress,Length)); - Mdl = ExAllocatePoolWithTag(NonPagedPool, - MmSizeOfMdl(VirtualAddress,Length), - TAG_MDL); - } - else - { - Mdl = ExAllocatePoolWithTag(NonPagedPool, - MmSizeOfMdl(VirtualAddress,Length), - TAG_MDL); - } - MmInitializeMdl(Mdl, (char*)VirtualAddress, Length); + /* Fail if allocation is over 2GB */ + if (Length & 0x80000000) return NULL; - if (Irp) - { - if (SecondaryBuffer) - { - ASSERT(Irp->MdlAddress); + /* Calculate the number of pages for the allocation */ + Size = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddress, Length); + if (Size > 23) + { + /* This is bigger then our fixed-size MDLs. Calculate real size */ + Size *= sizeof(PFN_NUMBER); + Size += sizeof(MDL); + if (Size > MAXUSHORT) return NULL; + } + else + { + /* Use an internal fixed MDL size */ + Size = (23 * sizeof(PFN_NUMBER)) + sizeof(MDL); + Flags |= MDL_ALLOCATED_FIXED_SIZE; - /* FIXME: add to end of list maybe?? */ - Mdl->Next = Irp->MdlAddress->Next; - Irp->MdlAddress->Next = Mdl; + /* Allocate one from the lookaside list */ + Mdl = IopAllocateMdlFromLookaside(LookasideMdlList); + } + + /* Check if we don't have an mdl yet */ + if (!Mdl) + { + /* Allocate one from pool */ + Mdl = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_MDL); + if (!Mdl) return NULL; + } + + /* Initialize it */ + MmInitializeMdl(Mdl, VirtualAddress, Length); + Mdl->MdlFlags |= Flags; + + /* Check if an IRP was given too */ + if (Irp) + { + /* Check if it came with a secondary buffer */ + if (SecondaryBuffer) + { + /* Insert the MDL at the end */ + p = Irp->MdlAddress; + while (p->Next) p = p->Next; + p->Next = Mdl; } else { - /* - * What if there's allready an mdl at Irp->MdlAddress? - * Is that bad and should we do something about it? - */ - Irp->MdlAddress = Mdl; + /* Otherwise, insert it directly */ + Irp->MdlAddress = Mdl; } } - return(Mdl); -} - -/* - * @implemented - * - * You must IoFreeMdl the slave before freeing the master. - * - * IoBuildPartialMdl is more similar to MmBuildMdlForNonPagedPool, the difference - * is that the former takes the physical addresses from the master MDL, while the - * latter - from the known location of the NPP. - */ -VOID -STDCALL -IoBuildPartialMdl(PMDL SourceMdl, - PMDL TargetMdl, - PVOID VirtualAddress, - ULONG Length) -{ - PPFN_TYPE TargetPages = (PPFN_TYPE)(TargetMdl + 1); - PPFN_TYPE SourcePages = (PPFN_TYPE)(SourceMdl + 1); - ULONG Count; - ULONG Delta; - - DPRINT("VirtualAddress 0x%p, SourceMdl->StartVa 0x%p, SourceMdl->MappedSystemVa 0x%p\n", - VirtualAddress, SourceMdl->StartVa, SourceMdl->MappedSystemVa); - - TargetMdl->StartVa = (PVOID)PAGE_ROUND_DOWN(VirtualAddress); - TargetMdl->ByteOffset = (ULONG_PTR)VirtualAddress - (ULONG_PTR)TargetMdl->StartVa; - TargetMdl->ByteCount = Length; - TargetMdl->Process = SourceMdl->Process; - Delta = (ULONG_PTR)VirtualAddress - ((ULONG_PTR)SourceMdl->StartVa + SourceMdl->ByteOffset); - TargetMdl->MappedSystemVa = (char*)SourceMdl->MappedSystemVa + Delta; - - TargetMdl->MdlFlags = SourceMdl->MdlFlags & (MDL_IO_PAGE_READ|MDL_SOURCE_IS_NONPAGED_POOL|MDL_MAPPED_TO_SYSTEM_VA); - TargetMdl->MdlFlags |= MDL_PARTIAL; - - Delta = ((ULONG_PTR)TargetMdl->StartVa - (ULONG_PTR)SourceMdl->StartVa) / PAGE_SIZE; - Count = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddress,Length); - - SourcePages += Delta; - - DPRINT("Delta %d, Count %d\n", Delta, Count); - - memcpy(TargetPages, SourcePages, Count * sizeof(PFN_TYPE)); - + /* Return the allocated mdl */ + return Mdl; } /* * @implemented */ -VOID STDCALL +VOID +NTAPI +IoBuildPartialMdl(IN PMDL SourceMdl, + IN PMDL TargetMdl, + IN PVOID VirtualAddress, + IN ULONG Length) +{ + PPFN_TYPE TargetPages = (PPFN_TYPE)(TargetMdl + 1); + PPFN_TYPE SourcePages = (PPFN_TYPE)(SourceMdl + 1); + ULONG Offset; + + /* Calculate the offset */ + Offset = (ULONG)((ULONG_PTR)VirtualAddress - + (ULONG_PTR)SourceMdl->StartVa) - + SourceMdl->ByteOffset; + + /* Check if we don't have a length and calculate it */ + if (!Length) Length = SourceMdl->ByteCount - Offset; + + /* Write the process, start VA and byte data */ + TargetMdl->StartVa = (PVOID)PAGE_ROUND_DOWN(VirtualAddress); + TargetMdl->Process = SourceMdl->Process; + TargetMdl->ByteCount = Length; + TargetMdl->ByteOffset = BYTE_OFFSET(VirtualAddress); + + /* Recalculate the length in pages */ + Length = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddress, Length); + + /* Set the MDL Flags */ + TargetMdl->MdlFlags = (MDL_ALLOCATED_FIXED_SIZE | MDL_ALLOCATED_MUST_SUCCEED); + TargetMdl->MdlFlags |= (MDL_IO_PAGE_READ | + MDL_SOURCE_IS_NONPAGED_POOL | + MDL_MAPPED_TO_SYSTEM_VA | + MDL_IO_SPACE); + TargetMdl->MdlFlags |= MDL_PARTIAL; + + /* Set the mapped VA */ + TargetMdl->MappedSystemVa = (PCHAR)SourceMdl->MappedSystemVa + Offset; + + /* Now do the copy */ + Offset = ((ULONG_PTR)TargetMdl->StartVa - (ULONG_PTR)SourceMdl->StartVa) >> + PAGE_SHIFT; + SourcePages += Offset; + RtlMoveMemory(TargetPages, SourcePages, Length * sizeof(PFN_TYPE)); +} + +/* + * @implemented + */ +VOID +NTAPI IoFreeMdl(PMDL Mdl) { - /* - * This unmaps partial mdl's from kernel space but also asserts that non-partial - * mdl's isn't still mapped into kernel space. - */ - ASSERT(Mdl); - ASSERT_IRQL(DISPATCH_LEVEL); + /* Tell Mm to reuse the MDL */ + MmPrepareMdlForReuse(Mdl); - MmPrepareMdlForReuse(Mdl); - - ExFreePoolWithTag(Mdl, TAG_MDL); + /* Check if this was a pool allocation */ + if (!(Mdl->MdlFlags & MDL_ALLOCATED_FIXED_SIZE)) + { + /* Free it from the pool */ + ExFreePoolWithTag(Mdl, TAG_MDL); + } + else + { + /* Free it from the lookaside */ + IopFreeMdlFromLookaside(Mdl, LookasideMdlList); + } } - /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/mdl.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22716: sorry I did broke the comping some typo
by greatlrd＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: greatlrd Date: Fri Jun 30 19:53:57 2006 New Revision: 22716 URL: http://svn.reactos.org/svn/reactos?rev=22716&view=rev Log: sorry I did broke the comping some typo Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Jun 30 19:53:57 2006 @@ -1,4 +1,4 @@ - o/* +/* * Copyright (C) 2005 Casper S. Hornstrup * * This program is free software; you can redistribute it and/or modify

1 0

[greatlrd] 22715: fixing strip working right strip -sx does not working u must type strip -s -x not togther as -sx, I did add -X direcly after it will strip away local informations as well
by greatlrd＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: greatlrd Date: Fri Jun 30 19:38:30 2006 New Revision: 22715 URL: http://svn.reactos.org/svn/reactos?rev=22715&view=rev Log: fixing strip working right strip -sx does not working u must type strip -s -x not togther as -sx, I did add -X direcly after it will strip away local informations as well Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Jun 30 19:38:30 2006 @@ -1,4 +1,4 @@ -/* + o/* * Copyright (C) 2005 Casper S. Hornstrup * * This program is free software; you can redistribute it and/or modify @@ -1517,7 +1517,7 @@ fprintf ( fMakefile, "\t$(ECHO_STRIP)\n" ); fprintf ( fMakefile, - "\t${strip} -sx $@\n\n" ); + "\t${strip} -s -x -X $@\n\n" ); fprintf ( fMakefile, "endif\n" ); }

1 0

[tretiakov] 22714: Alex Ionescu said that check for Expanded==NULL must stay...
by tretiakov＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: tretiakov Date: Fri Jun 30 19:12:55 2006 New Revision: 22714 URL: http://svn.reactos.org/svn/reactos?rev=22714&view=rev Log: Alex Ionescu said that check for Expanded==NULL must stay... Modified: trunk/reactos/base/services/eventlog/eventlog.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Fri Jun 30 19:12:55 2006 @@ -121,7 +121,7 @@ cleanup: HeapFree(MyHeap, 0, Buf); - HeapFree(MyHeap, 0, Expanded); + if(Expanded) HeapFree(MyHeap, 0, Expanded); return ret; }

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 June 2006