Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 30981: - Build with "char" being "unsigned" by default, fixes MS's CRT assert.
by fireball＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: fireball Date: Mon Dec 3 13:07:55 2007 New Revision: 30981 URL: http://svn.reactos.org/svn/reactos?rev=30981&view=rev Log: - Build with "char" being "unsigned" by default, fixes MS's CRT assert. Modified: trunk/reactos/tools/rbuild/rbuild.vcproj Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj Mon Dec 3 13:07:55 2007 @@ -136,6 +136,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST" BasicRuntimeChecks="3" RuntimeLibrary="1" + DefaultCharIsUnsigned="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\Debug/rbuild.pch" AssemblerListingLocation=".\Debug/"

1 0

[fireball] 30980: - Don't try to perform "mkdir Z:" (where Z: is your ROS_INSTALL target disk), that's meaningless. Fixes an exception when built with MSVC.
by fireball＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: fireball Date: Mon Dec 3 12:56:11 2007 New Revision: 30980 URL: http://svn.reactos.org/svn/reactos?rev=30980&view=rev Log: - Don't try to perform "mkdir Z:" (where Z: is your ROS_INSTALL target disk), that's meaningless. Fixes an exception when built with MSVC. Modified: trunk/reactos/tools/rbuild/directory.cpp Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Mon Dec 3 12:56:11 2007 @@ -125,6 +125,7 @@ if ( isalpha ( path[0] ) && path[1] == ':' && path[2] == cSep ) { nextIndex = path.find ( cSep, 3); + index = path.find ( cSep ); } else nextIndex = path.find ( cSep );

1 0

[hpoussin] 30979: Implement IoForwardIrpSynchronously Use it in root bus
by hpoussin＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: hpoussin Date: Mon Dec 3 12:03:38 2007 New Revision: 30979 URL: http://svn.reactos.org/svn/reactos?rev=30979&view=rev Log: Implement IoForwardIrpSynchronously Use it in root bus Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c Mon Dec 3 12:03:38 2007 @@ -1411,16 +1411,56 @@ } } -/* - * @unimplemented +NTSTATUS +NTAPI +IopSynchronousCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +/* + * @implemented */ BOOLEAN NTAPI IoForwardIrpSynchronously(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - return FALSE; + KEVENT Event; + NTSTATUS Status; + + /* Check if next stack location is available */ + if (Irp->CurrentLocation < Irp->StackCount) + { + /* No more stack location */ + return FALSE; + } + + /* Initialize event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Copy stack location for next driver */ + IoCopyCurrentIrpStackLocationToNext(Irp); + + /* Set a completion routine, which will signal the event */ + IoSetCompletionRoutine(Irp, IopSynchronousCompletion, &Event, TRUE, TRUE, TRUE); + + /* Call next driver */ + Status = IoCallDriver(DeviceObject, Irp); + + /* Check if irp is pending */ + if (Status == STATUS_PENDING) + { + /* Yes, wait for its completion */ + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + } + + return TRUE; } /* 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 (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Mon Dec 3 12:03:38 2007 @@ -226,48 +226,6 @@ return Status; } -static NTSTATUS STDCALL -ForwardIrpAndWaitCompletion( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - if (Irp->PendingReturned) - KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -static NTSTATUS -ForwardIrpAndWait( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PDEVICE_OBJECT LowerDevice; - KEVENT Event; - NTSTATUS Status; - - ASSERT(((PPNPROOT_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO); - LowerDevice = ((PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Ldo; - - ASSERT(LowerDevice); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); - - DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); - - Status = IoCallDriver(LowerDevice, Irp); - if (Status == STATUS_PENDING) - { - Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); - if (NT_SUCCESS(Status)) - Status = Irp->IoStatus.Status; - } - - return Status; -} - static NTSTATUS NTAPI QueryStringCallback( IN PWSTR ValueName, @@ -702,10 +660,14 @@ case IRP_MN_START_DEVICE: DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) - DeviceExtension->State = dsStarted; - Status = STATUS_SUCCESS; + if (!IoForwardIrpSynchronously(DeviceExtension->Ldo, Irp)) + Status = STATUS_UNSUCCESSFUL; + else + { + Status = Irp->IoStatus.Status; + if (NT_SUCCESS(Status)) + DeviceExtension->State = dsStarted; + } break; case IRP_MN_STOP_DEVICE:

1 0

