Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[ekohl] 22745: Enable CM_Connect_MachineW to connect to the local machine.
by ekohl＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ekohl Date: Sun Jul 2 01:01:59 2006 New Revision: 22745 URL: http://svn.reactos.org/svn/reactos?rev=22745&view=rev Log: Enable CM_Connect_MachineW to connect to the local machine. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Sun Jul 2 01:01:59 2006 @@ -42,6 +42,7 @@ WCHAR szMachineName[MAX_PATH]; RPC_BINDING_HANDLE BindingHandle; HSTRING_TABLE StringTable; + BOOL bLocal; } MACHINE_INFO, *PMACHINE_INFO; @@ -251,33 +252,48 @@ TRACE("%s %p\n", debugstr_w(UNCServerName), phMachine); - if (!UNCServerName) - { - FIXME("Connection to local machine not implemented\n"); - *phMachine = NULL; - return CR_SUCCESS; - } + if (phMachine == NULL) + return CR_INVALID_POINTER; + + *phMachine = NULL; pMachine = HeapAlloc(GetProcessHeap(), 0, sizeof(MACHINE_INFO)); if (pMachine == NULL) return CR_OUT_OF_MEMORY; - lstrcpyW(pMachine->szMachineName, UNCServerName); - - pMachine->StringTable = StringTableInitialize(); - if (pMachine->StringTable == NULL) - { - HeapFree(GetProcessHeap(), 0, pMachine); - return CR_FAILURE; - } - - StringTableAddString(pMachine->StringTable, L"PLT", 1); - - if (!PnpBindRpc(UNCServerName, &pMachine->BindingHandle)) - { - StringTableDestroy(pMachine->StringTable); - HeapFree(GetProcessHeap(), 0, pMachine); - return CR_INVALID_MACHINENAME; + if (UNCServerName == NULL || *UNCServerName == 0) + { + pMachine->bLocal = TRUE; + + /* FIXME: store the computers name in pMachine->szMachineName */ + + if (!PnpGetLocalHandles(&pMachine->BindingHandle, + &pMachine->StringTable)) + { + HeapFree(GetProcessHeap(), 0, pMachine); + return CR_FAILURE; + } + } + else + { + pMachine->bLocal = FALSE; + lstrcpyW(pMachine->szMachineName, UNCServerName); + + pMachine->StringTable = StringTableInitialize(); + if (pMachine->StringTable == NULL) + { + HeapFree(GetProcessHeap(), 0, pMachine); + return CR_FAILURE; + } + + StringTableAddString(pMachine->StringTable, L"PLT", 1); + + if (!PnpBindRpc(UNCServerName, &pMachine->BindingHandle)) + { + StringTableDestroy(pMachine->StringTable); + HeapFree(GetProcessHeap(), 0, pMachine); + return CR_INVALID_MACHINENAME; + } } phMachine = (PHMACHINE)pMachine; @@ -551,11 +567,14 @@ if (pMachine == NULL) return CR_SUCCESS; - if (pMachine->StringTable != NULL) - StringTableDestroy(pMachine->StringTable); - - if (!PnpUnbindRpc(pMachine->BindingHandle)) - return CR_ACCESS_DENIED; + if (pMachine->bLocal == FALSE) + { + if (pMachine->StringTable != NULL) + StringTableDestroy(pMachine->StringTable); + + if (!PnpUnbindRpc(pMachine->BindingHandle)) + return CR_ACCESS_DENIED; + } HeapFree(GetProcessHeap(), 0, pMachine);

1 0

