Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[jgardou] 46846: completely revert 46733
by jgardou＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: jgardou Date: Sun Apr 11 23:32:53 2010 New Revision: 46846 URL: http://svn.reactos.org/svn/reactos?rev=46846&view=rev Log: completely revert 46733 Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sun Apr 11 23:32:53 2010 @@ -176,9 +176,12 @@ /* Acquire shared PDEV lock */ EngAcquireSemaphoreShared(pdc->ppdev->hsemDevLock); - /* Assign Surface */ - pdc->dclevel.pSurface = PDEVOBJ_pSurface(pdc->ppdev); - + /* Update Surface if needed */ + if(pdc->dclevel.pSurface != pdc->ppdev->pSurface) + { + if(pdc->dclevel.pSurface) SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); + pdc->dclevel.pSurface = PDEVOBJ_pSurface(pdc->ppdev); + } } return pdc; } @@ -189,8 +192,6 @@ { if(pdc->dctype == DCTYPE_DIRECT) { - /* Release surface lock */ - SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); /* Release PDEV lock */ EngReleaseSemaphore(pdc->ppdev->hsemDevLock); } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sun Apr 11 23:32:53 2010 @@ -377,8 +377,7 @@ PATH_Delete(pdc->dclevel.hPath); - /* Ideally, no DC should hold a lock on a surface when being deleted */ - if(pdc->dclevel.pSurface && pdc->dctype != DCTYPE_DIRECT) + if(pdc->dclevel.pSurface) SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); PDEVOBJ_vRelease(pdc->ppdev) ;

1 0