[hpoussin] 30978: [FORMATTING] Fix indentation, no code change
by hpoussin＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: hpoussin Date: Mon Dec 3 11:25:54 2007 New Revision: 30978 URL: http://svn.reactos.org/svn/reactos?rev=30978&view=rev Log: [FORMATTING] Fix indentation, no code change Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c 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 (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Mon Dec 3 11:25:54 2007 @@ -22,69 +22,69 @@ typedef struct _PNPROOT_DEVICE { - // Entry on device list - LIST_ENTRY ListEntry; - // Physical Device Object of device - PDEVICE_OBJECT Pdo; - // Device ID - UNICODE_STRING DeviceID; - // Instance ID - UNICODE_STRING InstanceID; - // Device description - UNICODE_STRING DeviceDescription; - // Resource requirement list - PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirementsList; - ULONG ResourceRequirementsListSize; - // Associated resource list - PCM_RESOURCE_LIST ResourceList; - ULONG ResourceListSize; + // Entry on device list + LIST_ENTRY ListEntry; + // Physical Device Object of device + PDEVICE_OBJECT Pdo; + // Device ID + UNICODE_STRING DeviceID; + // Instance ID + UNICODE_STRING InstanceID; + // Device description + UNICODE_STRING DeviceDescription; + // Resource requirement list + PIO_RESOURCE_REQUIREMENTS_LIST ResourceRequirementsList; + ULONG ResourceRequirementsListSize; + // Associated resource list + PCM_RESOURCE_LIST ResourceList; + ULONG ResourceListSize; } PNPROOT_DEVICE, *PPNPROOT_DEVICE; typedef enum { - dsStopped, - dsStarted, - dsPaused, - dsRemoved, - dsSurpriseRemoved + dsStopped, + dsStarted, + dsPaused, + dsRemoved, + dsSurpriseRemoved } PNPROOT_DEVICE_STATE; typedef struct _PNPROOT_COMMON_DEVICE_EXTENSION { - // Wether this device extension is for an FDO or PDO - BOOLEAN IsFDO; + // Wether this device extension is for an FDO or PDO + BOOLEAN IsFDO; } PNPROOT_COMMON_DEVICE_EXTENSION, *PPNPROOT_COMMON_DEVICE_EXTENSION; /* Physical Device Object device extension for a child device */ typedef struct _PNPROOT_PDO_DEVICE_EXTENSION { - // Common device data - PNPROOT_COMMON_DEVICE_EXTENSION Common; - // Informations about the device - PPNPROOT_DEVICE DeviceInfo; + // Common device data + PNPROOT_COMMON_DEVICE_EXTENSION Common; + // Informations about the device + PPNPROOT_DEVICE DeviceInfo; } PNPROOT_PDO_DEVICE_EXTENSION, *PPNPROOT_PDO_DEVICE_EXTENSION; /* Physical Device Object device extension for the Root bus device object */ typedef struct _PNPROOT_FDO_DEVICE_EXTENSION { - // Common device data - PNPROOT_COMMON_DEVICE_EXTENSION Common; - // Lower device object - PDEVICE_OBJECT Ldo; - // Current state of the driver - PNPROOT_DEVICE_STATE State; - // Namespace device list - LIST_ENTRY DeviceListHead; - // Number of (not removed) devices in device list - ULONG DeviceListCount; - // Lock for namespace device list - KGUARDED_MUTEX DeviceListLock; + // Common device data + PNPROOT_COMMON_DEVICE_EXTENSION Common; + // Lower device object + PDEVICE_OBJECT Ldo; + // Current state of the driver + PNPROOT_DEVICE_STATE State; + // Namespace device list + LIST_ENTRY DeviceListHead; + // Number of (not removed) devices in device list + ULONG DeviceListCount; + // Lock for namespace device list + KGUARDED_MUTEX DeviceListLock; } PNPROOT_FDO_DEVICE_EXTENSION, *PPNPROOT_FDO_DEVICE_EXTENSION; typedef struct _BUFFER { - PVOID *Buffer; - PULONG Length; + PVOID *Buffer; + PULONG Length; } BUFFER, *PBUFFER; static PDEVICE_OBJECT PnpRootDeviceObject = NULL; @@ -93,139 +93,137 @@ static NTSTATUS LocateChildDevice( - IN PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension, - IN PCWSTR DeviceId, - IN PCWSTR InstanceId, - OUT PPNPROOT_DEVICE* ChildDevice) -{ - PPNPROOT_DEVICE Device; - UNICODE_STRING DeviceIdU, InstanceIdU; - - RtlInitUnicodeString(&DeviceIdU, DeviceId); - RtlInitUnicodeString(&InstanceIdU, InstanceId); - - LIST_FOR_EACH(Device, &DeviceExtension->DeviceListHead, PNPROOT_DEVICE, ListEntry) - { - if (RtlEqualUnicodeString(&DeviceIdU, &Device->DeviceID, TRUE) - && RtlEqualUnicodeString(&InstanceIdU, &Device->InstanceID, TRUE)) - { - *ChildDevice = Device; - return STATUS_SUCCESS; - } - } - - return STATUS_NO_SUCH_DEVICE; + IN PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension, + IN PCWSTR DeviceId, + IN PCWSTR InstanceId, + OUT PPNPROOT_DEVICE* ChildDevice) +{ + PPNPROOT_DEVICE Device; + UNICODE_STRING DeviceIdU, InstanceIdU; + + RtlInitUnicodeString(&DeviceIdU, DeviceId); + RtlInitUnicodeString(&InstanceIdU, InstanceId); + + LIST_FOR_EACH(Device, &DeviceExtension->DeviceListHead, PNPROOT_DEVICE, ListEntry) + { + if (RtlEqualUnicodeString(&DeviceIdU, &Device->DeviceID, TRUE) + && RtlEqualUnicodeString(&InstanceIdU, &Device->InstanceID, TRUE)) + { + *ChildDevice = Device; + return STATUS_SUCCESS; + } + } + + return STATUS_NO_SUCH_DEVICE; } /* Creates a new PnP device for a legacy driver */ NTSTATUS PnpRootCreateDevice( - IN PUNICODE_STRING ServiceName, - IN PDEVICE_OBJECT *PhysicalDeviceObject) -{ - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - UNICODE_STRING UnknownServiceName = RTL_CONSTANT_STRING(L"UNKNOWN"); - PUNICODE_STRING LocalServiceName; - PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension; - WCHAR DevicePath[MAX_PATH + 1]; - WCHAR InstancePath[5]; - PPNPROOT_DEVICE Device = NULL; - NTSTATUS Status; - ULONG i; - - DeviceExtension = PnpRootDeviceObject->DeviceExtension; - KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); - - if (ServiceName) - LocalServiceName = ServiceName; - else - LocalServiceName = &UnknownServiceName; - - DPRINT("Creating a PnP root device for service '%wZ'\n", LocalServiceName); - - /* Search for a free instance ID */ - _snwprintf(DevicePath, sizeof(DevicePath) / sizeof(WCHAR), L"%s\\LEGACY_%wZ", REGSTR_KEY_ROOTENUM, LocalServiceName); - for (i = 0; i < 9999; i++) - { - _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", i); - Status = LocateChildDevice(DeviceExtension, DevicePath, InstancePath, &Device); - if (Status == STATUS_NO_SUCH_DEVICE) - break; - } - if (i > 9999) - { - DPRINT1("Too much legacy devices reported for service '%wZ'\n", &LocalServiceName); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - - /* FIXME: save the new device to registry? */ - - /* Initialize a PNPROOT_DEVICE structure */ - Device = ExAllocatePoolWithTag(PagedPool, sizeof(PNPROOT_DEVICE), TAG_PNP_ROOT); - if (!Device) - { - DPRINT("ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - RtlZeroMemory(Device, sizeof(PNPROOT_DEVICE)); - if (!RtlCreateUnicodeString(&Device->DeviceID, DevicePath)) - { - Status = STATUS_NO_MEMORY; - goto cleanup; - } - if (!RtlCreateUnicodeString(&Device->InstanceID, InstancePath)) - { - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - /* Initialize a device object */ - Status = IoCreateDevice( - PnpRootDeviceObject->DriverObject, - sizeof(PNPROOT_PDO_DEVICE_EXTENSION), - NULL, - FILE_DEVICE_CONTROLLER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &Device->Pdo); - if (!NT_SUCCESS(Status)) - { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - PdoDeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension; - RtlZeroMemory(PdoDeviceExtension, sizeof(PNPROOT_PDO_DEVICE_EXTENSION)); - PdoDeviceExtension->Common.IsFDO = FALSE; - PdoDeviceExtension->DeviceInfo = Device; - - Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; - Device->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; - - InsertTailList( - &DeviceExtension->DeviceListHead, - &Device->ListEntry); - DeviceExtension->DeviceListCount++; - - *PhysicalDeviceObject = Device->Pdo; - DPRINT("Created PDO %p (%wZ\\%wZ)\n", *PhysicalDeviceObject, &Device->DeviceID, &Device->InstanceID); - Device = NULL; - Status = STATUS_SUCCESS; + IN PUNICODE_STRING ServiceName, + IN PDEVICE_OBJECT *PhysicalDeviceObject) +{ + PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; + UNICODE_STRING UnknownServiceName = RTL_CONSTANT_STRING(L"UNKNOWN"); + PUNICODE_STRING LocalServiceName; + PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension; + WCHAR DevicePath[MAX_PATH + 1]; + WCHAR InstancePath[5]; + PPNPROOT_DEVICE Device = NULL; + NTSTATUS Status; + ULONG i; + + DeviceExtension = PnpRootDeviceObject->DeviceExtension; + KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); + + if (ServiceName) + LocalServiceName = ServiceName; + else + LocalServiceName = &UnknownServiceName; + + DPRINT("Creating a PnP root device for service '%wZ'\n", LocalServiceName); + + /* Search for a free instance ID */ + _snwprintf(DevicePath, sizeof(DevicePath) / sizeof(WCHAR), L"%s\\LEGACY_%wZ", REGSTR_KEY_ROOTENUM, LocalServiceName); + for (i = 0; i < 9999; i++) + { + _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", i); + Status = LocateChildDevice(DeviceExtension, DevicePath, InstancePath, &Device); + if (Status == STATUS_NO_SUCH_DEVICE) + break; + } + if (i > 9999) + { + DPRINT1("Too much legacy devices reported for service '%wZ'\n", &LocalServiceName); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + /* Initialize a PNPROOT_DEVICE structure */ + Device = ExAllocatePoolWithTag(PagedPool, sizeof(PNPROOT_DEVICE), TAG_PNP_ROOT); + if (!Device) + { + DPRINT("ExAllocatePoolWithTag() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + RtlZeroMemory(Device, sizeof(PNPROOT_DEVICE)); + if (!RtlCreateUnicodeString(&Device->DeviceID, DevicePath)) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + if (!RtlCreateUnicodeString(&Device->InstanceID, InstancePath)) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + /* Initialize a device object */ + Status = IoCreateDevice( + PnpRootDeviceObject->DriverObject, + sizeof(PNPROOT_PDO_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &Device->Pdo); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + PdoDeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension; + RtlZeroMemory(PdoDeviceExtension, sizeof(PNPROOT_PDO_DEVICE_EXTENSION)); + PdoDeviceExtension->Common.IsFDO = FALSE; + PdoDeviceExtension->DeviceInfo = Device; + + Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; + Device->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + + InsertTailList( + &DeviceExtension->DeviceListHead, + &Device->ListEntry); + DeviceExtension->DeviceListCount++; + + *PhysicalDeviceObject = Device->Pdo; + DPRINT("Created PDO %p (%wZ\\%wZ)\n", *PhysicalDeviceObject, &Device->DeviceID, &Device->InstanceID); + Device = NULL; + Status = STATUS_SUCCESS; cleanup: - KeReleaseGuardedMutex(&DeviceExtension->DeviceListLock); - if (Device) - { - if (Device->Pdo) - IoDeleteDevice(Device->Pdo); - RtlFreeUnicodeString(&Device->DeviceID); - RtlFreeUnicodeString(&Device->InstanceID); - ExFreePoolWithTag(Device, TAG_PNP_ROOT); - } - return Status; + KeReleaseGuardedMutex(&DeviceExtension->DeviceListLock); + if (Device) + { + if (Device->Pdo) + IoDeleteDevice(Device->Pdo); + RtlFreeUnicodeString(&Device->DeviceID); + RtlFreeUnicodeString(&Device->InstanceID); + ExFreePoolWithTag(Device, TAG_PNP_ROOT); + } + return Status; } static NTSTATUS STDCALL @@ -272,297 +270,297 @@ static NTSTATUS NTAPI QueryStringCallback( - IN PWSTR ValueName, - IN ULONG ValueType, - IN PVOID ValueData, - IN ULONG ValueLength, - IN PVOID Context, - IN PVOID EntryContext) -{ - PUNICODE_STRING String = (PUNICODE_STRING)EntryContext; - - if (ValueType != REG_SZ || ValueLength == 0 || ValueLength % sizeof(WCHAR) != 0) - return STATUS_SUCCESS; - - String->Buffer = ExAllocatePoolWithTag(PagedPool, ValueLength, TAG_PNP_ROOT); - if (String->Buffer == NULL) - return STATUS_NO_MEMORY; - String->Length = String->MaximumLength = (USHORT)ValueLength; - RtlCopyMemory(String->Buffer, ValueData, ValueLength); - if (ValueLength > 0 && String->Buffer[ValueLength / sizeof(WCHAR) - 1] == L'\0') - String->Length -= sizeof(WCHAR); - return STATUS_SUCCESS; + IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PUNICODE_STRING String = (PUNICODE_STRING)EntryContext; + + if (ValueType != REG_SZ || ValueLength == 0 || ValueLength % sizeof(WCHAR) != 0) + return STATUS_SUCCESS; + + String->Buffer = ExAllocatePoolWithTag(PagedPool, ValueLength, TAG_PNP_ROOT); + if (String->Buffer == NULL) + return STATUS_NO_MEMORY; + String->Length = String->MaximumLength = (USHORT)ValueLength; + RtlCopyMemory(String->Buffer, ValueData, ValueLength); + if (ValueLength > 0 && String->Buffer[ValueLength / sizeof(WCHAR) - 1] == L'\0') + String->Length -= sizeof(WCHAR); + return STATUS_SUCCESS; } static NTSTATUS NTAPI QueryBinaryValueCallback( - IN PWSTR ValueName, - IN ULONG ValueType, - IN PVOID ValueData, - IN ULONG ValueLength, - IN PVOID Context, - IN PVOID EntryContext) -{ - PBUFFER Buffer = (PBUFFER)EntryContext; - PVOID BinaryValue; - - if (ValueLength == 0) - { - *Buffer->Buffer = NULL; - return STATUS_SUCCESS; - } - - BinaryValue = ExAllocatePoolWithTag(PagedPool, ValueLength, TAG_PNP_ROOT); - if (BinaryValue == NULL) - return STATUS_NO_MEMORY; - RtlCopyMemory(BinaryValue, ValueData, ValueLength); - *Buffer->Buffer = BinaryValue; - if (Buffer->Length) *Buffer->Length = ValueLength; - return STATUS_SUCCESS; + IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PBUFFER Buffer = (PBUFFER)EntryContext; + PVOID BinaryValue; + + if (ValueLength == 0) + { + *Buffer->Buffer = NULL; + return STATUS_SUCCESS; + } + + BinaryValue = ExAllocatePoolWithTag(PagedPool, ValueLength, TAG_PNP_ROOT); + if (BinaryValue == NULL) + return STATUS_NO_MEMORY; + RtlCopyMemory(BinaryValue, ValueData, ValueLength); + *Buffer->Buffer = BinaryValue; + if (Buffer->Length) *Buffer->Length = ValueLength; + return STATUS_SUCCESS; } static NTSTATUS EnumerateDevices( - IN PDEVICE_OBJECT DeviceObject) -{ - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - OBJECT_ATTRIBUTES ObjectAttributes; - PKEY_BASIC_INFORMATION KeyInfo = NULL, SubKeyInfo = NULL; - UNICODE_STRING LegacyU = RTL_CONSTANT_STRING(L"LEGACY_"); - UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM L"\\" REGSTR_KEY_ROOTENUM); - UNICODE_STRING SubKeyName; - WCHAR DevicePath[MAX_PATH + 1]; - RTL_QUERY_REGISTRY_TABLE QueryTable[5]; - PPNPROOT_DEVICE Device = NULL; - HANDLE KeyHandle = INVALID_HANDLE_VALUE; - HANDLE SubKeyHandle = INVALID_HANDLE_VALUE; - HANDLE DeviceKeyHandle = INVALID_HANDLE_VALUE; - ULONG BufferSize; - ULONG ResultSize; - ULONG Index1, Index2; - BUFFER Buffer1, Buffer2; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - DPRINT("EnumerateDevices(FDO %p)\n", DeviceObject); - - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); - - BufferSize = sizeof(KEY_BASIC_INFORMATION) + (MAX_PATH + 1) * sizeof(WCHAR); - KeyInfo = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_PNP_ROOT); - if (!KeyInfo) - { - DPRINT("ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - SubKeyInfo = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_PNP_ROOT); - if (!SubKeyInfo) - { - DPRINT("ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - InitializeObjectAttributes( - &ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = ZwOpenKey(&KeyHandle, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyName, Status); - goto cleanup; - } - - /* Devices are sub-sub-keys of 'KeyName'. KeyName is already opened as - * KeyHandle. We'll first do a first enumeration to have first level keys, - * and an inner one to have the real devices list. - */ - Index1 = 0; - while (TRUE) - { - Status = ZwEnumerateKey( - KeyHandle, - Index1, - KeyBasicInformation, - KeyInfo, - BufferSize, - &ResultSize); - if (Status == STATUS_NO_MORE_ENTRIES) - { - Status = STATUS_SUCCESS; - break; - } - else if (!NT_SUCCESS(Status)) - { - DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); - goto cleanup; - } - - /* Terminate the string */ - KeyInfo->Name[KeyInfo->NameLength / sizeof(WCHAR)] = 0; - - /* Check if it is a legacy driver */ - RtlInitUnicodeString(&SubKeyName, KeyInfo->Name); - if (RtlPrefixUnicodeString(&LegacyU, &SubKeyName, FALSE)) - { - DPRINT("Ignoring legacy driver '%wZ'\n", &SubKeyName); + IN PDEVICE_OBJECT DeviceObject) +{ + PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; + OBJECT_ATTRIBUTES ObjectAttributes; + PKEY_BASIC_INFORMATION KeyInfo = NULL, SubKeyInfo = NULL; + UNICODE_STRING LegacyU = RTL_CONSTANT_STRING(L"LEGACY_"); + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM L"\\" REGSTR_KEY_ROOTENUM); + UNICODE_STRING SubKeyName; + WCHAR DevicePath[MAX_PATH + 1]; + RTL_QUERY_REGISTRY_TABLE QueryTable[5]; + PPNPROOT_DEVICE Device = NULL; + HANDLE KeyHandle = INVALID_HANDLE_VALUE; + HANDLE SubKeyHandle = INVALID_HANDLE_VALUE; + HANDLE DeviceKeyHandle = INVALID_HANDLE_VALUE; + ULONG BufferSize; + ULONG ResultSize; + ULONG Index1, Index2; + BUFFER Buffer1, Buffer2; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + DPRINT("EnumerateDevices(FDO %p)\n", DeviceObject); + + DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); + + BufferSize = sizeof(KEY_BASIC_INFORMATION) + (MAX_PATH + 1) * sizeof(WCHAR); + KeyInfo = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_PNP_ROOT); + if (!KeyInfo) + { + DPRINT("ExAllocatePoolWithTag() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + SubKeyInfo = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_PNP_ROOT); + if (!SubKeyInfo) + { + DPRINT("ExAllocatePoolWithTag() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + InitializeObjectAttributes( + &ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = ZwOpenKey(&KeyHandle, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyName, Status); + goto cleanup; + } + + /* Devices are sub-sub-keys of 'KeyName'. KeyName is already opened as + * KeyHandle. We'll first do a first enumeration to have first level keys, + * and an inner one to have the real devices list. + */ + Index1 = 0; + while (TRUE) + { + Status = ZwEnumerateKey( + KeyHandle, + Index1, + KeyBasicInformation, + KeyInfo, + BufferSize, + &ResultSize); + if (Status == STATUS_NO_MORE_ENTRIES) + { + Status = STATUS_SUCCESS; + break; + } + else if (!NT_SUCCESS(Status)) + { + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + /* Terminate the string */ + KeyInfo->Name[KeyInfo->NameLength / sizeof(WCHAR)] = 0; + + /* Check if it is a legacy driver */ + RtlInitUnicodeString(&SubKeyName, KeyInfo->Name); + if (RtlPrefixUnicodeString(&LegacyU, &SubKeyName, FALSE)) + { + DPRINT("Ignoring legacy driver '%wZ'\n", &SubKeyName); + Index1++; + continue; + } + + /* Open the key */ + InitializeObjectAttributes( + &ObjectAttributes, + &SubKeyName, + 0, /* Attributes */ + KeyHandle, + NULL); /* Security descriptor */ + Status = ZwOpenKey(&SubKeyHandle, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + break; + } + + /* Enumerate the sub-keys */ + Index2 = 0; + while (TRUE) + { + Status = ZwEnumerateKey( + SubKeyHandle, + Index2, + KeyBasicInformation, + SubKeyInfo, + BufferSize, + &ResultSize); + if (Status == STATUS_NO_MORE_ENTRIES) + break; + else if (!NT_SUCCESS(Status)) + { + DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); + break; + } + + /* Terminate the string */ + SubKeyInfo->Name[SubKeyInfo->NameLength / sizeof(WCHAR)] = 0; + + _snwprintf( + DevicePath, + sizeof(DevicePath) / sizeof(WCHAR), + L"%s\\%s", REGSTR_KEY_ROOTENUM, KeyInfo->Name); + DPRINT("Found device %S\\%s!\n", DevicePath, SubKeyInfo->Name); + if (LocateChildDevice(DeviceExtension, DevicePath, SubKeyInfo->Name, &Device) == STATUS_NO_SUCH_DEVICE) + { + /* Create a PPNPROOT_DEVICE object, and add if in the list of known devices */ + Device = (PPNPROOT_DEVICE)ExAllocatePoolWithTag(PagedPool, sizeof(PNPROOT_DEVICE), TAG_PNP_ROOT); + if (!Device) + { + DPRINT("ExAllocatePoolWithTag() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + RtlZeroMemory(Device, sizeof(PNPROOT_DEVICE)); + + /* Fill device ID and instance ID */ + if (!RtlCreateUnicodeString(&Device->DeviceID, DevicePath)) + { + DPRINT("RtlCreateUnicodeString() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + if (!RtlCreateUnicodeString(&Device->InstanceID, SubKeyInfo->Name)) + { + DPRINT("RtlCreateUnicodeString() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + /* Open registry key to fill other informations */ + InitializeObjectAttributes( + &ObjectAttributes, + &Device->InstanceID, + 0, /* Attributes */ + SubKeyHandle, + NULL); /* Security descriptor */ + Status = ZwOpenKey(&DeviceKeyHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + break; + } + + /* Fill other informations */ + Buffer1.Buffer = (PVOID *)&Device->ResourceRequirementsList; + Buffer1.Length = NULL; + Buffer2.Buffer = (PVOID *)&Device->ResourceList; + Buffer2.Length = &Device->ResourceListSize; + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + QueryTable[0].QueryRoutine = QueryStringCallback; + QueryTable[0].Name = L"DeviceDesc"; + QueryTable[0].EntryContext = &Device->DeviceDescription; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_SUBKEY; + QueryTable[1].Name = L"LogConf"; + QueryTable[2].QueryRoutine = QueryBinaryValueCallback; + QueryTable[2].Name = L"BasicConfigVector"; + QueryTable[2].EntryContext = &Buffer1; + QueryTable[3].QueryRoutine = QueryBinaryValueCallback; + QueryTable[3].Name = L"BootConfig"; + QueryTable[3].EntryContext = &Buffer2; + + Status = RtlQueryRegistryValues( + RTL_REGISTRY_HANDLE, + (PCWSTR)DeviceKeyHandle, + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlQueryRegistryValues() failed with status 0x%08lx\n", Status); + break; + } + + ZwClose(DeviceKeyHandle); + DeviceKeyHandle = INVALID_HANDLE_VALUE; + + /* Insert the newly created device into the list */ + InsertTailList( + &DeviceExtension->DeviceListHead, + &Device->ListEntry); + DeviceExtension->DeviceListCount++; + } + Device = NULL; + + Index2++; + } + + ZwClose(SubKeyHandle); + SubKeyHandle = INVALID_HANDLE_VALUE; Index1++; - continue; - } - - /* Open the key */ - InitializeObjectAttributes( - &ObjectAttributes, - &SubKeyName, - 0, /* Attributes */ - KeyHandle, - NULL); /* Security descriptor */ - Status = ZwOpenKey(&SubKeyHandle, KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); - break; - } - - /* Enumerate the sub-keys */ - Index2 = 0; - while (TRUE) - { - Status = ZwEnumerateKey( - SubKeyHandle, - Index2, - KeyBasicInformation, - SubKeyInfo, - BufferSize, - &ResultSize); - if (Status == STATUS_NO_MORE_ENTRIES) - break; - else if (!NT_SUCCESS(Status)) - { - DPRINT("ZwEnumerateKey() failed with status 0x%08lx\n", Status); - break; - } - - /* Terminate the string */ - SubKeyInfo->Name[SubKeyInfo->NameLength / sizeof(WCHAR)] = 0; - - _snwprintf( - DevicePath, - sizeof(DevicePath) / sizeof(WCHAR), - L"%s\\%s", REGSTR_KEY_ROOTENUM, KeyInfo->Name); - DPRINT("Found device %S\\%s!\n", DevicePath, SubKeyInfo->Name); - if (LocateChildDevice(DeviceExtension, DevicePath, SubKeyInfo->Name, &Device) == STATUS_NO_SUCH_DEVICE) - { - /* Create a PPNPROOT_DEVICE object, and add if in the list of known devices */ - Device = (PPNPROOT_DEVICE)ExAllocatePoolWithTag(PagedPool, sizeof(PNPROOT_DEVICE), TAG_PNP_ROOT); - if (!Device) - { - DPRINT("ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - RtlZeroMemory(Device, sizeof(PNPROOT_DEVICE)); - - /* Fill device ID and instance ID */ - if (!RtlCreateUnicodeString(&Device->DeviceID, DevicePath)) - { - DPRINT("RtlCreateUnicodeString() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - if (!RtlCreateUnicodeString(&Device->InstanceID, SubKeyInfo->Name)) - { - DPRINT("RtlCreateUnicodeString() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - /* Open registry key to fill other informations */ - InitializeObjectAttributes( - &ObjectAttributes, - &Device->InstanceID, - 0, /* Attributes */ - SubKeyHandle, - NULL); /* Security descriptor */ - Status = ZwOpenKey(&DeviceKeyHandle, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); - break; - } - - /* Fill other informations */ - Buffer1.Buffer = (PVOID *)&Device->ResourceRequirementsList; - Buffer1.Length = NULL; - Buffer2.Buffer = (PVOID *)&Device->ResourceList; - Buffer2.Length = &Device->ResourceListSize; - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - QueryTable[0].QueryRoutine = QueryStringCallback; - QueryTable[0].Name = L"DeviceDesc"; - QueryTable[0].EntryContext = &Device->DeviceDescription; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_SUBKEY; - QueryTable[1].Name = L"LogConf"; - QueryTable[2].QueryRoutine = QueryBinaryValueCallback; - QueryTable[2].Name = L"BasicConfigVector"; - QueryTable[2].EntryContext = &Buffer1; - QueryTable[3].QueryRoutine = QueryBinaryValueCallback; - QueryTable[3].Name = L"BootConfig"; - QueryTable[3].EntryContext = &Buffer2; - - Status = RtlQueryRegistryValues( - RTL_REGISTRY_HANDLE, - (PCWSTR)DeviceKeyHandle, - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlQueryRegistryValues() failed with status 0x%08lx\n", Status); - break; - } - + } + +cleanup: + if (Device) + { + /* We have a device that has not been added to device list. We need to clean it up */ + /* FIXME */ + ExFreePoolWithTag(Device, TAG_PNP_ROOT); + } + if (DeviceKeyHandle != INVALID_HANDLE_VALUE) ZwClose(DeviceKeyHandle); - DeviceKeyHandle = INVALID_HANDLE_VALUE; - - /* Insert the newly created device into the list */ - InsertTailList( - &DeviceExtension->DeviceListHead, - &Device->ListEntry); - DeviceExtension->DeviceListCount++; - } - Device = NULL; - - Index2++; - } - - ZwClose(SubKeyHandle); - SubKeyHandle = INVALID_HANDLE_VALUE; - Index1++; - } - -cleanup: - if (Device) - { - /* We have a device that has not been added to device list. We need to clean it up */ - /* FIXME */ - ExFreePoolWithTag(Device, TAG_PNP_ROOT); - } - if (DeviceKeyHandle != INVALID_HANDLE_VALUE) - ZwClose(DeviceKeyHandle); - if (SubKeyHandle != INVALID_HANDLE_VALUE) - ZwClose(SubKeyHandle); - if (KeyHandle != INVALID_HANDLE_VALUE) - ZwClose(KeyHandle); - ExFreePoolWithTag(KeyInfo, TAG_PNP_ROOT); - ExFreePoolWithTag(SubKeyInfo, TAG_PNP_ROOT); - KeReleaseGuardedMutex(&DeviceExtension->DeviceListLock); - return Status; + if (SubKeyHandle != INVALID_HANDLE_VALUE) + ZwClose(SubKeyHandle); + if (KeyHandle != INVALID_HANDLE_VALUE) + ZwClose(KeyHandle); + ExFreePoolWithTag(KeyInfo, TAG_PNP_ROOT); + ExFreePoolWithTag(SubKeyInfo, TAG_PNP_ROOT); + KeReleaseGuardedMutex(&DeviceExtension->DeviceListLock); + return Status; } /* FUNCTION: Handle IRP_MN_QUERY_DEVICE_RELATIONS IRPs for the root bus device object @@ -574,104 +572,104 @@ */ static NTSTATUS PnpRootQueryDeviceRelations( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension; - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - PDEVICE_RELATIONS Relations = NULL, OtherRelations = (PDEVICE_RELATIONS)Irp->IoStatus.Information; - PPNPROOT_DEVICE Device = NULL; - ULONG Size; - NTSTATUS Status; - - DPRINT("PnpRootQueryDeviceRelations(FDO %p, Irp %p)\n", DeviceObject, Irp); - - Status = EnumerateDevices(DeviceObject); - if (!NT_SUCCESS(Status)) - { - DPRINT("EnumerateDevices() failed with status 0x%08lx\n", Status); + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension; + PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; + PDEVICE_RELATIONS Relations = NULL, OtherRelations = (PDEVICE_RELATIONS)Irp->IoStatus.Information; + PPNPROOT_DEVICE Device = NULL; + ULONG Size; + NTSTATUS Status; + + DPRINT("PnpRootQueryDeviceRelations(FDO %p, Irp %p)\n", DeviceObject, Irp); + + Status = EnumerateDevices(DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT("EnumerateDevices() failed with status 0x%08lx\n", Status); + return Status; + } + + DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + Size = FIELD_OFFSET(DEVICE_RELATIONS, Objects) + sizeof(PDEVICE_OBJECT) * DeviceExtension->DeviceListCount; + if (OtherRelations) + { + /* Another bus driver has already created a DEVICE_RELATIONS + * structure so we must merge this structure with our own */ + + Size += sizeof(PDEVICE_OBJECT) * OtherRelations->Count; + } + Relations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, Size); + if (!Relations) + { + DPRINT("ExAllocatePoolWithTag() failed\n"); + Status = STATUS_NO_MEMORY; + goto cleanup; + } + RtlZeroMemory(Relations, Size); + if (OtherRelations) + { + Relations->Count = OtherRelations->Count; + RtlCopyMemory(Relations->Objects, OtherRelations->Objects, sizeof(PDEVICE_OBJECT) * OtherRelations->Count); + } + + KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); + LIST_FOR_EACH(Device, &DeviceExtension->DeviceListHead, PNPROOT_DEVICE, ListEntry) + { + if (!Device->Pdo) + { + /* Create a physical device object for the + * device as it does not already have one */ + Status = IoCreateDevice( + DeviceObject->DriverObject, + sizeof(PNPROOT_PDO_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &Device->Pdo); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + break; + } + + PdoDeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension; + RtlZeroMemory(PdoDeviceExtension, sizeof(PNPROOT_PDO_DEVICE_EXTENSION)); + PdoDeviceExtension->Common.IsFDO = FALSE; + PdoDeviceExtension->DeviceInfo = Device; + + Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; + Device->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + } + + /* Reference the physical device object. The PnP manager + will dereference it again when it is no longer needed */ + ObReferenceObject(Device->Pdo); + + Relations->Objects[Relations->Count++] = Device->Pdo; + } + KeReleaseGuardedMutex(&DeviceExtension->DeviceListLock); + + Irp->IoStatus.Information = (ULONG_PTR)Relations; + +cleanup: + if (!NT_SUCCESS(Status)) + { + if (OtherRelations) + ExFreePool(OtherRelations); + if (Relations) + ExFreePool(Relations); + if (Device && Device->Pdo) + { + IoDeleteDevice(Device->Pdo); + Device->Pdo = NULL; + } + } + return Status; - } - - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - Size = FIELD_OFFSET(DEVICE_RELATIONS, Objects) + sizeof(PDEVICE_OBJECT) * DeviceExtension->DeviceListCount; - if (OtherRelations) - { - /* Another bus driver has already created a DEVICE_RELATIONS - * structure so we must merge this structure with our own */ - - Size += sizeof(PDEVICE_OBJECT) * OtherRelations->Count; - } - Relations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, Size); - if (!Relations) - { - DPRINT("ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - RtlZeroMemory(Relations, Size); - if (OtherRelations) - { - Relations->Count = OtherRelations->Count; - RtlCopyMemory(Relations->Objects, OtherRelations->Objects, sizeof(PDEVICE_OBJECT) * OtherRelations->Count); - } - - KeAcquireGuardedMutex(&DeviceExtension->DeviceListLock); - LIST_FOR_EACH(Device, &DeviceExtension->DeviceListHead, PNPROOT_DEVICE, ListEntry) - { - if (!Device->Pdo) - { - /* Create a physical device object for the - * device as it does not already have one */ - Status = IoCreateDevice( - DeviceObject->DriverObject, - sizeof(PNPROOT_PDO_DEVICE_EXTENSION), - NULL, - FILE_DEVICE_CONTROLLER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &Device->Pdo); - if (!NT_SUCCESS(Status)) - { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); - break; - } - - PdoDeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension; - RtlZeroMemory(PdoDeviceExtension, sizeof(PNPROOT_PDO_DEVICE_EXTENSION)); - PdoDeviceExtension->Common.IsFDO = FALSE; - PdoDeviceExtension->DeviceInfo = Device; - - Device->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; - Device->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; - } - - /* Reference the physical device object. The PnP manager - will dereference it again when it is no longer needed */ - ObReferenceObject(Device->Pdo); - - Relations->Objects[Relations->Count++] = Device->Pdo; - } - KeReleaseGuardedMutex(&DeviceExtension->DeviceListLock); - - Irp->IoStatus.Information = (ULONG_PTR)Relations; - -cleanup: - if (!NT_SUCCESS(Status)) - { - if (OtherRelations) - ExFreePool(OtherRelations); - if (Relations) - ExFreePool(Relations); - if (Device && Device->Pdo) - { - IoDeleteDevice(Device->Pdo); - Device->Pdo = NULL; - } - } - - return Status; } /* @@ -684,343 +682,341 @@ */ static NTSTATUS PnpRootFdoPnpControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; - - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - Status = Irp->IoStatus.Status; - IrpSp = IoGetCurrentIrpStackLocation(Irp); - - switch (IrpSp->MinorFunction) - { - case IRP_MN_QUERY_DEVICE_RELATIONS: - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS\n"); - Status = PnpRootQueryDeviceRelations(DeviceObject, Irp); - break; - - case IRP_MN_START_DEVICE: - DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); - Status = ForwardIrpAndWait(DeviceObject, Irp); - if (NT_SUCCESS(Status)) - DeviceExtension->State = dsStarted; - Status = STATUS_SUCCESS; - break; - - case IRP_MN_STOP_DEVICE: - DPRINT("IRP_MJ_PNP / IRP_MN_STOP_DEVICE\n"); - /* Root device cannot be stopped */ - Status = STATUS_NOT_SUPPORTED; - break; - - default: - DPRINT("IRP_MJ_PNP / Unknown minor function 0x%lx\n", IrpSp->MinorFunction); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - if (Status != STATUS_PENDING) - { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - - return Status; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; + + DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Status = Irp->IoStatus.Status; + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + switch (IrpSp->MinorFunction) + { + case IRP_MN_QUERY_DEVICE_RELATIONS: + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS\n"); + Status = PnpRootQueryDeviceRelations(DeviceObject, Irp); + break; + + case IRP_MN_START_DEVICE: + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + DeviceExtension->State = dsStarted; + Status = STATUS_SUCCESS; + break; + + case IRP_MN_STOP_DEVICE: + DPRINT("IRP_MJ_PNP / IRP_MN_STOP_DEVICE\n"); + /* Root device cannot be stopped */ + Status = STATUS_NOT_SUPPORTED; + break; + + default: + DPRINT("IRP_MJ_PNP / Unknown minor function 0x%lx\n", IrpSp->MinorFunction); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; } static NTSTATUS PdoQueryDeviceRelations( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) -{ - //PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; - PDEVICE_RELATIONS Relations; - DEVICE_RELATION_TYPE RelationType; - NTSTATUS Status = Irp->IoStatus.Status; - - //DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - RelationType = IrpSp->Parameters.QueryDeviceRelations.Type; - - switch (RelationType) - { - /* FIXME: remove */ - case BusRelations: - { - if (IoGetAttachedDevice(DeviceObject) != DeviceObject) - { - /* We're not alone in the stack */ - PDEVICE_NODE DeviceNode; - DeviceNode = IopGetDeviceNode(IopGetDeviceNode(DeviceObject)->PhysicalDeviceObject); - DPRINT1("Device stack for '%wZ' (%wZ) is misbehaving ; shouldn't receive IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n", - &DeviceNode->InstancePath, &DeviceNode->ServiceName); - } - break; - } - - case TargetDeviceRelation: - { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); - Relations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); - if (!Relations) - { - DPRINT("ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - } - else - { - ObReferenceObject(DeviceObject); - Relations->Count = 1; - Relations->Objects[0] = DeviceObject; - Status = STATUS_SUCCESS; - Irp->IoStatus.Information = (ULONG_PTR)Relations; - } - break; - } - - default: - { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / unknown relation type 0x%lx\n", RelationType); - } - } - - return Status; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PDEVICE_RELATIONS Relations; + DEVICE_RELATION_TYPE RelationType; + NTSTATUS Status = Irp->IoStatus.Status; + + RelationType = IrpSp->Parameters.QueryDeviceRelations.Type; + + switch (RelationType) + { + /* FIXME: remove */ + case BusRelations: + { + if (IoGetAttachedDevice(DeviceObject) != DeviceObject) + { + /* We're not alone in the stack */ + PDEVICE_NODE DeviceNode; + DeviceNode = IopGetDeviceNode(IopGetDeviceNode(DeviceObject)->PhysicalDeviceObject); + DPRINT1("Device stack for '%wZ' (%wZ) is misbehaving ; shouldn't receive IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n", + &DeviceNode->InstancePath, &DeviceNode->ServiceName); + } + break; + } + + case TargetDeviceRelation: + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); + Relations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); + if (!Relations) + { + DPRINT("ExAllocatePoolWithTag() failed\n"); + Status = STATUS_NO_MEMORY; + } + else + { + ObReferenceObject(DeviceObject); + Relations->Count = 1; + Relations->Objects[0] = DeviceObject; + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = (ULONG_PTR)Relations; + } + break; + } + + default: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / unknown relation type 0x%lx\n", RelationType); + } + } + + return Status; } static NTSTATUS PdoQueryCapabilities( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) -{ - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - PDEVICE_CAPABILITIES DeviceCapabilities; - - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; - - if (DeviceCapabilities->Version != 1) - return STATUS_REVISION_MISMATCH; - - DeviceCapabilities->UniqueID = TRUE; - /* FIXME: Fill other fields */ - - return STATUS_SUCCESS; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; + PDEVICE_CAPABILITIES DeviceCapabilities; + + DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; + + if (DeviceCapabilities->Version != 1) + return STATUS_REVISION_MISMATCH; + + DeviceCapabilities->UniqueID = TRUE; + /* FIXME: Fill other fields */ + + return STATUS_SUCCESS; } static NTSTATUS PdoQueryResources( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) -{ - PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; - PCM_RESOURCE_LIST ResourceList; - - DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (DeviceExtension->DeviceInfo->ResourceList == NULL) - { - /* Create an empty resource list */ - ResourceList = ExAllocatePool(PagedPool, sizeof(CM_RESOURCE_LIST)); - if (!ResourceList) - return STATUS_NO_MEMORY; - - ResourceList->Count = 0; - - Irp->IoStatus.Information = (ULONG_PTR)ResourceList; - } - else - { - /* Copy existing resource requirement list */ - ResourceList = ExAllocatePool( - PagedPool, - FIELD_OFFSET(CM_RESOURCE_LIST, List) + DeviceExtension->DeviceInfo->ResourceListSize); - if (!ResourceList) - return STATUS_NO_MEMORY; - - ResourceList->Count = 1; - RtlCopyMemory( - &ResourceList->List, - DeviceExtension->DeviceInfo->ResourceList, - DeviceExtension->DeviceInfo->ResourceListSize); - Irp->IoStatus.Information = (ULONG_PTR)ResourceList; - } - - return STATUS_SUCCESS; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; + PCM_RESOURCE_LIST ResourceList; + + DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->DeviceInfo->ResourceList == NULL) + { + /* Create an empty resource list */ + ResourceList = ExAllocatePool(PagedPool, sizeof(CM_RESOURCE_LIST)); + if (!ResourceList) + return STATUS_NO_MEMORY; + + ResourceList->Count = 0; + + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + } + else + { + /* Copy existing resource requirement list */ + ResourceList = ExAllocatePool( + PagedPool, + FIELD_OFFSET(CM_RESOURCE_LIST, List) + DeviceExtension->DeviceInfo->ResourceListSize); + if (!ResourceList) + return STATUS_NO_MEMORY; + + ResourceList->Count = 1; + RtlCopyMemory( + &ResourceList->List, + DeviceExtension->DeviceInfo->ResourceList, + DeviceExtension->DeviceInfo->ResourceListSize); + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + } + + return STATUS_SUCCESS; } static NTSTATUS PdoQueryResourceRequirements( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) -{ - PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; - PIO_RESOURCE_REQUIREMENTS_LIST ResourceList; - ULONG ResourceListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List); - - DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (DeviceExtension->DeviceInfo->ResourceRequirementsList == NULL) - { - /* Create an empty resource list */ - ResourceList = ExAllocatePool(PagedPool, ResourceListSize); - if (!ResourceList) - return STATUS_NO_MEMORY; - - RtlZeroMemory(ResourceList, ResourceListSize); - ResourceList->ListSize = ResourceListSize; - - Irp->IoStatus.Information = (ULONG_PTR)ResourceList; - } - else - { - /* Copy existing resource requirement list */ - ResourceList = ExAllocatePool(PagedPool, DeviceExtension->DeviceInfo->ResourceRequirementsList->ListSize); - if (!ResourceList) - return STATUS_NO_MEMORY; - - RtlCopyMemory( - ResourceList, - DeviceExtension->DeviceInfo->ResourceRequirementsList, - DeviceExtension->DeviceInfo->ResourceRequirementsList->ListSize); - Irp->IoStatus.Information = (ULONG_PTR)ResourceList; - } - - return STATUS_SUCCESS; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; + PIO_RESOURCE_REQUIREMENTS_LIST ResourceList; + ULONG ResourceListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List); + + DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->DeviceInfo->ResourceRequirementsList == NULL) + { + /* Create an empty resource list */ + ResourceList = ExAllocatePool(PagedPool, ResourceListSize); + if (!ResourceList) + return STATUS_NO_MEMORY; + + RtlZeroMemory(ResourceList, ResourceListSize); + ResourceList->ListSize = ResourceListSize; + + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + } + else + { + /* Copy existing resource requirement list */ + ResourceList = ExAllocatePool(PagedPool, DeviceExtension->DeviceInfo->ResourceRequirementsList->ListSize); + if (!ResourceList) + return STATUS_NO_MEMORY; + + RtlCopyMemory( + ResourceList, + DeviceExtension->DeviceInfo->ResourceRequirementsList, + DeviceExtension->DeviceInfo->ResourceRequirementsList->ListSize); + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + } + + return STATUS_SUCCESS; } static NTSTATUS PdoQueryDeviceText( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) -{ - PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; - DEVICE_TEXT_TYPE DeviceTextType; - NTSTATUS Status = Irp->IoStatus.Status; - - DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - DeviceTextType = IrpSp->Parameters.QueryDeviceText.DeviceTextType; - - switch (DeviceTextType) - { - case DeviceTextDescription: - { - UNICODE_STRING String; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); - - Status = RtlDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DeviceExtension->DeviceInfo->DeviceDescription, - &String); - Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; - break; - } - - case DeviceTextLocationInformation: - { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); - Status = STATUS_NOT_SUPPORTED; - break; - } - - default: - { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown query id type 0x%lx\n", DeviceTextType); - } - } - - return Status; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; + DEVICE_TEXT_TYPE DeviceTextType; + NTSTATUS Status = Irp->IoStatus.Status; + + DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + DeviceTextType = IrpSp->Parameters.QueryDeviceText.DeviceTextType; + + switch (DeviceTextType) + { + case DeviceTextDescription: + { + UNICODE_STRING String; + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + + Status = RtlDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DeviceExtension->DeviceInfo->DeviceDescription, + &String); + Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; + break; + } + + case DeviceTextLocationInformation: + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); + Status = STATUS_NOT_SUPPORTED; + break; + } + + default: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown query id type 0x%lx\n", DeviceTextType); + } + } + + return Status; } static NTSTATUS PdoQueryId( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) -{ - PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; - BUS_QUERY_ID_TYPE IdType; - NTSTATUS Status = Irp->IoStatus.Status; - - DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - IdType = IrpSp->Parameters.QueryId.IdType; - - switch (IdType) - { - case BusQueryDeviceID: - { - UNICODE_STRING String; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); - - Status = RtlDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DeviceExtension->DeviceInfo->DeviceID, - &String); - Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; - break; - } - - case BusQueryHardwareIDs: - case BusQueryCompatibleIDs: - { - /* Optional, do nothing */ - break; - } - - case BusQueryInstanceID: - { - UNICODE_STRING String; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); - - Status = RtlDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DeviceExtension->DeviceInfo->InstanceID, - &String); - Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; - break; - } - - default: - { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); - } - } - - return Status; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; + BUS_QUERY_ID_TYPE IdType; + NTSTATUS Status = Irp->IoStatus.Status; + + DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + IdType = IrpSp->Parameters.QueryId.IdType; + + switch (IdType) + { + case BusQueryDeviceID: + { + UNICODE_STRING String; + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); + + Status = RtlDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DeviceExtension->DeviceInfo->DeviceID, + &String); + Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; + break; + } + + case BusQueryHardwareIDs: + case BusQueryCompatibleIDs: + { + /* Optional, do nothing */ + break; + } + + case BusQueryInstanceID: + { + UNICODE_STRING String; + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); + + Status = RtlDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DeviceExtension->DeviceInfo->InstanceID, + &String); + Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; + break; + } + + default: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); + } + } + + return Status; } static NTSTATUS PdoQueryBusInformation( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_STACK_LOCATION IrpSp) -{ - PPNP_BUS_INFORMATION BusInfo; - NTSTATUS Status; - - BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), TAG_PNP_ROOT); - if (!BusInfo) - Status = STATUS_NO_MEMORY; - else - { - RtlCopyMemory( - &BusInfo->BusTypeGuid, - &GUID_BUS_TYPE_INTERNAL, - sizeof(BusInfo->BusTypeGuid)); - BusInfo->LegacyBusType = PNPBus; - /* We're the only root bus enumerator on the computer */ - BusInfo->BusNumber = 0; - Irp->IoStatus.Information = (ULONG_PTR)BusInfo; - Status = STATUS_SUCCESS; - } - - return Status; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PPNP_BUS_INFORMATION BusInfo; + NTSTATUS Status; + + BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), TAG_PNP_ROOT); + if (!BusInfo) + Status = STATUS_NO_MEMORY; + else + { + RtlCopyMemory( + &BusInfo->BusTypeGuid, + &GUID_BUS_TYPE_INTERNAL, + sizeof(BusInfo->BusTypeGuid)); + BusInfo->LegacyBusType = PNPBus; + /* We're the only root bus enumerator on the computer */ + BusInfo->BusNumber = 0; + Irp->IoStatus.Information = (ULONG_PTR)BusInfo; + Status = STATUS_SUCCESS; + } + + return Status; } /* @@ -1083,24 +1079,24 @@ Status = PdoQueryId(DeviceObject, Irp, IrpSp); break; - case IRP_MN_QUERY_BUS_INFORMATION: /* 0x15 */ - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n"); - Status = PdoQueryBusInformation(DeviceObject, Irp, IrpSp); - break; - - default: - DPRINT1("IRP_MJ_PNP / Unknown minor function 0x%lx\n", IrpSp->MinorFunction); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - if (Status != STATUS_PENDING) - { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - - return Status; + case IRP_MN_QUERY_BUS_INFORMATION: /* 0x15 */ + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n"); + Status = PdoQueryBusInformation(DeviceObject, Irp, IrpSp); + break; + + default: + DPRINT1("IRP_MJ_PNP / Unknown minor function 0x%lx\n", IrpSp->MinorFunction); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + + if (Status != STATUS_PENDING) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; } /* @@ -1113,94 +1109,94 @@ */ static NTSTATUS NTAPI PnpRootPnpControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PPNPROOT_COMMON_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; - - DeviceExtension = (PPNPROOT_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (DeviceExtension->IsFDO) - Status = PnpRootFdoPnpControl(DeviceObject, Irp); - else - Status = PnpRootPdoPnpControl(DeviceObject, Irp); - - return Status; + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPNPROOT_COMMON_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DeviceExtension = (PPNPROOT_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->IsFDO) + Status = PnpRootFdoPnpControl(DeviceObject, Irp); + else + Status = PnpRootPdoPnpControl(DeviceObject, Irp); + + return Status; } NTSTATUS STDCALL PnpRootAddDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT PhysicalDeviceObject) -{ - PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; - - DPRINT("PnpRootAddDevice(DriverObject %p, Pdo %p)\n", DriverObject, PhysicalDeviceObject); - - if (!PhysicalDeviceObject) - { - DPRINT("PhysicalDeviceObject 0x%p\n", PhysicalDeviceObject); - Status = STATUS_INSUFFICIENT_RESOURCES; - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - Status = IoCreateDevice( - DriverObject, - sizeof(PNPROOT_FDO_DEVICE_EXTENSION), - NULL, - FILE_DEVICE_BUS_EXTENDER, - FILE_DEVICE_SECURE_OPEN, - TRUE, - &PnpRootDeviceObject); - if (!NT_SUCCESS(Status)) - { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - DPRINT("Created FDO %p\n", PnpRootDeviceObject); - - DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)PnpRootDeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(PNPROOT_FDO_DEVICE_EXTENSION)); - - DeviceExtension->Common.IsFDO = TRUE; - DeviceExtension->State = dsStopped; - InitializeListHead(&DeviceExtension->DeviceListHead); - DeviceExtension->DeviceListCount = 0; - KeInitializeGuardedMutex(&DeviceExtension->DeviceListLock); - - Status = IoAttachDeviceToDeviceStackSafe( - PnpRootDeviceObject, - PhysicalDeviceObject, - &DeviceExtension->Ldo); - if (!NT_SUCCESS(Status)) - { - DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - PnpRootDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - DPRINT("Done AddDevice()\n"); - - return STATUS_SUCCESS; + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT("PnpRootAddDevice(DriverObject %p, Pdo %p)\n", DriverObject, PhysicalDeviceObject); + + if (!PhysicalDeviceObject) + { + DPRINT("PhysicalDeviceObject 0x%p\n", PhysicalDeviceObject); + Status = STATUS_INSUFFICIENT_RESOURCES; + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + Status = IoCreateDevice( + DriverObject, + sizeof(PNPROOT_FDO_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_DEVICE_SECURE_OPEN, + TRUE, + &PnpRootDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + DPRINT("Created FDO %p\n", PnpRootDeviceObject); + + DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)PnpRootDeviceObject->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(PNPROOT_FDO_DEVICE_EXTENSION)); + + DeviceExtension->Common.IsFDO = TRUE; + DeviceExtension->State = dsStopped; + InitializeListHead(&DeviceExtension->DeviceListHead); + DeviceExtension->DeviceListCount = 0; + KeInitializeGuardedMutex(&DeviceExtension->DeviceListLock); + + Status = IoAttachDeviceToDeviceStackSafe( + PnpRootDeviceObject, + PhysicalDeviceObject, + &DeviceExtension->Ldo); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + PnpRootDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + DPRINT("Done AddDevice()\n"); + + return STATUS_SUCCESS; } NTSTATUS NTAPI PnpRootDriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) -{ - DPRINT("PnpRootDriverEntry(%p %wZ)\n", DriverObject, RegistryPath); - - DriverObject->DriverExtension->AddDevice = PnpRootAddDevice; - - DriverObject->MajorFunction[IRP_MJ_PNP] = PnpRootPnpControl; - //DriverObject->MajorFunction[IRP_MJ_POWER] = PnpRootPowerControl; - - return STATUS_SUCCESS; + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + DPRINT("PnpRootDriverEntry(%p %wZ)\n", DriverObject, RegistryPath); + + DriverObject->DriverExtension->AddDevice = PnpRootAddDevice; + + DriverObject->MajorFunction[IRP_MJ_PNP] = PnpRootPnpControl; + //DriverObject->MajorFunction[IRP_MJ_POWER] = PnpRootPowerControl; + + return STATUS_SUCCESS; } /* EOF */