[ion] 22744: - Move IopInitialize/StartDevice to PnP Manager - I/O Packet APIs fixes Part 1: - Clear the current IRP before parsing the Device Queues - Respect Cancelable parameter in IoStartNextPacket(ByKey) instead of ignoring it (acquire the cancel lock when it's requested) - Raise IRQL to DISPATCH_LEVEL in IoStartPacket instead of expecting the caller to do it and crashing. Also only use Cancel Lock if a Cancel Function was specified. - Actually handle the case where the IRP Was cancelled ri
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sat Jul 1 22:56:09 2006 New Revision: 22744 URL: http://svn.reactos.org/svn/reactos?rev=22744&view=rev Log: - Move IopInitialize/StartDevice to PnP Manager - I/O Packet APIs fixes Part 1: - Clear the current IRP before parsing the Device Queues - Respect Cancelable parameter in IoStartNextPacket(ByKey) instead of ignoring it (acquire the cancel lock when it's requested) - Raise IRQL to DISPATCH_LEVEL in IoStartPacket instead of expecting the caller to do it and crashing. Also only use Cancel Lock if a Cancel Function was specified. - Actually handle the case where the IRP Was cancelled right after insert and the Cancel Routine has to be called. Modified: trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sat Jul 1 22:56:09 2006 @@ -80,111 +80,6 @@ ListEntry = ExInterlockedRemoveHeadList(&ShutdownListHead, &ShutdownListLock); } -} - -NTSTATUS -FASTCALL -IopInitializeDevice(PDEVICE_NODE DeviceNode, - PDRIVER_OBJECT DriverObject) -{ - PDEVICE_OBJECT Fdo; - NTSTATUS Status; - BOOLEAN IsPnpDriver = FALSE; - - if (DriverObject->DriverExtension->AddDevice) - { - /* This is a Plug and Play driver */ - DPRINT("Plug and Play driver found\n"); - - ASSERT(DeviceNode->PhysicalDeviceObject); - - DPRINT("Calling driver AddDevice entrypoint at %08lx\n", - DriverObject->DriverExtension->AddDevice); - - IsPnpDriver = !IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER); - Status = DriverObject->DriverExtension->AddDevice( - DriverObject, IsPnpDriver ? DeviceNode->PhysicalDeviceObject : NULL); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - - if (IsPnpDriver) - { - Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - - if (Fdo == DeviceNode->PhysicalDeviceObject) - { - /* FIXME: What do we do? Unload the driver or just disable the device? */ - DbgPrint("An FDO was not attached\n"); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_UNSUCCESSFUL; - } - - if (Fdo->DeviceType == FILE_DEVICE_ACPI) - { - static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; - - /* There can be only one system power device */ - if (!SystemPowerDeviceNodeCreated) - { - PopSystemPowerDeviceNode = DeviceNode; - SystemPowerDeviceNodeCreated = TRUE; - } - } - - ObDereferenceObject(Fdo); - } - - IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); - IopDeviceNodeSetFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); - } - - return STATUS_SUCCESS; -} - -NTSTATUS -IopStartDevice( - PDEVICE_NODE DeviceNode) -{ - IO_STATUS_BLOCK IoStatusBlock; - IO_STACK_LOCATION Stack; - PDEVICE_OBJECT Fdo; - NTSTATUS Status; - - DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); - - Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); - Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; - Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated; - - Status = IopInitiatePnpIrp( - Fdo, - &IoStatusBlock, - IRP_MN_START_DEVICE, - &Stack); - - if (!NT_SUCCESS(Status)) - { - DPRINT("IopInitiatePnpIrp() failed\n"); - } - else - { - if (IopDeviceNodeHasFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY)) - { - DPRINT("Device needs enumeration, invalidating bus relations\n"); - Status = IopInvalidateDeviceRelations(DeviceNode, BusRelations); - IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); - } - } - - ObDereferenceObject(Fdo); - - if (NT_SUCCESS(Status)) - DeviceNode->Flags |= DN_STARTED; - - return Status; } NTSTATUS @@ -1247,137 +1142,157 @@ /* * @implemented - * - * FUNCTION: Dequeues the next packet from the given device object's - * associated device queue according to a specified sort-key value and calls - * the drivers StartIo routine with that IRP - * ARGUMENTS: - * DeviceObject = Device object for which the irp is to dequeued - * Cancelable = True if IRPs in the key can be canceled - * Key = Sort key specifing which entry to remove from the queue */ VOID -STDCALL -IoStartNextPacketByKey(PDEVICE_OBJECT DeviceObject, - BOOLEAN Cancelable, - ULONG Key) -{ - PKDEVICE_QUEUE_ENTRY entry; - PIRP Irp; - - entry = KeRemoveByKeyDeviceQueue(&DeviceObject->DeviceQueue, - Key); - - if (entry != NULL) - { - Irp = CONTAINING_RECORD(entry, - IRP, - Tail.Overlay.DeviceQueueEntry); +NTAPI +IoStartNextPacketByKey(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN Cancelable, + IN ULONG Key) +{ + PKDEVICE_QUEUE_ENTRY Entry; + PIRP Irp; + KIRQL OldIrql; + + /* Acquire the cancel lock if this is cancelable */ + if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); + + /* Clear the current IRP */ + DeviceObject->CurrentIrp = NULL; + + /* Remove an entry from the queue */ + Entry = KeRemoveByKeyDeviceQueue(&DeviceObject->DeviceQueue, Key); + if (Entry) + { + /* Get the IRP and set it */ + Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); DeviceObject->CurrentIrp = Irp; - DPRINT("Next irp is 0x%p\n", Irp); - DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); - } - else - { - DPRINT("No next irp\n"); - DeviceObject->CurrentIrp = NULL; - } + + /* Release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + + /* Call the Start I/O Routine */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* Otherwise, release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + } } /* * @implemented - * - * FUNCTION: Removes the next packet from the device's queue and calls - * the driver's StartIO - * ARGUMENTS: - * DeviceObject = Device - * Cancelable = True if irps in the queue can be canceled */ VOID -STDCALL -IoStartNextPacket(PDEVICE_OBJECT DeviceObject, - BOOLEAN Cancelable) -{ - PKDEVICE_QUEUE_ENTRY entry; - PIRP Irp; - - DPRINT("IoStartNextPacket(DeviceObject 0x%p, Cancelable %d)\n", - DeviceObject, Cancelable); - - entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue); - - if (entry!=NULL) - { - Irp = CONTAINING_RECORD(entry,IRP,Tail.Overlay.DeviceQueueEntry); +NTAPI +IoStartNextPacket(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN Cancelable) +{ + PKDEVICE_QUEUE_ENTRY Entry; + PIRP Irp; + KIRQL OldIrql; + + /* Acquire the cancel lock if this is cancelable */ + if (Cancelable) IoAcquireCancelSpinLock(&OldIrql); + + /* Clear the current IRP */ + DeviceObject->CurrentIrp = NULL; + + /* Remove an entry from the queue */ + Entry = KeRemoveDeviceQueue(&DeviceObject->DeviceQueue); + if (Entry) + { + /* Get the IRP and set it */ + Irp = CONTAINING_RECORD(Entry, IRP, Tail.Overlay.DeviceQueueEntry); DeviceObject->CurrentIrp = Irp; - DeviceObject->DriverObject->DriverStartIo(DeviceObject,Irp); - } - else - { - DeviceObject->CurrentIrp = NULL; - } + + /* Call the Start I/O Routine */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* Otherwise, release the cancel lock if we had acquired it */ + if (Cancelable) IoReleaseCancelSpinLock(OldIrql); + } } /* * @implemented - * - * FUNCTION: Either call the device's StartIO routine with the packet or, - * if the device is busy, queue it. - * ARGUMENTS: - * DeviceObject = Device to start the packet on - * Irp = Irp to queue - * Key = Where to insert the irp - * If zero then insert in the tail of the queue - * CancelFunction = Optional function to cancel the irqp */ VOID -STDCALL -IoStartPacket(PDEVICE_OBJECT DeviceObject, - PIRP Irp, - PULONG Key, - PDRIVER_CANCEL CancelFunction) -{ - BOOLEAN stat; - KIRQL oldirql; - - DPRINT("IoStartPacket(Irp 0x%p)\n", Irp); - - ASSERT_IRQL(DISPATCH_LEVEL); - - IoAcquireCancelSpinLock(&oldirql); - - if (CancelFunction != NULL) - { - Irp->CancelRoutine = CancelFunction; - } - - if (Key!=0) - { - stat = KeInsertByKeyDeviceQueue(&DeviceObject->DeviceQueue, - &Irp->Tail.Overlay.DeviceQueueEntry, - *Key); - } - else - { - stat = KeInsertDeviceQueue(&DeviceObject->DeviceQueue, - &Irp->Tail.Overlay.DeviceQueueEntry); - } - - - if (!stat) - { - IoReleaseCancelSpinLock(DISPATCH_LEVEL); +NTAPI +IoStartPacket(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PULONG Key, + IN PDRIVER_CANCEL CancelFunction) +{ + BOOLEAN Stat; + KIRQL OldIrql, CancelIrql; + + /* Raise to dispatch level */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + /* Check if we should acquire the cancel lock */ + if (CancelFunction) + { + /* Acquire and set it */ + IoAcquireCancelSpinLock(&CancelIrql); + Irp->CancelRoutine = CancelFunction; + } + + /* Check if we have a key */ + if (Key) + { + /* Insert by key */ + Stat = KeInsertByKeyDeviceQueue(&DeviceObject->DeviceQueue, + &Irp->Tail.Overlay.DeviceQueueEntry, + *Key); + } + else + { + /* Insert without a key */ + Stat = KeInsertDeviceQueue(&DeviceObject->DeviceQueue, + &Irp->Tail.Overlay.DeviceQueueEntry); + } + + /* Check if this was a first insert */ + if (!Stat) + { + /* Set the IRP */ DeviceObject->CurrentIrp = Irp; - DeviceObject->DriverObject->DriverStartIo(DeviceObject,Irp); - if (oldirql < DISPATCH_LEVEL) - { - KeLowerIrql(oldirql); + + /* Release the cancel lock if we had a cancel function */ + if (CancelFunction) IoReleaseCancelSpinLock(CancelIrql); + + /* Call the Start I/O function */ + DeviceObject->DriverObject->DriverStartIo(DeviceObject, Irp); + } + else + { + /* The packet was inserted... check if we have a cancel function */ + if (CancelFunction) + { + /* Check if the IRP got cancelled */ + if (Irp->Cancel) + { + /* + * Set the cancel IRQL, clear the currnet cancel routine and + * call ours + */ + Irp->CancelIrql = CancelIrql; + Irp->CancelRoutine = NULL; + CancelFunction(DeviceObject, Irp); + } + else + { + /* Otherwise, release the lock */ + IoReleaseCancelSpinLock(CancelIrql); + } } - } - else - { - IoReleaseCancelSpinLock(oldirql); - } + } + + /* Return back to previous IRQL */ + KeLowerIrql(OldIrql); } /* EOF */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c Sat Jul 1 22:56:09 2006 @@ -42,6 +42,111 @@ IopGetDeviceNode(PDEVICE_OBJECT DeviceObject) { return ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode; +} + +NTSTATUS +FASTCALL +IopInitializeDevice(PDEVICE_NODE DeviceNode, + PDRIVER_OBJECT DriverObject) +{ + PDEVICE_OBJECT Fdo; + NTSTATUS Status; + BOOLEAN IsPnpDriver = FALSE; + + if (DriverObject->DriverExtension->AddDevice) + { + /* This is a Plug and Play driver */ + DPRINT("Plug and Play driver found\n"); + + ASSERT(DeviceNode->PhysicalDeviceObject); + + DPRINT("Calling driver AddDevice entrypoint at %08lx\n", + DriverObject->DriverExtension->AddDevice); + + IsPnpDriver = !IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER); + Status = DriverObject->DriverExtension->AddDevice( + DriverObject, IsPnpDriver ? DeviceNode->PhysicalDeviceObject : NULL); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if (IsPnpDriver) + { + Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + + if (Fdo == DeviceNode->PhysicalDeviceObject) + { + /* FIXME: What do we do? Unload the driver or just disable the device? */ + DbgPrint("An FDO was not attached\n"); + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return STATUS_UNSUCCESSFUL; + } + + if (Fdo->DeviceType == FILE_DEVICE_ACPI) + { + static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; + + /* There can be only one system power device */ + if (!SystemPowerDeviceNodeCreated) + { + PopSystemPowerDeviceNode = DeviceNode; + SystemPowerDeviceNodeCreated = TRUE; + } + } + + ObDereferenceObject(Fdo); + } + + IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); + IopDeviceNodeSetFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); + } + + return STATUS_SUCCESS; +} + +NTSTATUS +IopStartDevice( + PDEVICE_NODE DeviceNode) +{ + IO_STATUS_BLOCK IoStatusBlock; + IO_STACK_LOCATION Stack; + PDEVICE_OBJECT Fdo; + NTSTATUS Status; + + DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); + + Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; + Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated; + + Status = IopInitiatePnpIrp( + Fdo, + &IoStatusBlock, + IRP_MN_START_DEVICE, + &Stack); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IopInitiatePnpIrp() failed\n"); + } + else + { + if (IopDeviceNodeHasFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY)) + { + DPRINT("Device needs enumeration, invalidating bus relations\n"); + Status = IopInvalidateDeviceRelations(DeviceNode, BusRelations); + IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); + } + } + + ObDereferenceObject(Fdo); + + if (NT_SUCCESS(Status)) + DeviceNode->Flags |= DN_STARTED; + + return Status; } NTSTATUS

1 0

[ion] 22743: - Implement IoRegisterLastchanceShutdownNotification based on IoRegisterShutdownNotification - Modify IoUnregisterShudownNotification to loop both lists now. - Used the lock in IoShutdownREgisteredDevices when looping the list, and changed it to send IRP_MJ_SHUTDOWN to the attached DO. Also fixed a memory leak where the shutdown entry wasn't being freed, and optimized the function only to initialize the event once (And simply clear it each time). - Moved IoSynchronousInvalidateDevic
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sat Jul 1 22:26:22 2006 New Revision: 22743 URL: http://svn.reactos.org/svn/reactos?rev=22743&view=rev Log: - Implement IoRegisterLastchanceShutdownNotification based on IoRegisterShutdownNotification - Modify IoUnregisterShudownNotification to loop both lists now. - Used the lock in IoShutdownREgisteredDevices when looping the list, and changed it to send IRP_MJ_SHUTDOWN to the attached DO. Also fixed a memory leak where the shutdown entry wasn't being freed, and optimized the function only to initialize the event once (And simply clear it each time). - Moved IoSynchronousInvalidateDeviceRelations to PnP Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/pnpmgr.c 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 Sat Jul 1 22:26:22 2006 @@ -594,6 +594,7 @@ ); VOID +NTAPI IoShutdownRegisteredDevices( VOID ); Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sat Jul 1 22:26:22 2006 @@ -16,52 +16,69 @@ /* GLOBALS ********************************************************************/ -static ULONG IopDeviceObjectNumber = 0; +ULONG IopDeviceObjectNumber = 0; typedef struct _SHUTDOWN_ENTRY { - LIST_ENTRY ShutdownList; - PDEVICE_OBJECT DeviceObject; + LIST_ENTRY ShutdownList; + PDEVICE_OBJECT DeviceObject; } SHUTDOWN_ENTRY, *PSHUTDOWN_ENTRY; -LIST_ENTRY ShutdownListHead; +LIST_ENTRY ShutdownListHead, LastChanceShutdownListHead; KSPIN_LOCK ShutdownListLock; /* PRIVATE FUNCTIONS **********************************************************/ VOID +NTAPI IoShutdownRegisteredDevices(VOID) { - PSHUTDOWN_ENTRY ShutdownEntry; - IO_STATUS_BLOCK StatusBlock; - PIRP Irp; - KEVENT Event; - NTSTATUS Status; - - LIST_FOR_EACH(ShutdownEntry, &ShutdownListHead, SHUTDOWN_ENTRY, ShutdownList) - { - KeInitializeEvent (&Event, - NotificationEvent, - FALSE); - - Irp = IoBuildSynchronousFsdRequest (IRP_MJ_SHUTDOWN, - ShutdownEntry->DeviceObject, - NULL, - 0, - NULL, - &Event, - &StatusBlock); - - Status = IoCallDriver (ShutdownEntry->DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject (&Event, - Executive, - KernelMode, - FALSE, - NULL); - } + PLIST_ENTRY ListEntry; + PDEVICE_OBJECT DeviceObject; + PSHUTDOWN_ENTRY ShutdownEntry; + IO_STATUS_BLOCK StatusBlock; + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + + /* Initialize an event to wait on */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Get the first entry and start looping */ + ListEntry = ExInterlockedRemoveHeadList(&ShutdownListHead, + &ShutdownListLock); + while (ListEntry) + { + /* Get the shutdown entry */ + ShutdownEntry = CONTAINING_RECORD(ListEntry, + SHUTDOWN_ENTRY, + ShutdownList); + + /* Get the attached device */ + DeviceObject = IoGetAttachedDevice(ShutdownEntry->DeviceObject); + + /* Build the shutdown IRP and call the driver */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &StatusBlock); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on the driver */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + /* Free the shutdown entry and reset the event */ + ExFreePool(ShutdownEntry); + KeClearEvent(&Event); + + /* Go to the next entry */ + ListEntry = ExInterlockedRemoveHeadList(&ShutdownListHead, + &ShutdownListLock); } } @@ -1097,39 +1114,123 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS -STDCALL +NTAPI IoRegisterLastChanceShutdownNotification(IN PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSHUTDOWN_ENTRY Entry; + + /* Allocate the shutdown entry */ + Entry = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SHUTDOWN_ENTRY), + TAG_SHUTDOWN_ENTRY); + if (!Entry) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set the DO */ + Entry->DeviceObject = DeviceObject; + + /* Insert it into the list */ + ExInterlockedInsertHeadList(&LastChanceShutdownListHead, + &Entry->ShutdownList, + &ShutdownListLock); + + /* Set the shutdown registered flag */ + DeviceObject->Flags |= DO_SHUTDOWN_REGISTERED; + return STATUS_SUCCESS; } /* * @implemented */ NTSTATUS -STDCALL +NTAPI IoRegisterShutdownNotification(PDEVICE_OBJECT DeviceObject) { - PSHUTDOWN_ENTRY Entry; - - Entry = ExAllocatePoolWithTag(NonPagedPool, sizeof(SHUTDOWN_ENTRY), - TAG_SHUTDOWN_ENTRY); - if (Entry == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Entry->DeviceObject = DeviceObject; - - ExInterlockedInsertHeadList(&ShutdownListHead, - &Entry->ShutdownList, - &ShutdownListLock); - - DeviceObject->Flags |= DO_SHUTDOWN_REGISTERED; - - return STATUS_SUCCESS; + PSHUTDOWN_ENTRY Entry; + + /* Allocate the shutdown entry */ + Entry = ExAllocatePoolWithTag(NonPagedPool, + sizeof(SHUTDOWN_ENTRY), + TAG_SHUTDOWN_ENTRY); + if (!Entry) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set the DO */ + Entry->DeviceObject = DeviceObject; + + /* Insert it into the list */ + ExInterlockedInsertHeadList(&ShutdownListHead, + &Entry->ShutdownList, + &ShutdownListLock); + + /* Set the shutdown registered flag */ + DeviceObject->Flags |= DO_SHUTDOWN_REGISTERED; + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +VOID +NTAPI +IoUnregisterShutdownNotification(PDEVICE_OBJECT DeviceObject) +{ + PSHUTDOWN_ENTRY ShutdownEntry; + PLIST_ENTRY NextEntry; + KIRQL OldIrql; + + /* Acquire the shutdown lock and loop the shutdown list */ + KeAcquireSpinLock(&ShutdownListLock, &OldIrql); + NextEntry = ShutdownListHead.Flink; + while (NextEntry != &ShutdownListHead) + { + /* Get the entry */ + ShutdownEntry = CONTAINING_RECORD(NextEntry, + SHUTDOWN_ENTRY, + ShutdownList); + + /* Get if the DO matches */ + if (ShutdownEntry->DeviceObject == DeviceObject) + { + /* Remove it from the list */ + RemoveEntryList(NextEntry); + NextEntry = NextEntry->Blink; + + /* Free the entry */ + ExFreePool(ShutdownEntry); + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Now loop the last chance list */ + NextEntry = LastChanceShutdownListHead.Flink; + while (NextEntry != &LastChanceShutdownListHead) + { + /* Get the entry */ + ShutdownEntry = CONTAINING_RECORD(NextEntry, + SHUTDOWN_ENTRY, + ShutdownList); + + /* Get if the DO matches */ + if (ShutdownEntry->DeviceObject == DeviceObject) + { + /* Remove it from the list */ + RemoveEntryList(NextEntry); + NextEntry = NextEntry->Blink; + + /* Free the entry */ + ExFreePool(ShutdownEntry); + } + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + + /* Now remove the flag */ + DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; } /* @@ -1277,46 +1378,6 @@ { IoReleaseCancelSpinLock(oldirql); } - -} - -/* - * @unimplemented - */ -VOID -STDCALL -IoSynchronousInvalidateDeviceRelations(IN PDEVICE_OBJECT DeviceObject, - IN DEVICE_RELATION_TYPE Type) -{ - UNIMPLEMENTED; -} - -/* - * @implemented - */ -VOID -STDCALL -IoUnregisterShutdownNotification(PDEVICE_OBJECT DeviceObject) -{ - PSHUTDOWN_ENTRY ShutdownEntry, tmp; - KIRQL oldlvl; - - LIST_FOR_EACH_SAFE(ShutdownEntry, tmp, &ShutdownListHead, SHUTDOWN_ENTRY, ShutdownList) - { - - if (ShutdownEntry->DeviceObject == DeviceObject) - { - DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; - - KeAcquireSpinLock(&ShutdownListLock,&oldlvl); - RemoveEntryList(&ShutdownEntry->ShutdownList); - KeReleaseSpinLock(&ShutdownListLock,oldlvl); - - ExFreePool(ShutdownEntry); - return; - } - - } } /* EOF */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c Sat Jul 1 22:26:22 2006 @@ -79,6 +79,17 @@ IN DEVICE_RELATION_TYPE Type) { IopInvalidateDeviceRelations(IopGetDeviceNode(DeviceObject), Type); +} + +/* + * @unimplemented + */ +VOID +STDCALL +IoSynchronousInvalidateDeviceRelations(IN PDEVICE_OBJECT DeviceObject, + IN DEVICE_RELATION_TYPE Type) +{ + UNIMPLEMENTED; } /*

1 0

[janderwald] 22742: * DS_SHELLFONT is an style not an EXSTYLE.
by janderwald＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: janderwald Date: Sat Jul 1 22:04:00 2006 New Revision: 22742 URL: http://svn.reactos.org/svn/reactos?rev=22742&view=rev Log: * DS_SHELLFONT is an style not an EXSTYLE. Modified: trunk/reactos/base/applications/calc/Cz.rc trunk/reactos/base/applications/calc/De.rc trunk/reactos/base/applications/calc/En.rc trunk/reactos/base/applications/calc/Es.rc trunk/reactos/base/applications/calc/Fr.rc trunk/reactos/base/applications/calc/Hu.rc trunk/reactos/base/applications/calc/It.rc trunk/reactos/base/applications/calc/Ja.rc trunk/reactos/base/applications/calc/Nl.rc trunk/reactos/base/applications/calc/Pt.rc trunk/reactos/base/applications/calc/Ru.rc trunk/reactos/base/applications/calc/Sv.rc trunk/reactos/base/applications/calc/Uk.rc trunk/reactos/base/applications/control/control.c trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/solitaire/en.rc trunk/reactos/base/applications/games/winemine/De.rc trunk/reactos/base/applications/games/winemine/En.rc trunk/reactos/base/applications/games/winemine/Fr.rc trunk/reactos/base/applications/games/winemine/Nl.rc trunk/reactos/base/applications/games/winemine/Pl.rc trunk/reactos/base/applications/getfirefox/De.rc trunk/reactos/base/applications/getfirefox/En.rc trunk/reactos/base/applications/getfirefox/Fr.rc trunk/reactos/base/applications/getfirefox/Hu.rc trunk/reactos/base/applications/getfirefox/Nl.rc trunk/reactos/base/applications/getfirefox/Ru.rc trunk/reactos/base/applications/getfirefox/Sv.rc trunk/reactos/base/applications/getfirefox/Uk.rc trunk/reactos/base/applications/ibrowser/De.rc trunk/reactos/base/applications/ibrowser/En.rc trunk/reactos/base/applications/ibrowser/Nl.rc trunk/reactos/base/applications/imagesoft/En.rc trunk/reactos/base/applications/msconfig/De.rc trunk/reactos/base/applications/msconfig/En.rc trunk/reactos/base/applications/msconfig/Fr.rc trunk/reactos/base/applications/msconfig/Hu.rc trunk/reactos/base/applications/msconfig/Nl.rc trunk/reactos/base/applications/msconfig/No.rc trunk/reactos/base/applications/notepad/res/Cs.rc trunk/reactos/base/applications/notepad/res/Da.rc trunk/reactos/base/applications/notepad/res/De.rc trunk/reactos/base/applications/notepad/res/En.rc trunk/reactos/base/applications/notepad/res/Es.rc trunk/reactos/base/applications/notepad/res/Fi.rc trunk/reactos/base/applications/notepad/res/Fr.rc trunk/reactos/base/applications/notepad/res/Gr.rc trunk/reactos/base/applications/notepad/res/Hu.rc trunk/reactos/base/applications/notepad/res/It.rc trunk/reactos/base/applications/notepad/res/Ja.rc trunk/reactos/base/applications/notepad/res/Nl.rc trunk/reactos/base/applications/notepad/res/Pl.rc trunk/reactos/base/applications/notepad/res/Pt.rc trunk/reactos/base/applications/notepad/res/Ru.rc trunk/reactos/base/applications/notepad/res/Si.rc trunk/reactos/base/applications/notepad/res/Sk.rc trunk/reactos/base/applications/notepad/res/Sv.rc trunk/reactos/base/applications/notepad/res/Th.rc trunk/reactos/base/applications/notepad/res/Uk.rc trunk/reactos/base/applications/notepad/res/Wa.rc trunk/reactos/base/applications/notepad/res/Zh.rc trunk/reactos/base/applications/regedit/Cz.rc trunk/reactos/base/applications/regedit/De.rc trunk/reactos/base/applications/regedit/En.rc trunk/reactos/base/applications/regedit/Es.rc trunk/reactos/base/applications/regedit/Fr.rc trunk/reactos/base/applications/regedit/Hu.rc trunk/reactos/base/applications/regedit/It.rc trunk/reactos/base/applications/regedit/Ja.rc trunk/reactos/base/applications/regedit/Nl.rc trunk/reactos/base/applications/regedit/Pl.rc trunk/reactos/base/applications/regedit/Pt.rc trunk/reactos/base/applications/regedit/Ru.rc trunk/reactos/base/applications/regedit/Si.rc trunk/reactos/base/applications/regedit/Sv.rc trunk/reactos/base/applications/reporterror/Ja.rc trunk/reactos/base/applications/reporterror/Nl.rc trunk/reactos/base/applications/reporterror/de.rc trunk/reactos/base/applications/reporterror/dk.rc trunk/reactos/base/applications/reporterror/en.rc trunk/reactos/base/applications/reporterror/hu.rc trunk/reactos/base/applications/reporterror/ru.rc trunk/reactos/base/applications/reporterror/sv.rc trunk/reactos/base/applications/screensavers/matrix/matrix.rc trunk/reactos/base/applications/servman/De.rc trunk/reactos/base/applications/servman/En.rc trunk/reactos/base/applications/servman/Ru.rc trunk/reactos/base/applications/sndvol32/Cz.rc trunk/reactos/base/applications/sndvol32/De.rc trunk/reactos/base/applications/sndvol32/En.rc trunk/reactos/base/applications/sndvol32/Fr.rc trunk/reactos/base/applications/sndvol32/Hu.rc trunk/reactos/base/applications/sndvol32/Ja.rc trunk/reactos/base/applications/sndvol32/Nl.rc trunk/reactos/base/applications/sndvol32/Sv.rc trunk/reactos/base/applications/taskmgr/Cz.rc trunk/reactos/base/applications/taskmgr/De.rc trunk/reactos/base/applications/taskmgr/Dk.rc trunk/reactos/base/applications/taskmgr/En.rc trunk/reactos/base/applications/taskmgr/Es.rc trunk/reactos/base/applications/taskmgr/Fr.rc trunk/reactos/base/applications/taskmgr/Hu.rc trunk/reactos/base/applications/taskmgr/Ja.rc trunk/reactos/base/applications/taskmgr/Nl.rc trunk/reactos/base/applications/taskmgr/Sv.rc trunk/reactos/base/applications/taskmgr/Uk.rc trunk/reactos/base/applications/winefile/Sv.rc trunk/reactos/base/applications/winefile/cs.rc trunk/reactos/base/applications/winefile/de.rc trunk/reactos/base/applications/winefile/en.rc trunk/reactos/base/applications/winefile/es.rc trunk/reactos/base/applications/winefile/fr.rc trunk/reactos/base/applications/winefile/hu.rc trunk/reactos/base/applications/winefile/it.rc trunk/reactos/base/applications/winefile/nl.rc trunk/reactos/base/applications/winefile/pl.rc trunk/reactos/base/applications/winefile/pt.rc trunk/reactos/base/applications/winefile/ru.rc trunk/reactos/base/applications/winefile/si.rc trunk/reactos/base/applications/winefile/zh.rc trunk/reactos/base/applications/wordpad/En.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Cz.… Modified: trunk/reactos/base/applications/calc/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/De.… Modified: trunk/reactos/base/applications/calc/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/En.… Modified: trunk/reactos/base/applications/calc/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Es.… Modified: trunk/reactos/base/applications/calc/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Fr.… Modified: trunk/reactos/base/applications/calc/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Hu.… Modified: trunk/reactos/base/applications/calc/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/It.… Modified: trunk/reactos/base/applications/calc/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Ja.… Modified: trunk/reactos/base/applications/calc/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Nl.… Modified: trunk/reactos/base/applications/calc/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Pt.… Modified: trunk/reactos/base/applications/calc/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Ru.… Modified: trunk/reactos/base/applications/calc/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Sv.… Modified: trunk/reactos/base/applications/calc/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/Uk.… Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Modified: trunk/reactos/base/applications/games/solitaire/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winemine/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/getfirefox/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/getfirefox/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/getfiref… Modified: trunk/reactos/base/applications/ibrowser/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/ibrowser/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/ibrowser/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser… Modified: trunk/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/imagesof… Modified: trunk/reactos/base/applications/msconfig/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/notepad/res/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/res/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/regedit/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/reporterror/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/reporterror/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/reporter… Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/servman/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/servman/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/servman/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/servman/… Modified: trunk/reactos/base/applications/sndvol32/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winefile/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/winefile/zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winefile… Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…

1 0

[ion] 22741: - Use IoGetDevObjExtension and STDCALL->NTAPI. - Fix some bugs in IoGetRelatedDeviceObject: We should make sure that FO_DIRECT_DEVICE_OPEN isn't set when reading from the VPB's DO, otherwise we return the FO's DO directly. Also check for attachment before trying to get any attached device.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sat Jul 1 21:51:45 2006 New Revision: 22741 URL: http://svn.reactos.org/svn/reactos?rev=22741&view=rev Log: - Use IoGetDevObjExtension and STDCALL->NTAPI. - Fix some bugs in IoGetRelatedDeviceObject: We should make sure that FO_DIRECT_DEVICE_OPEN isn't set when reading from the VPB's DO, otherwise we return the FO's DO directly. Also check for attachment before trying to get any attached device. Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sat Jul 1 21:51:45 2006 @@ -954,11 +954,11 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetDeviceAttachmentBaseRef(IN PDEVICE_OBJECT DeviceObject) { /* Return the attached Device */ - return (((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->AttachedTo); + return IoGetDevObjExtension(DeviceObject)->AttachedTo; } /* @@ -968,7 +968,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoGetDeviceObjectPointer(IN PUNICODE_STRING ObjectName, IN ACCESS_MASK DesiredAccess, OUT PFILE_OBJECT *FileObject, @@ -986,8 +986,8 @@ * @implemented */ NTSTATUS -STDCALL -IoGetDiskDeviceObject(IN PDEVICE_OBJECT FileSystemDeviceObject, +NTAPI +IoGetDiskDeviceObject(IN PDEVICE_OBJECT FileSystemDeviceObject, OUT PDEVICE_OBJECT *DiskDeviceObject) { PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; @@ -1001,14 +1001,18 @@ IoAcquireVpbSpinLock(&OldIrql); /* Get the Device Extension */ - DeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)FileSystemDeviceObject->DeviceObjectExtension; + DeviceExtension = IoGetDevObjExtension(FileSystemDeviceObject); /* Make sure this one has a VPB too */ Vpb = DeviceExtension->Vpb; if (!Vpb) return STATUS_INVALID_PARAMETER; - /* Make sure someone it's mounted */ - if ((!Vpb->ReferenceCount) || (Vpb->Flags & VPB_MOUNTED)) return STATUS_VOLUME_DISMOUNTED; + /* Make sure that it's mounted */ + if ((!Vpb->ReferenceCount) || (Vpb->Flags & VPB_MOUNTED)) + { + /* It's not, so return failure */ + return STATUS_VOLUME_DISMOUNTED; + } /* Return the Disk Device Object */ *DiskDeviceObject = Vpb->RealDevice; @@ -1022,13 +1026,14 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetLowerDeviceObject(IN PDEVICE_OBJECT DeviceObject) { - PEXTENDED_DEVOBJ_EXTENSION DeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; PDEVICE_OBJECT LowerDeviceObject = NULL; /* Make sure it's not getting deleted */ + DeviceExtension = IoGetDevObjExtension(DeviceObject); if (DeviceExtension->ExtensionFlags & (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING | @@ -1055,29 +1060,40 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetRelatedDeviceObject(IN PFILE_OBJECT FileObject) { PDEVICE_OBJECT DeviceObject = FileObject->DeviceObject; - /* Get logical volume mounted on a physical/virtual/logical device */ - if (FileObject->Vpb && FileObject->Vpb->DeviceObject) - { + /* Check if we have a VPB with a device object */ + if ((FileObject->Vpb) && (FileObject->Vpb->DeviceObject)) + { + /* Then use the DO from the VPB */ + ASSERT(!(FileObject->Flags & FO_DIRECT_DEVICE_OPEN)); DeviceObject = FileObject->Vpb->DeviceObject; } - - /* - * Check if file object has an associated device object mounted by some - * other file system. - */ - if (FileObject->DeviceObject->Vpb && - FileObject->DeviceObject->Vpb->DeviceObject) - { + else if (!(FileObject->Flags & FO_DIRECT_DEVICE_OPEN) && + (FileObject->DeviceObject->Vpb) && + (FileObject->DeviceObject->Vpb->DeviceObject)) + { + /* The disk device actually has a VPB, so get the DO from there */ DeviceObject = FileObject->DeviceObject->Vpb->DeviceObject; } - - /* Return the highest attached device */ - return IoGetAttachedDevice(DeviceObject); + else + { + /* Otherwise, this was a direct open */ + DeviceObject = FileObject->DeviceObject; + } + + /* Check if we were attached */ + if (DeviceObject->AttachedDevice) + { + /* Return the highest attached device */ + DeviceObject = IoGetAttachedDevice(DeviceObject); + } + + /* Return the DO we found */ + return DeviceObject; } /*

1 0

[ion] 22740: - Add IoGetDevObjExtension for getting the PEXTENDED_DEVOBJ_EXTENSION from a device object instead of always doing a huge typecast. - Implement device unloading through IopUnloadDevice and device referencing through IopReferenceDeviceObject and IopDereferenceDeviceObject, and make IoDeleteDevice and IoDetachDevice unload the device on 0 reference count. Doesn't fully work yet. - Simplify IoGetAttachedDEvice/IoGetAttachedDeviceReference not to use an extra stack variable.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sat Jul 1 21:40:03 2006 New Revision: 22740 URL: http://svn.reactos.org/svn/reactos?rev=22740&view=rev Log: - Add IoGetDevObjExtension for getting the PEXTENDED_DEVOBJ_EXTENSION from a device object instead of always doing a huge typecast. - Implement device unloading through IopUnloadDevice and device referencing through IopReferenceDeviceObject and IopDereferenceDeviceObject, and make IoDeleteDevice and IoDetachDevice unload the device on 0 reference count. Doesn't fully work yet. - Simplify IoGetAttachedDEvice/IoGetAttachedDeviceReference not to use an extra stack variable. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/file.c 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 Sat Jul 1 21:40:03 2006 @@ -79,6 +79,13 @@ (!(FileObject) ? \ FALSE : \ FileObject->Flags & FO_SYNCHRONOUS_IO)) \ + +// +// Returns the internal Device Object Extension +// +#define IoGetDevObjExtension(DeviceObject) \ + ((PEXTENDED_DEVOBJ_EXTENSION) \ + (DeviceObject->DeviceObjectExtension)) \ /* * VOID @@ -176,6 +183,15 @@ (_DeviceNode); \ (_DeviceTreeTraverseContext)->Action = (_Action); \ (_DeviceTreeTraverseContext)->Context = (_Context); } + +// +// Device List Operations +// +typedef enum _IOP_DEVICE_LIST_OPERATION +{ + IopRemove, + IopAdd +} IOP_DEVICE_LIST_OPERATION, *PIOP_DEVICE_LIST_OPERATION; // // Special version of the IRP Overlay used to optimize I/O completion @@ -563,6 +579,12 @@ VOID ); +NTSTATUS +NTAPI +IopReferenceDeviceObject( + IN PDEVICE_OBJECT DeviceObject +); + // // Shutdown routines // Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sat Jul 1 21:40:03 2006 @@ -171,7 +171,7 @@ } NTSTATUS -STDCALL +NTAPI IopGetDeviceObjectPointer(IN PUNICODE_STRING ObjectName, IN ACCESS_MASK DesiredAccess, OUT PFILE_OBJECT *FileObject, @@ -217,6 +217,235 @@ return Status; } +PDEVICE_OBJECT +NTAPI +IopGetLowestDevice(IN PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_OBJECT LowestDevice; + PEXTENDED_DEVOBJ_EXTENSION DeviceExtension; + + /* Get the current device and its extension */ + LowestDevice = DeviceObject; + DeviceExtension = IoGetDevObjExtension(LowestDevice); + + /* Keep looping as long as we're attached */ + while (DeviceExtension->AttachedTo) + { + /* Get the lowest device and its extension */ + LowestDevice = DeviceExtension->AttachedTo; + DeviceExtension = IoGetDevObjExtension(LowestDevice); + } + + /* Return the lowest device */ + return LowestDevice; +} + +VOID +NTAPI +IopEditDeviceList(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT DeviceObject, + IN IOP_DEVICE_LIST_OPERATION Type) +{ + PDEVICE_OBJECT Previous; + + /* Check the type of operation */ + if (Type == IopRemove) + { + /* Get the current device and check if it's the current one */ + Previous = DeviceObject->DriverObject->DeviceObject; + if (Previous == DeviceObject) + { + /* It is, simply unlink this one directly */ + DeviceObject->DriverObject->DeviceObject = + DeviceObject->NextDevice; + } + else + { + /* It's not, so loop until we find the device */ + while (Previous->NextDevice != DeviceObject) + { + /* Not this one, keep moving */ + Previous = Previous->NextDevice; + } + + /* We found it, now unlink us */ + Previous->NextDevice = DeviceObject->NextDevice; + } + } + else + { + /* Link the device object and the driver object */ + DeviceObject->NextDevice = DriverObject->DeviceObject; + DriverObject->DeviceObject = DeviceObject; + } +} + +VOID +NTAPI +IopUnloadDevice(IN PDEVICE_OBJECT DeviceObject) +{ + PDRIVER_OBJECT DriverObject = DeviceObject->DriverObject; + PDEVICE_OBJECT AttachedDeviceObject, LowestDeviceObject; + PEXTENDED_DEVOBJ_EXTENSION ThisExtension, DeviceExtension; + PDEVICE_NODE DeviceNode; + BOOLEAN SafeToUnload = TRUE; + + /* Check if removal is pending */ + ThisExtension = IoGetDevObjExtension(DeviceObject); + if (ThisExtension->ExtensionFlags & DOE_REMOVE_PENDING) + { + /* Get the PDO, extension, and node */ + LowestDeviceObject = IopGetLowestDevice(DeviceObject); + DeviceExtension = IoGetDevObjExtension(LowestDeviceObject); + DeviceNode = DeviceExtension->DeviceNode; + + /* The PDO needs a device node */ + ASSERT(DeviceNode != NULL); + + /* Loop all attached objects */ + AttachedDeviceObject = LowestDeviceObject; + while (AttachedDeviceObject) + { + /* Make sure they're dereferenced */ + if (AttachedDeviceObject->ReferenceCount) return; + AttachedDeviceObject = AttachedDeviceObject->AttachedDevice; + } + + /* Loop all attached objects */ + AttachedDeviceObject = LowestDeviceObject; + while (AttachedDeviceObject) + { + /* Get the device extension */ + DeviceExtension = IoGetDevObjExtension(AttachedDeviceObject); + + /* Remove the pending flag and set processed */ + DeviceExtension->ExtensionFlags &= ~DOE_REMOVE_PENDING; + DeviceExtension->ExtensionFlags |= DOE_REMOVE_PROCESSED; + AttachedDeviceObject = AttachedDeviceObject->AttachedDevice; + } + + /* + * FIXME: TODO HPOUSSIN + * We need to parse/lock the device node, and if we have any pending + * surprise removals, query all relationships and send IRP_MN_REMOVE_ + * _DEVICE to the devices related... + */ + return; + } + + /* Check if deletion is pending */ + if (ThisExtension->ExtensionFlags & DOE_DELETE_PENDING) + { + /* Make sure unload is pending */ + if (!(ThisExtension->ExtensionFlags & DOE_UNLOAD_PENDING) || + (DriverObject->Flags & DRVO_UNLOAD_INVOKED)) + { + /* We can't unload anymore */ + SafeToUnload = FALSE; + } + + /* + * Check if we have an attached device and fail if we're attached + * and still have a reference count. + */ + AttachedDeviceObject = DeviceObject->AttachedDevice; + if ((AttachedDeviceObject) && (DeviceObject->ReferenceCount)) return; + + /* Check if we have a Security Descriptor */ + if (DeviceObject->SecurityDescriptor) + { + /* Free it */ + ExFreePool(DeviceObject->SecurityDescriptor); + } + + /* Remove the device from the list */ + IopEditDeviceList(DeviceObject->DriverObject, DeviceObject, IopRemove); + + /* Dereference the keep-alive */ + ObDereferenceObject(DeviceObject); + + /* If we're not unloading, stop here */ + if (!SafeToUnload) return; + } + + /* Loop all the device objects */ + DeviceObject = DriverObject->DeviceObject; + while (DeviceObject) + { + /* + * Make sure we're not attached, having a reference count + * or already deleting + */ + if ((DeviceObject->ReferenceCount) || + (DeviceObject->AttachedDevice) || + (IoGetDevObjExtension(DeviceObject)->ExtensionFlags & + (DOE_DELETE_PENDING | DOE_REMOVE_PENDING))) + { + /* We're not safe to unload, quit */ + return; + } + + /* Check the next device */ + DeviceObject = DeviceObject->NextDevice; + } + + /* Set the unload invoked flag */ + DriverObject->Flags |= DRVO_UNLOAD_INVOKED; + + /* Unload it */ + if (DriverObject->DriverUnload) DriverObject->DriverUnload(DriverObject); +} + +VOID +NTAPI +IopDereferenceDeviceObject(IN PDEVICE_OBJECT DeviceObject, + IN BOOLEAN ForceUnload) +{ + /* Sanity check */ + ASSERT(DeviceObject->ReferenceCount); + + /* Dereference the device */ + DeviceObject->ReferenceCount--; + + /* + * Check if we can unload it and it's safe to unload (or if we're forcing + * an unload, which is OK too). + */ + if (!(DeviceObject->ReferenceCount) && + ((ForceUnload) || (IoGetDevObjExtension(DeviceObject)->ExtensionFlags & + (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED)))) + { + /* Unload it */ + IopUnloadDevice(DeviceObject); + } +} + +NTSTATUS +NTAPI +IopReferenceDeviceObject(IN PDEVICE_OBJECT DeviceObject) +{ + /* Make sure the object is valid */ + if ((IoGetDevObjExtension(DeviceObject)->ExtensionFlags & + (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED)) || + (DeviceObject->Flags & DO_DEVICE_INITIALIZING)) + { + /* It's unloading or initializing, so fail */ + return STATUS_NO_SUCH_DEVICE; + } + else + { + /* Increase reference count */ + DeviceObject->ReferenceCount++; + return STATUS_SUCCESS; + } +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -238,7 +467,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoAttachDevice(PDEVICE_OBJECT SourceDevice, PUNICODE_STRING TargetDeviceName, PDEVICE_OBJECT *AttachedDevice) @@ -273,7 +502,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoAttachDeviceByPointer(IN PDEVICE_OBJECT SourceDevice, IN PDEVICE_OBJECT TargetDevice) { @@ -295,7 +524,7 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoAttachDeviceToDeviceStack(PDEVICE_OBJECT SourceDevice, PDEVICE_OBJECT TargetDevice) { @@ -315,7 +544,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoAttachDeviceToDeviceStackSafe(IN PDEVICE_OBJECT SourceDevice, IN PDEVICE_OBJECT TargetDevice, OUT PDEVICE_OBJECT *AttachedToDeviceObject) @@ -325,15 +554,14 @@ /* Get the Attached Device and source extension */ AttachedDevice = IoGetAttachedDevice(TargetDevice); - SourceDeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)SourceDevice-> - DeviceObjectExtension; + SourceDeviceExtension = IoGetDevObjExtension(SourceDevice); /* Make sure that it's in a correct state */ - if (!(((PEXTENDED_DEVOBJ_EXTENSION)AttachedDevice->DeviceObjectExtension)-> - ExtensionFlags & (DOE_UNLOAD_PENDING | - DOE_DELETE_PENDING | - DOE_REMOVE_PENDING | - DOE_REMOVE_PROCESSED))) + if (!IoGetDevObjExtension(AttachedDevice)->ExtensionFlags & + (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED)) { /* Update atached device fields */ AttachedDevice->AttachedDevice = SourceDevice; @@ -392,7 +620,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoCreateDevice(IN PDRIVER_OBJECT DriverObject, IN ULONG DeviceExtensionSize, IN PUNICODE_STRING DeviceName, @@ -559,8 +787,7 @@ /* Now do the final linking */ ObReferenceObject(DriverObject); CreatedDeviceObject->DriverObject = DriverObject; - CreatedDeviceObject->NextDevice = DriverObject->DeviceObject; - DriverObject->DeviceObject = CreatedDeviceObject; + IopEditDeviceList(DriverObject, CreatedDeviceObject, IopAdd); /* Close the temporary handle and return to caller */ NtClose(TempHandle); @@ -575,46 +802,39 @@ * @implemented */ VOID -STDCALL -IoDeleteDevice(PDEVICE_OBJECT DeviceObject) -{ - PDEVICE_OBJECT Previous; - - if (DeviceObject->Flags & DO_SHUTDOWN_REGISTERED) - IoUnregisterShutdownNotification(DeviceObject); - - /* Remove the timer if it exists */ - if (DeviceObject->Timer) - { - IopRemoveTimerFromTimerList(DeviceObject->Timer); - ExFreePoolWithTag(DeviceObject->Timer, TAG_IO_TIMER); - } - - /* Remove device from driver device list */ - Previous = DeviceObject->DriverObject->DeviceObject; - if (Previous == DeviceObject) - { - DeviceObject->DriverObject->DeviceObject = DeviceObject->NextDevice; - } - else - { - while (Previous->NextDevice != DeviceObject) - Previous = Previous->NextDevice; - Previous->NextDevice = DeviceObject->NextDevice; - } - - /* I guess this should be removed later... but it shouldn't cause problems */ - ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->ExtensionFlags |= DOE_DELETE_PENDING; - - /* Make the object temporary. This should automatically remove the device - from the namespace */ - ObMakeTemporaryObject(DeviceObject); - - /* Dereference the driver object */ - ObDereferenceObject(DeviceObject->DriverObject); - - /* Remove the keep-alive reference */ - ObDereferenceObject(DeviceObject); +NTAPI +IoDeleteDevice(IN PDEVICE_OBJECT DeviceObject) +{ + PIO_TIMER Timer; + + /* Check if the device is registered for shutdown notifications */ + if (DeviceObject->Flags & DO_SHUTDOWN_REGISTERED) + { + /* Call the shutdown notifications */ + IoUnregisterShutdownNotification(DeviceObject); + } + + /* Check if it has a timer */ + Timer = DeviceObject->Timer; + if (Timer) + { + /* Remove it and free it */ + IopRemoveTimerFromTimerList(Timer); + ExFreePoolWithTag(Timer, TAG_IO_TIMER); + } + + /* Check if the device has a name */ + if (DeviceObject->Flags & DO_DEVICE_HAS_NAME) + { + /* It does, make it temporary so we can remove it */ + ObMakeTemporaryObject(DeviceObject); + } + + /* Set the pending delete flag */ + IoGetDevObjExtension(DeviceObject)->ExtensionFlags |= DOE_DELETE_PENDING; + + /* Check if the device object can be unloaded */ + if (!DeviceObject->ReferenceCount) IopUnloadDevice(DeviceObject); } /* @@ -624,21 +844,28 @@ * @implemented */ VOID -STDCALL -IoDetachDevice(PDEVICE_OBJECT TargetDevice) -{ - DPRINT("IoDetachDevice(TargetDevice 0x%p)\n", TargetDevice); - +NTAPI +IoDetachDevice(IN PDEVICE_OBJECT TargetDevice) +{ /* Remove the attachment */ - ((PEXTENDED_DEVOBJ_EXTENSION)TargetDevice->AttachedDevice->DeviceObjectExtension)->AttachedTo = NULL; + IoGetDevObjExtension(TargetDevice->AttachedDevice)->AttachedTo = NULL; TargetDevice->AttachedDevice = NULL; + + /* Check if it's ok to delete this device */ + if ((IoGetDevObjExtension(TargetDevice)->ExtensionFlags & + (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | DOE_REMOVE_PENDING)) && + !(TargetDevice->ReferenceCount)) + { + /* It is, do it */ + IopUnloadDevice(TargetDevice); + } } /* * @implemented */ NTSTATUS -STDCALL +NTAPI IoEnumerateDeviceObjectList(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT *DeviceObjectList, IN ULONG DeviceObjectListSize, @@ -647,13 +874,8 @@ ULONG ActualDevices = 1; PDEVICE_OBJECT CurrentDevice = DriverObject->DeviceObject; - DPRINT1("IoEnumerateDeviceObjectList\n"); - /* Find out how many devices we'll enumerate */ - while ((CurrentDevice = CurrentDevice->NextDevice)) - { - ActualDevices++; - } + while ((CurrentDevice = CurrentDevice->NextDevice)) ActualDevices++; /* Go back to the first */ CurrentDevice = DriverObject->DeviceObject; @@ -698,19 +920,18 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetAttachedDevice(PDEVICE_OBJECT DeviceObject) { - PDEVICE_OBJECT Current = DeviceObject; - /* Get the last attached device */ - while (Current->AttachedDevice) - { - Current = Current->AttachedDevice; + while (DeviceObject->AttachedDevice) + { + /* Move to the next one */ + DeviceObject = DeviceObject->AttachedDevice; } /* Return it */ - return Current; + return DeviceObject; } /* @@ -720,14 +941,13 @@ * @implemented */ PDEVICE_OBJECT -STDCALL +NTAPI IoGetAttachedDeviceReference(PDEVICE_OBJECT DeviceObject) { - PDEVICE_OBJECT Current = IoGetAttachedDevice(DeviceObject); - - /* Reference the ATtached Device */ - ObReferenceObject(Current); - return Current; + /* Reference the Attached Device */ + DeviceObject = IoGetAttachedDevice(DeviceObject); + ObReferenceObject(DeviceObject); + return DeviceObject; } /* Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=227… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Sat Jul 1 21:40:03 2006 @@ -55,6 +55,9 @@ if (!*RemainingName->Buffer) { DeviceObject = ParseObject; + Status = IopReferenceDeviceObject(DeviceObject); + // fixme: NT wouldn't allow this + //if (!NT_SUCCESS(Status)) return Status;// KEBUGCHECK(0); Status = ObCreateObject(AccessMode, IoFileObjectType, @@ -116,6 +119,9 @@ DeviceObject = OpenPacket->RelatedFileObject->DeviceObject; } + Status = IopReferenceDeviceObject(DeviceObject); + // fixme: NT wouldn't allow this + //if (!NT_SUCCESS(Status)) return Status;// KEBUGCHECK(0); RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer); FileObject->DeviceObject = DeviceObject; *Object = FileObject;

1 0

[greatlrd] 22739: No change in the source code. It if only to test if new slave build server works or not
by greatlrd＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: greatlrd Date: Sat Jul 1 16:08:35 2006 New Revision: 22739 URL: http://svn.reactos.org/svn/reactos?rev=22739&view=rev Log: No change in the source code. It if only to test if new slave build server works or not Modified: trunk/reactos/dll/directx/ddraw/videoport.c Modified: trunk/reactos/dll/directx/ddraw/videoport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/videopor… ============================================================================== --- trunk/reactos/dll/directx/ddraw/videoport.c (original) +++ trunk/reactos/dll/directx/ddraw/videoport.c Sat Jul 1 16:08:35 2006 @@ -17,6 +17,7 @@ Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj) { DX_WINDBG_trace(); + DX_STUB; }

1 0

[janderwald] 22738: move english resource code into own file
by janderwald＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: janderwald Date: Sat Jul 1 13:59:38 2006 New Revision: 22738 URL: http://svn.reactos.org/svn/reactos?rev=22738&view=rev Log: move english resource code into own file Added: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc Added: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/en.rc (added) +++ trunk/reactos/subsystems/win32/csrss/win32csr/en.rc Sat Jul 1 13:59:38 2006 @@ -1,0 +1,26 @@ +IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "End Program - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ending Program... Please wait",IDC_STATIC,7,7,186,11 + CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + 7,20,186,13 + LTEXT "If you choose to end the program immediately, you will lose any unsaved data. To end the program now, click End Now.", + IDC_STATIC,7,40,186,26 + DEFPUSHBUTTON "&End Now",IDC_END_NOW,150,71,43,17 +END + +IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "End Program - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Cancel",IDCANCEL,142,98,43,17 + PUSHBUTTON "&End Now",IDC_END_NOW,78,98,43,17 + LTEXT "This program is not responding",IDC_STATIC,7,7,178,8 + LTEXT "To return to ReactOS and check the status of the program, click Cancel", + IDC_STATIC,7,26,178,16 + LTEXT "If you choose to end the program immediately, you will loose any unsaved data. To end the program now, click End Now", + IDC_STATIC,7,53,178,26 +END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rc Sat Jul 1 13:59:38 2006 @@ -11,29 +11,4 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_END_NOW DIALOG DISCARDABLE 0, 0, 200, 95 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "End Program - " -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Ending Program... Please wait",IDC_STATIC,7,7,186,11 - CONTROL "Progress",IDC_PROGRESS,"msctls_progress32",WS_BORDER, - 7,20,186,13 - LTEXT "If you choose to end the program immediately, you will lose any unsaved data. To end the program now, click End Now.", - IDC_STATIC,7,40,186,26 - DEFPUSHBUTTON "&End Now",IDC_END_NOW,150,71,43,17 -END - -IDD_NOT_RESPONDING DIALOG DISCARDABLE 0, 0, 192, 122 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "End Program - " -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Cancel",IDCANCEL,142,98,43,17 - PUSHBUTTON "&End Now",IDC_END_NOW,78,98,43,17 - LTEXT "This program is not responding",IDC_STATIC,7,7,178,8 - LTEXT "To return to ReactOS and check the status of the program, click Cancel", - IDC_STATIC,7,26,178,16 - LTEXT "If you choose to end the program immediately, you will loose any unsaved data. To end the program now, click End Now", - IDC_STATIC,7,53,178,26 -END +#include "en.rc"

1 0

[tretiakov] 22737: Reduce code dublication
by tretiakov＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: tretiakov Date: Sat Jul 1 10:52:41 2006 New Revision: 22737 URL: http://svn.reactos.org/svn/reactos?rev=22737&view=rev Log: Reduce code dublication Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.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 Sat Jul 1 10:52:41 2006 @@ -178,7 +178,8 @@ INT main() { WCHAR LogPath[MAX_PATH]; - PLOGFILE pLogf; + PLOGFILE pLogf; + INT RetCode = 0; LONG result; HKEY elogKey; @@ -189,15 +190,8 @@ if(MyHeap==NULL) { DPRINT1("FATAL ERROR, can't create heap.\n"); - - DeleteCriticalSection(&LogListCs); - // Close all log files. - for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) - { - LogfClose(pLogf); - } - - return 1; + RetCode = 1; + goto bye_bye; } GetWindowsDirectory(LogPath, MAX_PATH); @@ -217,17 +211,8 @@ if(result != ERROR_SUCCESS) { DPRINT1("Fatal error: can't open eventlog registry key.\n"); - - DeleteCriticalSection(&LogListCs); - - // Close all log files. - for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) - { - LogfClose(pLogf); - } - - HeapDestroy(MyHeap); - return 1; + RetCode = 1; + goto bye_bye; } LoadLogFiles(elogKey); @@ -235,16 +220,16 @@ StartServiceCtrlDispatcher(ServiceTable); +bye_bye: DeleteCriticalSection(&LogListCs); // Close all log files. for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) - { LogfClose(pLogf); - } - HeapDestroy(MyHeap); - return 0; + if(MyHeap) HeapDestroy(MyHeap); + + return RetCode; } VOID EventTimeToSystemTime(DWORD EventTime, Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h (original) +++ trunk/reactos/base/services/eventlog/eventlog.h Sat Jul 1 10:52:41 2006 @@ -140,7 +140,7 @@ ULONG ulNumber, ULONG ulOffset); -DWORD LogfBuildNewRecord(PBYTE Buffer, +PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, DWORD dwRecordNumber, WORD wType, WORD wCategory, @@ -153,6 +153,8 @@ WCHAR *lpStrings, DWORD dwDataSize, LPVOID lpRawData); + +inline void LogfFreeRecord(LPVOID Rec); /* eventlog.c */ VOID PRINT_HEADER(PFILE_HEADER header); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c (original) +++ trunk/reactos/base/services/eventlog/file.c Sat Jul 1 10:52:41 2006 @@ -618,7 +618,7 @@ return TRUE; } -DWORD LogfBuildNewRecord(PBYTE Buffer, +PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, DWORD dwRecordNumber, WORD wType, WORD wCategory, @@ -637,6 +637,7 @@ SYSTEMTIME SysTime; WCHAR *str; UINT i, pos, nStrings; + PBYTE Buffer; dwRecSize = sizeof(EVENTLOGRECORD) + (lstrlenW(ComputerName) + lstrlenW(SourceName) + 2)*sizeof(WCHAR); @@ -654,12 +655,13 @@ if(dwRecSize % 4 != 0) dwRecSize += 4 - (dwRecSize % 4); dwRecSize+=4; + Buffer = HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize); if(!Buffer) { - return dwRecSize; - } - - ZeroMemory(Buffer, dwRecSize); + DPRINT1("Can't allocate heap!\n"); + return NULL; + } + pRec = (PEVENTLOGRECORD)Buffer; pRec->Length = dwRecSize; pRec->Reserved = LOGFILE_SIGNATURE; @@ -711,6 +713,12 @@ if(pos % 4 != 0) pos += 4 - (pos % 4); *((PDWORD)(Buffer+pos)) = dwRecSize; - - return TRUE; -} + + *lpRecSize = dwRecSize; + return Buffer; +} + +inline void LogfFreeRecord(LPVOID Rec) +{ + HeapFree(MyHeap, 0, Rec); +} Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… ============================================================================== --- trunk/reactos/base/services/eventlog/logport.c (original) +++ trunk/reactos/base/services/eventlog/logport.c Sat Jul 1 10:52:41 2006 @@ -120,7 +120,8 @@ IO_ERROR_LPC Request; PIO_ERROR_LOG_MESSAGE Message; PEVENTLOGRECORD pRec; - ULONG ulRecNum, ulRecSize ; + ULONG ulRecNum; + DWORD dwRecSize; NTSTATUS Status; PLOGFILE SystemLog = NULL; @@ -160,7 +161,7 @@ Message = (PIO_ERROR_LOG_MESSAGE)&Request.Message; ulRecNum = SystemLog ? SystemLog->Header.NextRecord : 0; - ulRecSize = LogfBuildNewRecord(NULL, + pRec = (PEVENTLOGRECORD)LogfAllocAndBuildNewRecord(&dwRecSize, ulRecNum, Message->Type, Message->EntryData.EventCategory, @@ -175,30 +176,13 @@ (LPVOID)(((PBYTE)Message) +sizeof(IO_ERROR_LOG_PACKET)-sizeof(ULONG))); - DPRINT("ulRecSize = %d\n", ulRecSize); - - pRec = HeapAlloc(MyHeap, 0, ulRecSize); - if(pRec == NULL) { - DPRINT("Can't allocate heap!\n"); + DPRINT("LogfAllocAndBuildNewRecord failed!\n"); return STATUS_NO_MEMORY; } - - LogfBuildNewRecord((PBYTE)pRec, - ulRecNum, - Message->Type, - Message->EntryData.EventCategory, - Message->EntryData.ErrorCode, - (WCHAR*)(((PBYTE)Message)+Message->DriverNameOffset), - L"MyComputer", /* FIXME */ - 0, - NULL, - Message->EntryData.NumberOfStrings, - (WCHAR*)(((PBYTE)Message)+Message->EntryData.StringOffset), - Message->EntryData.DumpDataSize, - (LPVOID)(((PBYTE)Message) - +sizeof(IO_ERROR_LOG_PACKET)-sizeof(ULONG))); + + DPRINT("dwRecSize = %d\n", dwRecSize); DPRINT("\n --- EVENTLOG RECORD ---\n"); PRINT_RECORD(pRec); @@ -206,12 +190,12 @@ if(!onLiveCD && SystemLog) { - if(!LogfWriteData(SystemLog, ulRecSize, (PBYTE)pRec)) + if(!LogfWriteData(SystemLog, dwRecSize, (PBYTE)pRec)) DPRINT("LogfWriteData failed!\n"); else DPRINT("Data written to Log!\n"); } - HeapFree(MyHeap, 0, pRec); + LogfFreeRecord(pRec); } } return Status;

1 0

[ion] 22736: - IopGetDevicePointer: Close the handle if we were able to acquire it. - IoAttachDevice/IoAttachDeviceByPointer: Fail with STATUS_NO_SUCH_DEVICE if we couldn't attach. - IoAttachDEviceTodEviceStackSafe: VPBs don't get inherited. - IoCreateDevice: Only set OBJ_PERMAMENT if the caller requested it. - IoCreateDevice: Return a NULL Device object if we failed to create it. - IoCreateDevice: Set alignment requirement to 0, x86 doesn't need it.
by ion＠svn.reactos.org 01 Jul '06

01 Jul '06

Author: ion Date: Sat Jul 1 08:21:19 2006 New Revision: 22736 URL: http://svn.reactos.org/svn/reactos?rev=22736&view=rev Log: - IopGetDevicePointer: Close the handle if we were able to acquire it. - IoAttachDevice/IoAttachDeviceByPointer: Fail with STATUS_NO_SUCH_DEVICE if we couldn't attach. - IoAttachDEviceTodEviceStackSafe: VPBs don't get inherited. - IoCreateDevice: Only set OBJ_PERMAMENT if the caller requested it. - IoCreateDevice: Return a NULL Device object if we failed to create it. - IoCreateDevice: Set alignment requirement to 0, x86 doesn't need it. Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Sat Jul 1 08:21:19 2006 @@ -1,11 +1,11 @@ /* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/io/device.c * PURPOSE: Device Object Management, including Notifications and Queues. - * - * PROGRAMMERS: Alex Ionescu - * David Welch (welch(a)cwcom.net) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Filip Navara (navaraf(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -184,10 +184,6 @@ HANDLE FileHandle; NTSTATUS Status; - DPRINT("IoGetDeviceObjectPointer(ObjectName %wZ, DesiredAccess %x," - "FileObject %p DeviceObject %p)\n", - ObjectName, DesiredAccess, FileObject, DeviceObject); - /* Open the Device */ InitializeObjectAttributes(&ObjectAttributes, ObjectName, @@ -200,12 +196,7 @@ &StatusBlock, 0, FILE_NON_DIRECTORY_FILE | AttachFlag); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenFile failed, Status: 0x%x\n", Status); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, @@ -219,10 +210,10 @@ /* Return the requested data */ *DeviceObject = IoGetRelatedDeviceObject(LocalFileObject); *FileObject = LocalFileObject; + ZwClose(FileHandle); } /* Close the handle */ - ZwClose(FileHandle); return Status; } @@ -257,25 +248,22 @@ PDEVICE_OBJECT TargetDevice = NULL; /* Call the helper routine for an attach operation */ - DPRINT("IoAttachDevice\n"); Status = IopGetDeviceObjectPointer(TargetDeviceName, FILE_READ_ATTRIBUTES, &FileObject, &TargetDevice, IO_ATTACH_DEVICE_API); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get Device Object\n"); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Attach the device */ - IoAttachDeviceToDeviceStackSafe(SourceDevice, TargetDevice, AttachedDevice); - - /* Derference it */ + Status = IoAttachDeviceToDeviceStackSafe(SourceDevice, + TargetDevice, + AttachedDevice); + if (!*AttachedDevice) Status = STATUS_NO_SUCH_DEVICE; + + /* Dereference it */ ObDereferenceObject(FileObject); - return STATUS_SUCCESS; + return Status; } /* @@ -292,12 +280,9 @@ PDEVICE_OBJECT AttachedDevice; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("IoAttachDeviceByPointer(SourceDevice 0x%p, TargetDevice 0x%p)\n", - SourceDevice, TargetDevice); - /* Do the Attach */ AttachedDevice = IoAttachDeviceToDeviceStack(SourceDevice, TargetDevice); - if (AttachedDevice == NULL) Status = STATUS_NO_SUCH_DEVICE; + if (!AttachedDevice) Status = STATUS_NO_SUCH_DEVICE; /* Return the status */ return Status; @@ -318,13 +303,11 @@ PDEVICE_OBJECT LocalAttach; /* Attach it safely */ - DPRINT("IoAttachDeviceToDeviceStack\n"); Status = IoAttachDeviceToDeviceStackSafe(SourceDevice, TargetDevice, &LocalAttach); /* Return it */ - DPRINT("IoAttachDeviceToDeviceStack DONE: 0x%p\n", LocalAttach); return LocalAttach; } @@ -340,25 +323,27 @@ PDEVICE_OBJECT AttachedDevice; PEXTENDED_DEVOBJ_EXTENSION SourceDeviceExtension; - DPRINT("IoAttachDeviceToDeviceStack(SourceDevice 0x%p, TargetDevice 0x%p)\n", - SourceDevice, TargetDevice); - /* Get the Attached Device and source extension */ AttachedDevice = IoGetAttachedDevice(TargetDevice); - SourceDeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)SourceDevice->DeviceObjectExtension; + SourceDeviceExtension = (PEXTENDED_DEVOBJ_EXTENSION)SourceDevice-> + DeviceObjectExtension; /* Make sure that it's in a correct state */ - if (!(((PEXTENDED_DEVOBJ_EXTENSION)AttachedDevice->DeviceObjectExtension)->ExtensionFlags & - (DOE_UNLOAD_PENDING | DOE_DELETE_PENDING | - DOE_REMOVE_PENDING | DOE_REMOVE_PROCESSED))) - { - /* Update fields */ + if (!(((PEXTENDED_DEVOBJ_EXTENSION)AttachedDevice->DeviceObjectExtension)-> + ExtensionFlags & (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED))) + { + /* Update atached device fields */ AttachedDevice->AttachedDevice = SourceDevice; - SourceDevice->AttachedDevice = NULL; + AttachedDevice->Spare1++; + + /* Update the source with the attached data */ SourceDevice->StackSize = AttachedDevice->StackSize + 1; - SourceDevice->AlignmentRequirement = AttachedDevice->AlignmentRequirement; + SourceDevice->AlignmentRequirement = AttachedDevice-> + AlignmentRequirement; SourceDevice->SectorSize = AttachedDevice->SectorSize; - SourceDevice->Vpb = AttachedDevice->Vpb; /* Set the attachment in the device extension */ SourceDeviceExtension->AttachedTo = AttachedDevice; @@ -408,13 +393,13 @@ */ NTSTATUS STDCALL -IoCreateDevice(PDRIVER_OBJECT DriverObject, - ULONG DeviceExtensionSize, - PUNICODE_STRING DeviceName, - DEVICE_TYPE DeviceType, - ULONG DeviceCharacteristics, - BOOLEAN Exclusive, - PDEVICE_OBJECT *DeviceObject) +IoCreateDevice(IN PDRIVER_OBJECT DriverObject, + IN ULONG DeviceExtensionSize, + IN PUNICODE_STRING DeviceName, + IN DEVICE_TYPE DeviceType, + IN ULONG DeviceCharacteristics, + IN BOOLEAN Exclusive, + OUT PDEVICE_OBJECT *DeviceObject) { WCHAR AutoNameBuffer[20]; UNICODE_STRING AutoName; @@ -425,16 +410,17 @@ ULONG AlignedDeviceExtensionSize; ULONG TotalSize; HANDLE TempHandle; - - ASSERT_IRQL(PASSIVE_LEVEL); - DPRINT("IoCreateDevice(DriverObject 0x%p)\n", DriverObject); - - /* Generate a name if we have to */ + PAGED_CODE(); + + /* Check if we have to generate a name */ if (DeviceCharacteristics & FILE_AUTOGENERATED_DEVICE_NAME) { + /* Generate it */ swprintf(AutoNameBuffer, L"\\Device\\%08lx", InterlockedIncrementUL(&IopDeviceObjectNumber)); + + /* Initialize the name */ RtlInitUnicodeString(&AutoName, AutoNameBuffer); DeviceName = &AutoName; } @@ -443,24 +429,21 @@ InitializeObjectAttributes(&ObjectAttributes, DeviceName, 0, NULL, NULL); /* Honor exclusive flag */ - ObjectAttributes.Attributes |= OBJ_EXCLUSIVE; + if (Exclusive) ObjectAttributes.Attributes |= OBJ_EXCLUSIVE; /* Create a permanent object for named devices */ - if (DeviceName != NULL) - { - ObjectAttributes.Attributes |= OBJ_PERMANENT; - } + if (DeviceName) ObjectAttributes.Attributes |= OBJ_PERMANENT; /* Align the Extension Size to 8-bytes */ AlignedDeviceExtensionSize = (DeviceExtensionSize + 7) &~ 7; - DPRINT("AlignedDeviceExtensionSize %x\n", AlignedDeviceExtensionSize); /* Total Size */ TotalSize = AlignedDeviceExtensionSize + - sizeof(DEVICE_OBJECT) + sizeof(EXTENDED_DEVOBJ_EXTENSION); - DPRINT("TotalSize %x\n", TotalSize); + sizeof(DEVICE_OBJECT) + + sizeof(EXTENDED_DEVOBJ_EXTENSION); /* Create the Device Object */ + *DeviceObject = NULL; Status = ObCreateObject(KernelMode, IoDeviceObjectType, &ObjectAttributes, @@ -470,16 +453,10 @@ 0, 0, (PVOID*)&CreatedDeviceObject); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoCreateDevice() ObCreateObject failed, status: 0x%08X\n", Status); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Clear the whole Object and extension so we don't null stuff manually */ RtlZeroMemory(CreatedDeviceObject, TotalSize); - DPRINT("CreatedDeviceObject 0x%p\n", CreatedDeviceObject); /* * Setup the Type and Size. Note that we don't use the aligned size, @@ -494,7 +471,6 @@ AlignedDeviceExtensionSize); /* Set the Type and Size. Question: why is Size 0 on Windows? */ - DPRINT("DeviceObjectExtension 0x%p\n", DeviceObjectExtension); DeviceObjectExtension->Type = IO_TYPE_DEVICE_OBJECT_EXTENSION; DeviceObjectExtension->Size = 0; @@ -509,10 +485,9 @@ CreatedDeviceObject + 1 : NULL; CreatedDeviceObject->StackSize = 1; - CreatedDeviceObject->AlignmentRequirement = 1; /* FIXME */ + CreatedDeviceObject->AlignmentRequirement = 0; /* Set the Flags */ - /* FIXME: After the Driver is Loaded, the flag below should be removed */ CreatedDeviceObject->Flags = DO_DEVICE_INITIALIZING; if (Exclusive) CreatedDeviceObject->Flags |= DO_EXCLUSIVE; if (DeviceName) CreatedDeviceObject->Flags |= DO_DEVICE_HAS_NAME; @@ -535,15 +510,20 @@ /* Set the right Sector Size */ switch (DeviceType) { + /* All disk systems */ case FILE_DEVICE_DISK_FILE_SYSTEM: case FILE_DEVICE_DISK: case FILE_DEVICE_VIRTUAL_DISK: + + /* The default is 512 bytes */ CreatedDeviceObject->SectorSize = 512; break; + /* CD-ROM file systems */ case FILE_DEVICE_CD_ROM_FILE_SYSTEM: + + /* The default is 2048 bytes */ CreatedDeviceObject->SectorSize = 2048; - break; } /* Create the Device Queue */ @@ -569,11 +549,9 @@ 1, (PVOID*)&CreatedDeviceObject, &TempHandle); - if (!NT_SUCCESS(Status)) { - DPRINT1("Cannot insert Device Object '%wZ' into Handle Table (status 0x%08lx)\n", - DeviceName, Status); + /* Clear the device object and fail */ *DeviceObject = NULL; return Status; } @@ -583,9 +561,9 @@ CreatedDeviceObject->DriverObject = DriverObject; CreatedDeviceObject->NextDevice = DriverObject->DeviceObject; DriverObject->DeviceObject = CreatedDeviceObject; + + /* Close the temporary handle and return to caller */ NtClose(TempHandle); - - /* Return to caller */ *DeviceObject = CreatedDeviceObject; return STATUS_SUCCESS; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006