[sir_richard] 46845: [NTOS]: Rename IopBusTypeGuidList to PnpBusTypeGuidList to match Windows 2003 PnP Namespace instead of Windows 2000. [NTOS]: Use PnpBusTypeGuidList->Lock instead of PnpBusTypeGuidListLock. [NTOS]: Implement PipAllocateDeviceNode for setting up device nodes and linking them to a PDO. Only used for Root PnP now. Main ABI change is that allocate in ReactOS right now includes "insert". These will be seperate in the new PnP ABI. [NTOS]: Implement IopInitializePnpServices to repla
by sir_richard＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: sir_richard Date: Sun Apr 11 23:25:50 2010 New Revision: 46845 URL: http://svn.reactos.org/svn/reactos?rev=46845&view=rev Log: [NTOS]: Rename IopBusTypeGuidList to PnpBusTypeGuidList to match Windows 2003 PnP Namespace instead of Windows 2000. [NTOS]: Use PnpBusTypeGuidList->Lock instead of PnpBusTypeGuidListLock. [NTOS]: Implement PipAllocateDeviceNode for setting up device nodes and linking them to a PDO. Only used for Root PnP now. Main ABI change is that allocate in ReactOS right now includes "insert". These will be seperate in the new PnP ABI. [NTOS]: Implement IopInitializePnpServices to replace PnpInit. Mostly the same work is done, but using new PnP ABI. [NTOS]: Implement new helper: IopCreateRegistryKeyEx. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sun Apr 11 23:25:50 2010 @@ -517,8 +517,9 @@ IN PDRIVER_OBJECT DriverObject ); -VOID -PnpInit( +NTSTATUS +NTAPI +IopInitializePlugPlayServices( VOID ); @@ -557,6 +558,12 @@ IN PDEVICE_OBJECT *DeviceObject ); +PDEVICE_NODE +NTAPI +PipAllocateDeviceNode( + IN PDEVICE_OBJECT PhysicalDeviceObject +); + NTSTATUS IopCreateDeviceNode( IN PDEVICE_NODE ParentNode, @@ -644,14 +651,32 @@ NTSTATUS NTAPI -IopGetRegistryValue(IN HANDLE Handle, - IN PWSTR ValueName, - OUT PKEY_VALUE_FULL_INFORMATION *Information); - +IopGetRegistryValue( + IN HANDLE Handle, + IN PWSTR ValueName, + OUT PKEY_VALUE_FULL_INFORMATION *Information +); + +NTSTATUS +NTAPI +IopCreateRegistryKeyEx( + OUT PHANDLE Handle, + IN HANDLE BaseHandle OPTIONAL, + IN PUNICODE_STRING KeyName, + IN ACCESS_MASK DesiredAccess, + IN ULONG CreateOptions, + OUT PULONG Disposition OPTIONAL +); // // PnP Routines // +NTSTATUS +NTAPI +IopUpdateRootKey( + VOID +); + NTSTATUS NTAPI PiInitCacheGroupInformation( @@ -1138,6 +1163,7 @@ // extern POBJECT_TYPE IoCompletionType; extern PDEVICE_NODE IopRootDeviceNode; +extern KSPIN_LOCK IopDeviceTreeLock; extern ULONG IopTraceLevel; extern GENERAL_LOOKASIDE IopMdlLookasideList; extern GENERIC_MAPPING IopCompletionMapping; @@ -1147,6 +1173,8 @@ extern LIST_ENTRY IopErrorLogListHead; extern ULONG IopNumTriageDumpDataBlocks; extern PVOID IopTriageDumpDataBlocks[64]; +extern PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList; +extern PDRIVER_OBJECT IopRootDriverObject; // // Inlined Functions Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Sun Apr 11 23:25:50 2010 @@ -488,10 +488,7 @@ if (!IopCreateRootDirectories()) return FALSE; /* Initialize PnP manager */ - PnpInit(); - - /* Setup the group cache */ - if (!NT_SUCCESS(PiInitCacheGroupInformation())) return FALSE; + IopInitializePlugPlayServices(); /* Load boot start drivers */ IopInitializeBootDrivers(); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Sun Apr 11 23:25:50 2010 @@ -14,10 +14,33 @@ /* GLOBALS ********************************************************************/ +typedef struct _IOPNP_DEVICE_EXTENSION +{ + PWCHAR CompatibleIdList; + ULONG CompatibleIdListSize; +} IOPNP_DEVICE_EXTENSION, *PIOPNP_DEVICE_EXTENSION; + PUNICODE_STRING PiInitGroupOrderTable; ULONG PiInitGroupOrderTableCount; - +INTERFACE_TYPE PnpDefaultInterfaceType; + /* FUNCTIONS ******************************************************************/ + +INTERFACE_TYPE +NTAPI +IopDetermineDefaultInterfaceType(VOID) +{ + /* FIXME: ReactOS doesn't support MicroChannel yet */ + return Isa; +} + +NTSTATUS +NTAPI +IopInitializeArbiters(VOID) +{ + /* FIXME: TODO */ + return STATUS_SUCCESS; +} NTSTATUS NTAPI @@ -330,4 +353,150 @@ return Status; } +NTSTATUS +NTAPI +IopInitializePlugPlayServices(VOID) +{ + NTSTATUS Status; + ULONG Disposition; + HANDLE KeyHandle, EnumHandle, ParentHandle, TreeHandle; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET"); + PDEVICE_OBJECT Pdo; + + /* Initialize locks and such */ + KeInitializeSpinLock(&IopDeviceTreeLock); + + /* Get the default interface */ + PnpDefaultInterfaceType = IopDetermineDefaultInterfaceType(); + + /* Initialize arbiters */ + Status = IopInitializeArbiters(); + if (!NT_SUCCESS(Status)) return Status; + + /* Setup the group cache */ + Status = PiInitCacheGroupInformation(); + if (!NT_SUCCESS(Status)) return Status; + + /* Open the current control set */ + Status = IopOpenRegistryKeyEx(&KeyHandle, + NULL, + &KeyName, + KEY_ALL_ACCESS); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the enum key */ + RtlInitUnicodeString(&KeyName, REGSTR_KEY_ENUM); + Status = IopCreateRegistryKeyEx(&EnumHandle, + KeyHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if it's a new key */ + if (Disposition == REG_CREATED_NEW_KEY) + { + /* FIXME: DACLs */ + DPRINT1("Need to build DACL\n"); + } + + /* Create the root key */ + ParentHandle = EnumHandle; + RtlInitUnicodeString(&KeyName, REGSTR_KEY_ROOTENUM); + Status = IopCreateRegistryKeyEx(&EnumHandle, + ParentHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + &Disposition); + NtClose(ParentHandle); + if (!NT_SUCCESS(Status)) return Status; + NtClose(EnumHandle); + + /* Open the root key now */ + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\ENUM"); + Status = IopOpenRegistryKeyEx(&EnumHandle, + NULL, + &KeyName, + KEY_ALL_ACCESS); + if (NT_SUCCESS(Status)) + { + /* Create the root dev node */ + RtlInitUnicodeString(&KeyName, REGSTR_VAL_ROOT_DEVNODE); + Status = IopCreateRegistryKeyEx(&TreeHandle, + EnumHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + NULL); + NtClose(EnumHandle); + if (NT_SUCCESS(Status)) NtClose(TreeHandle); + } + + /* Create the root driver */ + Status = IoCreateDriver(NULL, PnpRootDriverEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateDriverObject() failed\n"); + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* Create the root PDO */ + Status = IoCreateDevice(IopRootDriverObject, + sizeof(IOPNP_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + 0, + FALSE, + &Pdo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateDevice() failed\n"); + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* This is a bus enumerated device */ + Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; + + /* Create the root device node */ + IopRootDeviceNode = PipAllocateDeviceNode(Pdo); + + /* Set flags */ + IopRootDeviceNode->Flags |= DNF_STARTED + DNF_PROCESSED + DNF_ENUMERATED + + DNF_MADEUP + DNF_NO_RESOURCE_REQUIRED + + DNF_ADDED; + + /* Create instance path */ + RtlCreateUnicodeString(&IopRootDeviceNode->InstancePath, + REGSTR_VAL_ROOT_DEVNODE); + + /* Call the add device routine */ + IopRootDriverObject->DriverExtension->AddDevice(IopRootDriverObject, + IopRootDeviceNode->PhysicalDeviceObject); + + /* Initialize PnP-Event notification support */ + Status = IopInitPlugPlayEvents(); + if (!NT_SUCCESS(Status)) return Status; + + /* Report the device to the user-mode pnp manager */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &IopRootDeviceNode->InstancePath); + + /* Initialize the Bus Type GUID List */ + PnpBusTypeGuidList = ExAllocatePool(PagedPool, sizeof(IO_BUS_TYPE_GUID_LIST)); + RtlZeroMemory(PnpBusTypeGuidList, sizeof(IO_BUS_TYPE_GUID_LIST)); + ExInitializeFastMutex(&PnpBusTypeGuidList->Lock); + + /* Launch the firmware mapper */ + Status = IopUpdateRootKey(); + if (!NT_SUCCESS(Status)) return Status; + + /* Close the handle to the control set */ + NtClose(KeyHandle); + + /* We made it */ + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Apr 11 23:25:50 2010 @@ -29,8 +29,7 @@ /* DATA **********************************************************************/ PDRIVER_OBJECT IopRootDriverObject; -FAST_MUTEX IopBusTypeGuidListLock; -PIO_BUS_TYPE_GUID_LIST IopBusTypeGuidList = NULL; +PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList = NULL; #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, PnpInit) @@ -340,14 +339,14 @@ PVOID NewList; /* Acquire the lock */ - ExAcquireFastMutex(&IopBusTypeGuidListLock); + ExAcquireFastMutex(&PnpBusTypeGuidList->Lock); /* Loop all entries */ - while (i < IopBusTypeGuidList->GuidCount) + while (i < PnpBusTypeGuidList->GuidCount) { /* Try to find a match */ if (RtlCompareMemory(BusTypeGuid, - &IopBusTypeGuidList->Guids[i], + &PnpBusTypeGuidList->Guids[i], sizeof(GUID)) == sizeof(GUID)) { /* Found it */ @@ -358,43 +357,43 @@ } /* Check if we have to grow the list */ - if (IopBusTypeGuidList->GuidCount) + if (PnpBusTypeGuidList->GuidCount) { /* Calculate the new size */ NewSize = sizeof(IO_BUS_TYPE_GUID_LIST) + - (sizeof(GUID) * IopBusTypeGuidList->GuidCount); + (sizeof(GUID) * PnpBusTypeGuidList->GuidCount); /* Allocate the new copy */ NewList = ExAllocatePool(PagedPool, NewSize); if (!NewList) { /* Fail */ - ExFreePool(IopBusTypeGuidList); + ExFreePool(PnpBusTypeGuidList); goto Quickie; } /* Now copy them, decrease the size too */ NewSize -= sizeof(GUID); - RtlCopyMemory(NewList, IopBusTypeGuidList, NewSize); + RtlCopyMemory(NewList, PnpBusTypeGuidList, NewSize); /* Free the old list */ - ExFreePool(IopBusTypeGuidList); + ExFreePool(PnpBusTypeGuidList); /* Use the new buffer */ - IopBusTypeGuidList = NewList; + PnpBusTypeGuidList = NewList; } /* Copy the new GUID */ - RtlCopyMemory(&IopBusTypeGuidList->Guids[IopBusTypeGuidList->GuidCount], + RtlCopyMemory(&PnpBusTypeGuidList->Guids[PnpBusTypeGuidList->GuidCount], BusTypeGuid, sizeof(GUID)); /* The new entry is the index */ - FoundIndex = (USHORT)IopBusTypeGuidList->GuidCount; - IopBusTypeGuidList->GuidCount++; + FoundIndex = (USHORT)PnpBusTypeGuidList->GuidCount; + PnpBusTypeGuidList->GuidCount++; Quickie: - ExReleaseFastMutex(&IopBusTypeGuidListLock); + ExReleaseFastMutex(&PnpBusTypeGuidList->Lock); return FoundIndex; } @@ -1671,7 +1670,7 @@ { PIO_RESOURCE_LIST ResList = &RequirementsList->List[i]; Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) - + ResList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + + ResList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); } *ResourceList = ExAllocatePool(PagedPool, Size); @@ -1821,8 +1820,8 @@ for (i = 0; i < DeviceNode->BootResources->Count; i++) { pPartialResourceList = &DeviceNode->BootResources->List[i].PartialResourceList; - Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) - + pPartialResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) + + pPartialResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); for (j = 0; j < pPartialResourceList->Count; j++) { if (pPartialResourceList->PartialDescriptors[j].Type == CmResourceTypeDeviceSpecific) @@ -1865,8 +1864,8 @@ for (i = 0; i < DeviceNode->ResourceList->Count; i++) { pPartialResourceList = &DeviceNode->ResourceList->List[i].PartialResourceList; - Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) - + pPartialResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) + + pPartialResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); } Status = IopDetectResourceConflict(DeviceNode->ResourceList, FALSE, NULL); @@ -3153,7 +3152,7 @@ BootResourcesLength = pValueInformation->DataLength; else BootResourcesLength = ParentBootResourcesLength - + pValueInformation->DataLength + + pValueInformation->DataLength - Header; BootResources = ExAllocatePool(PagedPool, BootResourcesLength); if (!BootResources) @@ -3585,7 +3584,8 @@ #endif } -static NTSTATUS INIT_FUNCTION +NTSTATUS +NTAPI IopUpdateRootKey(VOID) { UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); @@ -3694,6 +3694,131 @@ NTSTATUS NTAPI +IopCreateRegistryKeyEx(OUT PHANDLE Handle, + IN HANDLE RootHandle OPTIONAL, + IN PUNICODE_STRING KeyName, + IN ACCESS_MASK DesiredAccess, + IN ULONG CreateOptions, + OUT PULONG Disposition OPTIONAL) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG KeyDisposition, RootHandleIndex = 0, i = 1, NestedCloseLevel = 0, Length; + HANDLE HandleArray[2]; + BOOLEAN Recursing = TRUE; + PWCHAR pp, p, p1; + UNICODE_STRING KeyString; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* P1 is start, pp is end */ + p1 = KeyName->Buffer; + pp = (PVOID)((ULONG_PTR)p1 + KeyName->Length); + + /* Create the target key */ + InitializeObjectAttributes(&ObjectAttributes, + KeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + RootHandle, + NULL); + Status = ZwCreateKey(&HandleArray[i], + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + CreateOptions, + &KeyDisposition); + + /* Now we check if this failed */ + if ((Status == STATUS_OBJECT_NAME_NOT_FOUND) && (RootHandle)) + { + /* Target key failed, so we'll need to create its parent. Setup array */ + HandleArray[0] = NULL; + HandleArray[1] = RootHandle; + + /* Keep recursing for each missing parent */ + while (Recursing) + { + /* And if we're deep enough, close the last handle */ + if (NestedCloseLevel > 1) ZwClose(HandleArray[RootHandleIndex]); + + /* We're setup to ping-pong between the two handle array entries */ + RootHandleIndex = i; + i = (i + 1) & 1; + + /* Clear the one we're attempting to open now */ + HandleArray[i] = NULL; + + /* Process the parent key name */ + for (p = p1; ((p < pp) && (*p != OBJ_NAME_PATH_SEPARATOR)); p++); + Length = (p - p1) * sizeof(WCHAR); + + /* Is there a parent name? */ + if (Length) + { + /* Build the unicode string for it */ + KeyString.Buffer = p1; + KeyString.Length = KeyString.MaximumLength = Length; + + /* Now try opening the parent */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyString, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + HandleArray[RootHandleIndex], + NULL); + Status = ZwCreateKey(&HandleArray[i], + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + CreateOptions, + &KeyDisposition); + if (NT_SUCCESS(Status)) + { + /* It worked, we have one more handle */ + NestedCloseLevel++; + } + else + { + /* Parent key creation failed, abandon loop */ + Recursing = FALSE; + continue; + } + } + else + { + /* We don't have a parent name, probably corrupted key name */ + Status = STATUS_INVALID_PARAMETER; + Recursing = FALSE; + continue; + } + + /* Now see if there's more parents to create */ + p1 = p + 1; + if ((p == pp) || (p1 == pp)) + { + /* We're done, hopefully successfully, so stop */ + Recursing = FALSE; + } + } + + /* Outer loop check for handle nesting that requires closing the top handle */ + if (NestedCloseLevel > 1) ZwClose(HandleArray[RootHandleIndex]); + } + + /* Check if we broke out of the loop due to success */ + if (NT_SUCCESS(Status)) + { + /* Return the target handle (we closed all the parent ones) and disposition */ + *Handle = HandleArray[i]; + if (Disposition) *Disposition = KeyDisposition; + } + + /* Return the success state */ + return Status; +} + +NTSTATUS +NTAPI IopGetRegistryValue(IN HANDLE Handle, IN PWSTR ValueName, OUT PKEY_VALUE_FULL_INFORMATION *Information) @@ -3737,95 +3862,6 @@ return STATUS_SUCCESS; } -static NTSTATUS INIT_FUNCTION -NTAPI -PnpDriverInitializeEmpty(IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath) -{ - return STATUS_SUCCESS; -} - -VOID INIT_FUNCTION -PnpInit(VOID) -{ - PDEVICE_OBJECT Pdo; - NTSTATUS Status; - - DPRINT("PnpInit()\n"); - - KeInitializeSpinLock(&IopDeviceTreeLock); - ExInitializeFastMutex(&IopBusTypeGuidListLock); - - /* Initialize the Bus Type GUID List */ - IopBusTypeGuidList = ExAllocatePool(NonPagedPool, sizeof(IO_BUS_TYPE_GUID_LIST)); - if (!IopBusTypeGuidList) { - DPRINT1("ExAllocatePool() failed\n"); - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, STATUS_NO_MEMORY, 0, 0, 0); - } - - RtlZeroMemory(IopBusTypeGuidList, sizeof(IO_BUS_TYPE_GUID_LIST)); - ExInitializeFastMutex(&IopBusTypeGuidList->Lock); - - /* Initialize PnP-Event notification support */ - Status = IopInitPlugPlayEvents(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopInitPlugPlayEvents() failed\n"); - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - /* - * Create root device node - */ - - Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, NULL, 0, 0, &IopRootDriverObject); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoCreateDriverObject() failed\n"); - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - Status = IoCreateDevice(IopRootDriverObject, 0, NULL, FILE_DEVICE_CONTROLLER, - 0, FALSE, &Pdo); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoCreateDevice() failed\n"); - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - Status = IopCreateDeviceNode(NULL, Pdo, NULL, &IopRootDeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Insufficient resources\n"); - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - if (!RtlCreateUnicodeString(&IopRootDeviceNode->InstancePath, - L"HTREE\\ROOT\\0")) - { - DPRINT1("Failed to create the instance path!\n"); - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, STATUS_NO_MEMORY, 0, 0, 0); - } - - /* Report the device to the user-mode pnp manager */ - IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, - &IopRootDeviceNode->InstancePath); - - IopRootDeviceNode->PhysicalDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE; - PnpRootDriverEntry(IopRootDriverObject, NULL); - IopRootDeviceNode->PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - IopRootDriverObject->DriverExtension->AddDevice( - IopRootDriverObject, - IopRootDeviceNode->PhysicalDeviceObject); - - /* Move information about devices detected by Freeloader to SYSTEM\CurrentControlSet\Root\ */ - Status = IopUpdateRootKey(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopUpdateRootKey() failed\n"); - KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } -} - RTL_GENERIC_COMPARE_RESULTS NTAPI PiCompareInstancePath(IN PRTL_AVL_TABLE Table, @@ -3911,6 +3947,49 @@ KeBugCheck(UNEXPECTED_INITIALIZATION_CALL); return FALSE; } +} + +LONG IopNumberDeviceNodes; + +PDEVICE_NODE +NTAPI +PipAllocateDeviceNode(IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + PDEVICE_NODE DeviceNode; + PAGED_CODE(); + + /* Allocate it */ + DeviceNode = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_NODE), 'donD'); + if (!DeviceNode) return DeviceNode; + + /* Statistics */ + InterlockedIncrement(&IopNumberDeviceNodes); + + /* Set it up */ + RtlZeroMemory(DeviceNode, sizeof(DEVICE_NODE)); + DeviceNode->InterfaceType = InterfaceTypeUndefined; + DeviceNode->BusNumber = -1; + DeviceNode->ChildInterfaceType = InterfaceTypeUndefined; + DeviceNode->ChildBusNumber = -1; + DeviceNode->ChildBusTypeIndex = -1; +// KeInitializeEvent(&DeviceNode->EnumerationMutex, SynchronizationEvent, TRUE); + InitializeListHead(&DeviceNode->DeviceArbiterList); + InitializeListHead(&DeviceNode->DeviceTranslatorList); + InitializeListHead(&DeviceNode->TargetDeviceNotify); + InitializeListHead(&DeviceNode->DockInfo.ListEntry); + InitializeListHead(&DeviceNode->PendedSetInterfaceState); + + /* Check if there is a PDO */ + if (PhysicalDeviceObject) + { + /* Link it and remove the init flag */ + DeviceNode->PhysicalDeviceObject = PhysicalDeviceObject; + ((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode = DeviceNode; + PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + } + + /* Return the node */ + return DeviceNode; } /* PUBLIC FUNCTIONS **********************************************************/ @@ -3953,7 +4032,7 @@ case DevicePropertyBusTypeGuid: /* Sanity check */ if ((DeviceNode->ChildBusTypeIndex != 0xFFFF) && - (DeviceNode->ChildBusTypeIndex < IopBusTypeGuidList->GuidCount)) + (DeviceNode->ChildBusTypeIndex < PnpBusTypeGuidList->GuidCount)) { /* Return the GUID */ *ResultLength = sizeof(GUID); @@ -3966,7 +4045,7 @@ /* Copy the GUID */ RtlCopyMemory(PropertyBuffer, - &(IopBusTypeGuidList->Guids[DeviceNode->ChildBusTypeIndex]), + &(PnpBusTypeGuidList->Guids[DeviceNode->ChildBusTypeIndex]), sizeof(GUID)); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sun Apr 11 23:25:50 2010 @@ -1185,6 +1185,8 @@ { DPRINT("PnpRootDriverEntry(%p %wZ)\n", DriverObject, RegistryPath); + IopRootDriverObject = DriverObject; + DriverObject->DriverExtension->AddDevice = PnpRootAddDevice; DriverObject->MajorFunction[IRP_MJ_PNP] = PnpRootPnpControl;