1 0

[hpoussin] 30977: Remove "Unknown device" wizards
by hpoussin＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: hpoussin Date: Mon Dec 3 11:04:26 2007 New Revision: 30977 URL: http://svn.reactos.org/svn/reactos?rev=30977&view=rev Log: Remove "Unknown device" wizards Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Mon Dec 3 11:04:26 2007 @@ -36,9 +36,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB","CurrentConfig",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB\Hardware Profiles\0000","FriendlyName",0x00000000,"New Hardware Profile" -; The following line is only here to prevent the "New hardware wizard" to display a window for "Unknown device". -; This device comes from Root plug and play bus (ntoskrnl/io/pnproot.c) and this one should never appear -HKLM,"SYSTEM\CurrentControlSet\Enum\Root\LEGACY_UNKNOWN\0000","ConfigFlags",0x00010001,0x00000040 ; Keyboard Layouts HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000406","Layout File",0x00000000,"kbdda.dll" 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 (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Mon Dec 3 11:04:26 2007 @@ -2147,11 +2147,14 @@ ZwClose(InstanceKey); - DeviceNode->Flags |= DNF_PROCESSED; - - /* Report the device to the user-mode pnp manager */ - IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, - &DeviceNode->InstancePath); + IopDeviceNodeSetFlag(DeviceNode, DNF_PROCESSED); + + if (!IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER)) + { + /* Report the device to the user-mode pnp manager */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &DeviceNode->InstancePath); + } 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 (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Mon Dec 3 11:04:26 2007 @@ -328,6 +328,7 @@ PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension; OBJECT_ATTRIBUTES ObjectAttributes; PKEY_BASIC_INFORMATION KeyInfo = NULL, SubKeyInfo = NULL; + UNICODE_STRING LegacyU = RTL_CONSTANT_STRING(L"LEGACY_"); UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM L"\\" REGSTR_KEY_ROOTENUM); UNICODE_STRING SubKeyName; WCHAR DevicePath[MAX_PATH + 1]; @@ -405,8 +406,16 @@ /* Terminate the string */ KeyInfo->Name[KeyInfo->NameLength / sizeof(WCHAR)] = 0; + /* Check if it is a legacy driver */ + RtlInitUnicodeString(&SubKeyName, KeyInfo->Name); + if (RtlPrefixUnicodeString(&LegacyU, &SubKeyName, FALSE)) + { + DPRINT("Ignoring legacy driver '%wZ'\n", &SubKeyName); + Index1++; + continue; + } + /* Open the key */ - RtlInitUnicodeString(&SubKeyName, KeyInfo->Name); InitializeObjectAttributes( &ObjectAttributes, &SubKeyName,

1 0

[jimtabor] 30976: Imp Get/SetDeviceGammaRamp, not fully supported yet. Fix typos and updates.
by jimtabor＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: jimtabor Date: Mon Dec 3 10:32:10 2007 New Revision: 30976 URL: http://svn.reactos.org/svn/reactos?rev=30976&view=rev Log: Imp Get/SetDeviceGammaRamp, not fully supported yet. Fix typos and updates. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/eng/palette.c trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/objects/icm.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Mon Dec 3 10:32:10 2007 @@ -366,7 +366,7 @@ ULONG lucExcLock; ULONG Tid; - DHPDEV PDev; // GDIDEVICE.Handle + DHPDEV PDev; // GDIDEVICE.PDev INT DC_Type; INT DC_Flags; PVOID pPDev; // PGDIDEVICE Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/palette.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/palette.c Mon Dec 3 10:32:10 2007 @@ -31,6 +31,30 @@ #define NDEBUG #include <debug.h> + +// +// +// +VOID FASTCALL +ColorCorrection(PPALGDI PalGDI, PPALETTEENTRY PaletteEntry, ULONG Colors) +{ + PGDIDEVICE pGDev = (PGDIDEVICE)PalGDI->hPDev; + + if (!pGDev) return; + + if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) + { + INT i; + PGAMMARAMP GammaRamp = (PGAMMARAMP)pGDev->pvGammaRamp; + for ( i = 0; i < Colors; i++) + { + PaletteEntry[i].peRed += GammaRamp->Red[i]; + PaletteEntry[i].peGreen += GammaRamp->Green[i]; + PaletteEntry[i].peBlue += GammaRamp->Blue[i]; + } + } + return; +} /* * @implemented @@ -80,6 +104,9 @@ /* NOTE: PaletteEntry ULONGs are in the same order as PALETTEENTRY. */ RtlCopyMemory(PaletteEntry, PalGDI->IndexedColors + Start, sizeof(ULONG) * Colors); + if (PalGDI->Mode & PAL_GAMMACORRECTION) + ColorCorrection(PalGDI, (PPALETTEENTRY)PaletteEntry, Colors); + return Colors; } Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h Mon Dec 3 10:32:10 2007 @@ -10,26 +10,26 @@ #define PALETTE_WHITESET 0x2000 // Palette mode flags -#if 0 // Defined in ddk/winddi.h -#define PAL_INDEXED 0x00000001 -#define PAL_BITFIELDS 0x00000002 -#define PAL_RGB 0x00000004 -#define PAL_BGR 0x00000008 -#define PAL_CMYK 0x00000010 +#ifndef __WINDDI_H // Defined in ddk/winddi.h +#define PAL_INDEXED 0x00000001 // Indexed palette +#define PAL_BITFIELDS 0x00000002 // Bit fields used for DIB, DIB section +#define PAL_RGB 0x00000004 // Red, green, blue +#define PAL_BGR 0x00000008 // Blue, green, red +#define PAL_CMYK 0x00000010 // Cyan, magenta, yellow, black #endif #define PAL_DC 0x00000100 -#define PAL_FIXED 0x00000200 +#define PAL_FIXED 0x00000200 // Can't be changed #define PAL_FREE 0x00000400 #define PAL_MANAGED 0x00000800 #define PAL_NOSTATIC 0x00001000 -#define PAL_MONOCHROME 0x00002000 +#define PAL_MONOCHROME 0x00002000 // Two colors only #define PAL_BRUSHHACK 0x00004000 -#define PAL_DIBSECTION 0x00008000 +#define PAL_DIBSECTION 0x00008000 // Used for a DIB section #define PAL_NOSTATIC256 0x00010000 -#define PAL_HT 0x00100000 -#define PAL_RGB16_555 0x00200000 -#define PAL_RGB16_565 0x00400000 -#define PAL_GAMMACORRECTION 0x00800000 +#define PAL_HT 0x00100000 // Halftone palette +#define PAL_RGB16_555 0x00200000 // 16-bit RGB in 555 format +#define PAL_RGB16_565 0x00400000 // 16-bit RGB in 565 format +#define PAL_GAMMACORRECTION 0x00800000 // Correct colors typedef struct { int shift; @@ -52,6 +52,7 @@ ULONG RedMask; ULONG GreenMask; ULONG BlueMask; + HDEV hPDev; } PALGDI, *PPALGDI; HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode, Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h Mon Dec 3 10:32:10 2007 @@ -35,6 +35,7 @@ #define TAG_DC TAG('D', 'C', 'D', 'C') /* dc */ #define TAG_GDIOBJ TAG('G', 'D', 'I', 'O') /* gdi obj */ #define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ +#define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ #define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ #define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color map */ #define TAG_SHAPE TAG('S', 'H', 'A', 'P') /* shape */ Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c Mon Dec 3 10:32:10 2007 @@ -284,6 +284,7 @@ TRACEDRV_ROUTINE(EnableDirectDraw) TRACEDRV_ROUTINE(DisableDirectDraw) TRACEDRV_ROUTINE(QuerySpoolType) +TRACEDRV_ROUTINE(IcmSetDeviceGammaRamp) TRACEDRV_ROUTINE(GradientFill) TRACEDRV_ROUTINE(SynchronizeSurface) TRACEDRV_ROUTINE(AlphaBlend) @@ -352,6 +353,7 @@ TRACEDRVINFO_ENTRY(EnableDirectDraw), TRACEDRVINFO_ENTRY(DisableDirectDraw), TRACEDRVINFO_ENTRY(QuerySpoolType), + TRACEDRVINFO_ENTRY(IcmSetDeviceGammaRamp), TRACEDRVINFO_ENTRY(GradientFill), TRACEDRVINFO_ENTRY(SynchronizeSurface), TRACEDRVINFO_ENTRY(AlphaBlend) @@ -450,6 +452,7 @@ DRIVER_FUNCTION(EnableDirectDraw); DRIVER_FUNCTION(DisableDirectDraw); DRIVER_FUNCTION(QuerySpoolType); + DRIVER_FUNCTION(IcmSetDeviceGammaRamp); DRIVER_FUNCTION(GradientFill); DRIVER_FUNCTION(SynchronizeSurface); DRIVER_FUNCTION(AlphaBlend); Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c Mon Dec 3 10:32:10 2007 @@ -75,12 +75,93 @@ } BOOL +FASTCALL +IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) +{ + PGDIDEVICE pGDev = (PGDIDEVICE) hPDev; + int i; + + if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE; + + if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || + (pGDev->DevInfo.iDitherFormat == BMF_16BPP) || + (pGDev->DevInfo.iDitherFormat == BMF_24BPP) || + (pGDev->DevInfo.iDitherFormat == BMF_32BPP)) + { + if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) + RtlCopyMemory( Ramp, + pGDev->pvGammaRamp, + sizeof(GAMMARAMP)); + else + // Generate the 256-colors array + for(i=0; i<256; i++ ) + { + int NewValue = i * 256; + if (NewValue > 65535) NewValue = 65535; + + Ramp->Red[i] = Ramp->Green[i] = Ramp->Blue[i] = ((WORD)NewValue); + } + return TRUE; + } + else + return FALSE; +} + +BOOL STDCALL NtGdiGetDeviceGammaRamp(HDC hDC, LPVOID Ramp) { - UNIMPLEMENTED; - return FALSE; + BOOL Ret; + PDC dc; + NTSTATUS Status = STATUS_SUCCESS; + PGAMMARAMP SafeRamp; + + if (!Ramp) return FALSE; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + SafeRamp = ExAllocatePool(PagedPool, sizeof(GAMMARAMP)); + if (!SafeRamp) + { + DC_UnlockDc(dc); + SetLastWin32Error(STATUS_NO_MEMORY); + return FALSE; + } + + Ret = IntGetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp); + + if (!Ret) return Ret; + + _SEH_TRY + { + ProbeForWrite( Ramp, + sizeof(PVOID), + 1); + RtlCopyMemory( Ramp, + SafeRamp, + sizeof(GAMMARAMP)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + DC_UnlockDc(dc); + ExFreePool(SafeRamp); + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + return Ret; } BOOL @@ -113,12 +194,157 @@ } BOOL +FASTCALL +UpdateDeviceGammaRamp( HDEV hPDev ) +{ + BOOL Ret = FALSE; + PPALGDI palGDI; + PALOBJ *palPtr; + PGDIDEVICE pGDev = (PGDIDEVICE) hPDev; + + if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || + (pGDev->DevInfo.iDitherFormat == BMF_16BPP) || + (pGDev->DevInfo.iDitherFormat == BMF_24BPP) || + (pGDev->DevInfo.iDitherFormat == BMF_32BPP)) + { + if (pGDev->DriverFunctions.IcmSetDeviceGammaRamp) + return pGDev->DriverFunctions.IcmSetDeviceGammaRamp( pGDev->PDev, + IGRF_RGB_256WORDS, + pGDev->pvGammaRamp); + + if ( (pGDev->DevInfo.iDitherFormat != BMF_8BPP) || + !(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE; + + if (!(pGDev->flFlags & PDEV_GAMMARAMP_TABLE)) return FALSE; + + palGDI = PALETTE_LockPalette(pGDev->DevInfo.hpalDefault); + if(!palGDI) return FALSE; + palPtr = (PALOBJ*) palGDI; + + if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) + palGDI->Mode |= PAL_GAMMACORRECTION; + else + palGDI->Mode &= ~PAL_GAMMACORRECTION; + + if (!(pGDev->flFlags & PDEV_DRIVER_PUNTED_CALL)) // No punting, we hook + { + // BMF_8BPP only! + // PALOBJ_cGetColors check mode flags and update Gamma Correction. + // Set the HDEV to pal and go. + palGDI->hPDev = hPDev; + Ret = pGDev->DriverFunctions.SetPalette(pGDev->PDev, + palPtr, + 0, + 0, + palGDI->NumColors); + } + PALETTE_UnlockPalette(palGDI); + return Ret; + } + else + return FALSE; +} + +BOOL +FASTCALL +IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) +{ + BOOL Ret = FALSE; + PGDIDEVICE pGDev = (PGDIDEVICE) hPDev; + + if (!hPDev) return FALSE; + + if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE; + + if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || + (pGDev->DevInfo.iDitherFormat == BMF_16BPP) || + (pGDev->DevInfo.iDitherFormat == BMF_24BPP) || + (pGDev->DevInfo.iDitherFormat == BMF_32BPP)) + { + if (!pGDev->DriverFunctions.IcmSetDeviceGammaRamp) + { // No driver support + if (!(pGDev->DevInfo.flGraphicsCaps2 & GCAPS2_CHANGEGAMMARAMP)) + { // Driver does not support Gamma Ramp, so test to see we + // have BMF_8BPP only and palette operation support. + if ((pGDev->DevInfo.iDitherFormat != BMF_8BPP) || + !(pGDev->GDIInfo.flRaster & RC_PALETTE)) return FALSE; + } + } + + if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) + if (RtlCompareMemory( pGDev->pvGammaRamp, Ramp, sizeof(GAMMARAMP)) == + sizeof(GAMMARAMP)) return TRUE; + + if (!pGDev->pvGammaRamp && !(pGDev->flFlags & PDEV_GAMMARAMP_TABLE)) + { // If the above is true and we have nothing allocated, create it. + pGDev->pvGammaRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); + pGDev->flFlags |= PDEV_GAMMARAMP_TABLE; + } + // + // Need to adjust the input Ramp with internal brightness before copy. + // ICM subkey sets internal brightness, gamma range 128 or 256 during icm init. + RtlCopyMemory( pGDev->pvGammaRamp, Ramp, sizeof(GAMMARAMP)); + + Ret = UpdateDeviceGammaRamp(hPDev); + + return Ret; + } + else + return FALSE; +} + +BOOL STDCALL NtGdiSetDeviceGammaRamp(HDC hDC, LPVOID Ramp) { - UNIMPLEMENTED; - return FALSE; + BOOL Ret; + PDC dc; + NTSTATUS Status = STATUS_SUCCESS; + PGAMMARAMP SafeRamp; + if (!Ramp) return FALSE; + + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + SafeRamp = ExAllocatePool(PagedPool, sizeof(GAMMARAMP)); + if (!SafeRamp) + { + DC_UnlockDc(dc); + SetLastWin32Error(STATUS_NO_MEMORY); + return FALSE; + } + _SEH_TRY + { + ProbeForRead( Ramp, + sizeof(PVOID), + 1); + RtlCopyMemory( SafeRamp, + Ramp, + sizeof(GAMMARAMP)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + ExFreePool(SafeRamp); + SetLastNtError(Status); + return FALSE; + } + + Ret = IntSetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp); + DC_UnlockDc(dc); + ExFreePool(SafeRamp); + return Ret; } INT