1 0

[cgutman] 46844: [NTOSKRNL] - Use IopDeviceNodeSetFlag to set the DNF_HAS_BOOT_CONFIG flag - Set DNF_START_FAILED and print a warning if we fail to start a device - Clear the DNF_ASSIGNING_RESOURCES flag before failing - TODO: Release device resources when start fails
by cgutman＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: cgutman Date: Sun Apr 11 19:31:17 2010 New Revision: 46844 URL: http://svn.reactos.org/svn/reactos?rev=46844&view=rev Log: [NTOSKRNL] - Use IopDeviceNodeSetFlag to set the DNF_HAS_BOOT_CONFIG flag - Set DNF_START_FAILED and print a warning if we fail to start a device - Clear the DNF_ASSIGNING_RESOURCES flag before failing - TODO: Release device resources when start fails Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Apr 11 19:31:17 2010 @@ -147,7 +147,7 @@ IO_STACK_LOCATION Stack; ULONG RequiredLength; NTSTATUS Status; - HANDLE InstanceHandle, ControlHandle; + HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE; UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; @@ -162,6 +162,7 @@ if (!NT_SUCCESS(Status) && Status != STATUS_NOT_SUPPORTED) { DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n"); + IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); return Status; } else if (NT_SUCCESS(Status)) @@ -191,6 +192,9 @@ DPRINT("IopAssignDeviceResources() failed (Status 0x%08lx)\n", Status); } IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); + + if (!NT_SUCCESS(Status)) + goto ByeBye; DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; @@ -213,7 +217,9 @@ if (!NT_SUCCESS(Status)) { - DPRINT("IopInitiatePnpIrp() failed\n"); + DPRINT1("IRP_MN_START_DEVICE failed for %wZ\n", &DeviceNode->InstancePath); + IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY); + goto ByeBye; } else { @@ -229,7 +235,7 @@ Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceHandle); if (!NT_SUCCESS(Status)) - return Status; + goto ByeBye; RtlInitUnicodeString(&KeyName, L"Control"); InitializeObjectAttributes(&ObjectAttributes, @@ -239,10 +245,7 @@ NULL); Status = ZwCreateKey(&ControlHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); if (!NT_SUCCESS(Status)) - { - ZwClose(InstanceHandle); - return Status; - } + goto ByeBye; RtlInitUnicodeString(&KeyName, L"ActiveService"); Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, DeviceNode->ServiceName.Buffer, DeviceNode->ServiceName.Length); @@ -254,11 +257,17 @@ DeviceNode->ResourceList, CM_RESOURCE_LIST_SIZE(DeviceNode->ResourceList)); } +ByeBye: if (NT_SUCCESS(Status)) IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); - - ZwClose(ControlHandle); - ZwClose(InstanceHandle); + else + IopDeviceNodeSetFlag(DeviceNode, DNF_START_FAILED); + + if (ControlHandle != INVALID_HANDLE_VALUE) + ZwClose(ControlHandle); + + if (InstanceHandle != INVALID_HANDLE_VALUE) + ZwClose(InstanceHandle); return Status; } @@ -2497,7 +2506,7 @@ { DeviceNode->BootResources = (PCM_RESOURCE_LIST)IoStatusBlock.Information; - DeviceNode->Flags |= DNF_HAS_BOOT_CONFIG; + IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG); } else {

1 0

[cgutman] 46843: [NTOSKRNL] - Don't set the DNF_STARTED flag before calling IopStartDevice
by cgutman＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: cgutman Date: Sun Apr 11 18:23:57 2010 New Revision: 46843 URL: http://svn.reactos.org/svn/reactos?rev=46843&view=rev Log: [NTOSKRNL] - Don't set the DNF_STARTED flag before calling IopStartDevice Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Sun Apr 11 18:23:57 2010 @@ -323,7 +323,6 @@ if (NT_SUCCESS(Status)) { IopAttachFilterDrivers(DeviceNode, FALSE); - IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); Status = IopStartDevice(DeviceNode); }

1 0

[cgutman] 46842: [NTOSKRNL] - Store the allocated resources for reported devices
by cgutman＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: cgutman Date: Sun Apr 11 18:21:29 2010 New Revision: 46842 URL: http://svn.reactos.org/svn/reactos?rev=46842&view=rev Log: [NTOSKRNL] - Store the allocated resources for reported devices Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Sun Apr 11 18:21:29 2010 @@ -266,9 +266,6 @@ /* Write the resource information to the registry */ IopSetDeviceInstanceData(InstanceKey, DeviceNode); - /* Close the instance key handle */ - ZwClose(InstanceKey); - /* If the caller didn't get the resources assigned for us, do it now */ if (!ResourceAssigned) { @@ -278,7 +275,19 @@ { Status = IopTranslateDeviceResources(DeviceNode, RequiredLength); if (NT_SUCCESS(Status)) + { Status = IopUpdateResourceMapForPnPDevice(DeviceNode); + if (NT_SUCCESS(Status) && DeviceNode->ResourceList) + { + RtlInitUnicodeString(&ValueName, L"AllocConfig"); + Status = ZwSetValueKey(InstanceKey, + &ValueName, + 0, + REG_RESOURCE_LIST, + DeviceNode->ResourceList, + CM_RESOURCE_LIST_SIZE(DeviceNode->ResourceList)); + } + } } IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES); @@ -286,9 +295,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("Assigning resources failed: 0x%x\n", Status); + ZwClose(InstanceKey); return Status; } } + + /* Close the instance key handle */ + ZwClose(InstanceKey); /* Report the device's enumeration to umpnpmgr */ IopQueueTargetDeviceEvent(&GUID_DEVICE_ENUMERATED,

1 0

[sir_richard] 46841: [NTOS]: Some PnP ABI refactoring for future patches/work. [NTOS]: Switch to PnP Add Device routine, currently mostly a copy of the original ReactOS code. However, PnP now tries to open all the required registry keys before attempting to start the device. Failures are reported and load cancelled. More work TBD.
by sir_richard＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: sir_richard Date: Sun Apr 11 18:10:49 2010 New Revision: 46841 URL: http://svn.reactos.org/svn/reactos?rev=46841&view=rev Log: [NTOS]: Some PnP ABI refactoring for future patches/work. [NTOS]: Switch to PnP Add Device routine, currently mostly a copy of the original ReactOS code. However, PnP now tries to open all the required registry keys before attempting to start the device. Failures are reported and load cancelled. More work TBD. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c trunk/reactos/ntoskrnl/io/pnpmgr/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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sun Apr 11 18:10:49 2010 @@ -509,6 +509,14 @@ // // PNP Routines // +NTSTATUS +NTAPI +PipCallDriverAddDevice( + IN PDEVICE_NODE DeviceNode, + IN BOOLEAN LoadDriver, + IN PDRIVER_OBJECT DriverObject +); + VOID PnpInit( VOID @@ -563,6 +571,15 @@ ); NTSTATUS +NTAPI +IopSynchronousCall( + IN PDEVICE_OBJECT DeviceObject, + IN PIO_STACK_LOCATION IoStackLocation, + OUT PVOID *Information +); + +NTSTATUS +NTAPI IopInitiatePnpIrp( IN PDEVICE_OBJECT DeviceObject, IN PIO_STATUS_BLOCK IoStatusBlock, @@ -694,6 +711,12 @@ // // Device/Volume Routines // +VOID +NTAPI +IopReadyDeviceObjects( + IN PDRIVER_OBJECT Driver +); + NTSTATUS FASTCALL IopInitializeDevice( Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sun Apr 11 18:10:49 2010 @@ -24,6 +24,24 @@ extern LIST_ENTRY IopTapeFsListHead; /* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +IopReadyDeviceObjects(IN PDRIVER_OBJECT Driver) +{ + PAGED_CODE(); + PDEVICE_OBJECT DeviceObject; + + /* Set the driver as initialized */ + Driver->Flags |= DRVO_INITIALIZED; + DeviceObject = Driver->DeviceObject; + while (DeviceObject) + { + /* Set every device as initialized too */ + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + DeviceObject = DeviceObject->NextDevice; + } +} VOID NTAPI Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sun Apr 11 18:10:49 2010 @@ -438,7 +438,6 @@ UNICODE_STRING RegistryKey; PDRIVER_INITIALIZE DriverEntry; PDRIVER_OBJECT Driver; - PDEVICE_OBJECT DeviceObject; NTSTATUS Status; DriverEntry = ModuleObject->EntryPoint; @@ -495,14 +494,7 @@ } /* Set the driver as initialized */ - Driver->Flags |= DRVO_INITIALIZED; - DeviceObject = Driver->DeviceObject; - while (DeviceObject) - { - /* Set every device as initialized too */ - DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - DeviceObject = DeviceObject->NextDevice; - } + IopReadyDeviceObjects(Driver); if (PnpSystemInit) IopReinitializeDrivers(); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Sun Apr 11 18:10:49 2010 @@ -219,4 +219,116 @@ return i; } +NTSTATUS +NTAPI +PipCallDriverAddDevice(IN PDEVICE_NODE DeviceNode, + IN BOOLEAN LoadDriver, + IN PDRIVER_OBJECT DriverObject) +{ + NTSTATUS Status; + HANDLE EnumRootKey, SubKey, ControlKey, ClassKey, PropertiesKey; + UNICODE_STRING ClassGuid, Properties; + UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT); + UNICODE_STRING ControlClass = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class"); + PKEY_VALUE_FULL_INFORMATION KeyValueInformation = NULL; + PWCHAR Buffer; + + /* Open enumeration root key */ + Status = IopOpenRegistryKeyEx(&EnumRootKey, + NULL, + &EnumRoot, + KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + return Status; + } + + /* Open instance subkey */ + Status = IopOpenRegistryKeyEx(&SubKey, + EnumRootKey, + &DeviceNode->InstancePath, + KEY_READ); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + ZwClose(EnumRootKey); + return Status; + } + + /* Get class GUID */ + Status = IopGetRegistryValue(SubKey, + REGSTR_VAL_CLASSGUID, + &KeyValueInformation); + if (NT_SUCCESS(Status)) + { + /* Convert to unicode string */ + Buffer = (PVOID)((ULONG_PTR)KeyValueInformation + KeyValueInformation->DataOffset); + PnpRegSzToString(Buffer, KeyValueInformation->DataLength, &ClassGuid.Length); + ClassGuid.MaximumLength = KeyValueInformation->DataLength; + ClassGuid.Buffer = Buffer; + + /* Open the key */ + Status = IopOpenRegistryKeyEx(&ControlKey, + NULL, + &ControlClass, + KEY_READ); + if (!NT_SUCCESS(Status)) + { + /* No class key */ + DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + ClassKey = NULL; + } + else + { + /* Open the class key */ + Status = IopOpenRegistryKeyEx(&ClassKey, + ControlKey, + &ClassGuid, + KEY_READ); + ZwClose(ControlKey); + if (!NT_SUCCESS(Status)) + { + /* No class key */ + DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + ClassKey = NULL; + } + } + + /* Check if we made it till here */ + if (ClassKey) + { + /* Get the device properties */ + RtlInitUnicodeString(&Properties, REGSTR_KEY_DEVICE_PROPERTIES); + Status = IopOpenRegistryKeyEx(&PropertiesKey, + ClassKey, + &Properties, + KEY_READ); + if (!NT_SUCCESS(Status)) + { + /* No properties */ + DPRINT("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + PropertiesKey = NULL; + } + } + + /* Free the registry data */ + ExFreePool(KeyValueInformation); + } + + /* Do ReactOS-style setup */ + IopAttachFilterDrivers(DeviceNode, TRUE); + Status = IopInitializeDevice(DeviceNode, DriverObject); + if (NT_SUCCESS(Status)) + { + IopAttachFilterDrivers(DeviceNode, FALSE); + IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + Status = IopStartDevice(DeviceNode); + } + + /* Return status */ + return Status; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Apr 11 18:10:49 2010 @@ -618,69 +618,90 @@ } NTSTATUS -IopInitiatePnpIrp(PDEVICE_OBJECT DeviceObject, - PIO_STATUS_BLOCK IoStatusBlock, - ULONG MinorFunction, - PIO_STACK_LOCATION Stack OPTIONAL) -{ - PDEVICE_OBJECT TopDeviceObject; - PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; - KEVENT Event; - PIRP Irp; - - /* Always call the top of the device stack */ - TopDeviceObject = IoGetAttachedDeviceReference(DeviceObject); - - KeInitializeEvent( - &Event, - NotificationEvent, - FALSE); - - Irp = IoBuildSynchronousFsdRequest( - IRP_MJ_PNP, - TopDeviceObject, - NULL, - 0, - NULL, - &Event, - IoStatusBlock); - - /* PNP IRPs are initialized with a status code of STATUS_NOT_SUPPORTED */ - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - Irp->IoStatus.Information = 0; - - if (MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS) - { - Irp->IoStatus.Information = (ULONG_PTR)Stack->Parameters.FilterResourceRequirements.IoResourceRequirementList; - } - - IrpSp = IoGetNextIrpStackLocation(Irp); - IrpSp->MinorFunction = (UCHAR)MinorFunction; - - if (Stack) - { - RtlCopyMemory(&IrpSp->Parameters, - &Stack->Parameters, - sizeof(Stack->Parameters)); - } - - Status = IoCallDriver(TopDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock->Status; - } - - ObDereferenceObject(TopDeviceObject); - - return Status; -} - +NTAPI +IopSynchronousCall(IN PDEVICE_OBJECT DeviceObject, + IN PIO_STACK_LOCATION IoStackLocation, + OUT PVOID *Information) +{ + PIRP Irp; + PIO_STACK_LOCATION IrpStack; + IO_STATUS_BLOCK IoStatusBlock; + KEVENT Event; + NTSTATUS Status; + PDEVICE_OBJECT TopDeviceObject; + PAGED_CODE(); + + /* Call the top of the device stack */ + TopDeviceObject = IoGetAttachedDeviceReference(DeviceObject); + + /* Allocate an IRP */ + Irp = IoAllocateIrp(TopDeviceObject->StackSize, FALSE); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; + + /* Initialize to failure */ + Irp->IoStatus.Status = IoStatusBlock.Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = IoStatusBlock.Information = 0; + + /* Initialize the event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + + /* Set them up */ + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = &Event; + + /* Queue the IRP */ + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + IoQueueThreadIrp(Irp); + + /* Copy-in the stack */ + IrpStack = IoGetNextIrpStackLocation(Irp); + *IrpStack = *IoStackLocation; + + /* Call the driver */ + Status = IoCallDriver(TopDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for it */ + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + /* Return the information */ + *Information = (PVOID)IoStatusBlock.Information; + return Status; +} + +NTSTATUS +NTAPI +IopInitiatePnpIrp(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG MinorFunction, + IN PIO_STACK_LOCATION Stack OPTIONAL) +{ + IO_STACK_LOCATION IoStackLocation; + + /* Fill out the stack information */ + RtlZeroMemory(&IoStackLocation, sizeof(IO_STACK_LOCATION)); + IoStackLocation.MajorFunction = IRP_MJ_PNP; + IoStackLocation.MinorFunction = MinorFunction; + if (Stack) + { + /* Copy the rest */ + RtlCopyMemory(&IoStackLocation.Parameters, + &Stack->Parameters, + sizeof(Stack->Parameters)); + } + + /* Do the PnP call */ + IoStatusBlock->Status = IopSynchronousCall(DeviceObject, + &IoStackLocation, + (PVOID)&IoStatusBlock->Information); + return IoStatusBlock->Status; +} NTSTATUS IopTraverseDeviceTreeNode(PDEVICETREE_TRAVERSE_CONTEXT Context) @@ -2909,29 +2930,8 @@ /* Driver is loaded and initialized at this point */ if (NT_SUCCESS(Status)) { - /* Attach lower level filter drivers. */ - IopAttachFilterDrivers(DeviceNode, TRUE); - - /* Initialize the function driver for the device node */ - Status = IopInitializeDevice(DeviceNode, DriverObject); - - if (NT_SUCCESS(Status)) - { - /* Attach upper level filter drivers. */ - IopAttachFilterDrivers(DeviceNode, FALSE); - - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopStartDevice(%wZ) failed with status 0x%08x\n", - &DeviceNode->InstancePath, Status); - } - } - else - { - DPRINT1("IopInitializeDevice(%wZ) failed with status 0x%08x\n", - &DeviceNode->InstancePath, Status); - } + /* Initialize the device, including all filters */ + Status = PipCallDriverAddDevice(DeviceNode, FALSE, DriverObject); } else {

1 0

[cgutman] 46840: [NTOSKRNL] - Make legacy device keys volatile
by cgutman＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: cgutman Date: Sun Apr 11 18:08:20 2010 New Revision: 46840 URL: http://svn.reactos.org/svn/reactos?rev=46840&view=rev Log: [NTOSKRNL] - Make legacy device keys volatile Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Apr 11 18:08:20 2010 @@ -63,6 +63,7 @@ NTSTATUS NTAPI IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath, + IN ULONG CreateOptions, OUT PHANDLE Handle); PDEVICE_NODE @@ -226,7 +227,7 @@ } } - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceHandle); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceHandle); if (!NT_SUCCESS(Status)) return Status; @@ -458,7 +459,7 @@ } /* Create the device key for legacy drivers */ - Status = IopCreateDeviceKeyPath(&Node->InstancePath, &InstanceHandle); + Status = IopCreateDeviceKeyPath(&Node->InstancePath, REG_OPTION_VOLATILE, &InstanceHandle); if (!NT_SUCCESS(Status)) { ZwClose(InstanceHandle); @@ -761,6 +762,7 @@ NTSTATUS NTAPI IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath, + IN ULONG CreateOptions, OUT PHANDLE Handle) { UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT); @@ -811,7 +813,7 @@ &ObjectAttributes, 0, NULL, - 0, + CreateOptions, NULL); /* Close parent key handle, we don't need it anymore */ @@ -2244,7 +2246,7 @@ /* * Create registry key for the instance id, if it doesn't exist yet */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Sun Apr 11 18:08:20 2010 @@ -15,6 +15,7 @@ NTSTATUS NTAPI IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath, + IN ULONG CreateOptions, OUT PHANDLE Handle); NTSTATUS @@ -196,7 +197,7 @@ IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); /* Open a handle to the instance path key */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey); + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); if (!NT_SUCCESS(Status)) return Status; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sun Apr 11 18:08:20 2010 @@ -172,7 +172,7 @@ if (NT_SUCCESS(Status)) { InitializeObjectAttributes(&ObjectAttributes, &Device->DeviceID, OBJ_CASE_INSENSITIVE, EnumHandle, NULL); - Status = ZwCreateKey(&DeviceKeyHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, 0, NULL); + Status = ZwCreateKey(&DeviceKeyHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); ZwClose(EnumHandle); }

1 0

[sserapion] 46839: Gross hack to work around broken autoexport.
by sserapion＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: sserapion Date: Sun Apr 11 15:14:55 2010 New Revision: 46839 URL: http://svn.reactos.org/svn/reactos?rev=46839&view=rev Log: Gross hack to work around broken autoexport. Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild [iso-8859-1] Sun Apr 11 15:14:55 2010 @@ -5,6 +5,10 @@ <include base="notifyhook">.</include> <define name="_NOTIFYHOOK_IMPL" /> <library>user32</library> + <if property="ARCH" value="amd64"> +  + <define name="dllexport">aligned(1)</define> + </if> <file>notifyhook.c</file> <file>notifyhook.rc</file> </module>

1 0

[sserapion] 46838: Fix ntdll linkage
by sserapion＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: sserapion Date: Sun Apr 11 15:11:31 2010 New Revision: 46838 URL: http://svn.reactos.org/svn/reactos?rev=46838&view=rev Log: Fix ntdll linkage Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/slist.S [iso-8859-1] Sun Apr 11 15:11:31 2010 @@ -43,6 +43,10 @@ PUBLIC ExpInterlockedPushEntrySList PUBLIC ExpInterlockedFlushSList +PUBLIC RtlInterlockedFlushSList +PUBLIC RtlInterlockedPopEntrySList +PUBLIC RtlInterlockedPushEntrySList + /* PSLIST_ENTRY * NTAPI * RtlInterlockedPopEntrySList(

1 0

[fireball] 46837: [ISAPNP] - Comment it out from the bootloader. - Remove it from machine.inf. - This "driver" introduces significant delay at every boot due to i/o space scanning every time at every boot, however there is no real benefit (it always fails). Inclusion of this driver into default boot process might be reconsidered only after it starts providing some advantages. For now please test this driver in your own working copies.
by fireball＠svn.reactos.org 11 Apr '10

11 Apr '10

Author: fireball Date: Sun Apr 11 14:18:27 2010 New Revision: 46837 URL: http://svn.reactos.org/svn/reactos?rev=46837&view=rev Log: [ISAPNP] - Comment it out from the bootloader. - Remove it from machine.inf. - This "driver" introduces significant delay at every boot due to i/o space scanning every time at every boot, however there is no real benefit (it always fails). Inclusion of this driver into default boot process might be reconsidered only after it starts providing some advantages. For now please test this driver in your own working copies. Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Apr 11 14:18:27 2010 @@ -37,10 +37,10 @@ ext2.sys=,,,,,,x,,,,,,4 [HardwareIdsDatabase] -*PNP0A00 = isapnp +;*PNP0A00 = isapnp *PNP0A03 = pci *PNP0C08 = acpi -PCI\CC_0601 = isapnp +;PCI\CC_0601 = isapnp PCI\CC_0604 = pci [BootBusExtenders.Load] Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available.

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
44
Older →

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 April 2010