1 0

[peterw] 30975: - Add license information and links for ccache and cygwin.
by peterw＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: peterw Date: Mon Dec 3 04:03:41 2007 New Revision: 30975 URL: http://svn.reactos.org/svn/reactos?rev=30975&view=rev Log: - Add license information and links for ccache and cygwin. Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt Mon Dec 3 04:03:41 2007 @@ -14,6 +14,10 @@ - GDB is licensed under the GPLv3. - NASM is licensed under the LGPLv2.1. + +- ccache is licensed under the GPLv2. + +- cygwin is licensed under the GPLv2. - Subversion is licensed under various licenses. (installed to INSTALLDIR\Tools\licences\*) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[peterw] 30974: - Add back the TinKRNL link, I'm an idiot and fix the GDB one.
by peterw＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: peterw Date: Mon Dec 3 03:25:29 2007 New Revision: 30974 URL: http://svn.reactos.org/svn/reactos?rev=30974&view=rev Log: - Add back the TinKRNL link, I'm an idiot and fix the GDB one. Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[peterw] 30973: - Bump GDB to v6.7.5.20071127 and remove the TinyKRNL link as the site seems to be down now.
by peterw＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: peterw Date: Mon Dec 3 03:12:29 2007 New Revision: 30973 URL: http://svn.reactos.org/svn/reactos?rev=30973&view=rev Log: - Bump GDB to v6.7.5.20071127 and remove the TinyKRNL link as the site seems to be down now. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Mon Dec 3 03:12:29 2007 @@ -1,7 +1,7 @@ *** XXX XXth, 200X - RosBE 1.1 Released - Updated: NASM to 2.00 (Peter Ward) -- Updated: GDB to 6.7.5.20071121 (Peter Ward) +- Updated: GDB to 6.7.5.20071127 (Peter Ward) - Updated RosBE Configuration Tool. (Pierre Schweitzer) - Added help strings when mouse is over a control. (Pierre Schweitzer) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[dreimer] 30972: Add German RC File to RasDLG (still TBD: Strings)
by dreimer＠svn.reactos.org 02 Dec '07

02 Dec '07

Author: dreimer Date: Sun Dec 2 23:16:33 2007 New Revision: 30972 URL: http://svn.reactos.org/svn/reactos?rev=30972&view=rev Log: Add German RC File to RasDLG (still TBD: Strings) Added: trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc (with props) Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/rasdlg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/de-D… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs