Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 09:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Respect the fact, that the driver can return NULL-pointer, instead of a string having 0 characters!

Browse source 
(makes third-party drivers compatibility better)

svn path=/trunk/; revision=19963
This commit is contained in:
Aleksey Bragin 2005-12-08 10:30:08 +00:00
parent 26d7ea3aa9
commit 4addbb9a4b
1 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

41
reactos/ntoskrnl/io/pnpmgr.c
View file

@ -1586,9 +1586,10 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
{ {
/* Add information from parent bus device to InstancePath */ /* Add information from parent bus device to InstancePath */
wcscat(InstancePath, ParentIdPrefix.Buffer); wcscat(InstancePath, ParentIdPrefix.Buffer);
if (*(PWSTR)IoStatusBlock.Information) if (IoStatusBlock.Information && *(PWSTR)IoStatusBlock.Information)
wcscat(InstancePath, L"&"); wcscat(InstancePath, L"&");
} }
if (IoStatusBlock.Information)
wcscat(InstancePath, (PWSTR)IoStatusBlock.Information); wcscat(InstancePath, (PWSTR)IoStatusBlock.Information);
/* /*
@ -1701,7 +1702,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_ID, IRP_MN_QUERY_ID,
&Stack); &Stack);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status) && IoStatusBlock.Information)
{ {
/* /*
* FIXME: Check for valid characters, if there is invalid characters * FIXME: Check for valid characters, if there is invalid characters
@ -1730,7 +1731,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
(TotalLength + 1) * sizeof(WCHAR)); (TotalLength + 1) * sizeof(WCHAR));
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); DPRINT1("ZwSetValueKey() failed (Status %lx) or no Compatible ID returned\n", Status);
} }
} }
else else
@ -1748,10 +1749,13 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_DEVICE_TEXT, IRP_MN_QUERY_DEVICE_TEXT,
&Stack); &Stack);
if (NT_SUCCESS(Status)) /* This key is mandatory, so even if the Irp fails, we still write it */
{
RtlInitUnicodeString(&ValueName, L"DeviceDesc"); RtlInitUnicodeString(&ValueName, L"DeviceDesc");
if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND) if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND)
{
if (NT_SUCCESS(IoStatusBlock.Status) &&
IoStatusBlock.Information &&
(*(PWSTR)IoStatusBlock.Information != 0))
{ {
/* This key is overriden when a driver is installed. Don't write the /* This key is overriden when a driver is installed. Don't write the
* new description if another one already exists */ * new description if another one already exists */
@ -1762,14 +1766,25 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
(PVOID)IoStatusBlock.Information, (PVOID)IoStatusBlock.Information,
(wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR)); (wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR));
} }
else
{
UNICODE_STRING DeviceDesc;
RtlInitUnicodeString(&DeviceDesc, L"Unknown Device");
DPRINT("Driver didn't return DeviceDesc (Status %x), so place unknown device there\n", Status);
Status = ZwSetValueKey(InstanceKey,
&ValueName,
0,
REG_SZ,
&DeviceDesc,
(wcslen((PWSTR)&DeviceDesc) + 1) * sizeof(WCHAR));
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status); DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status);
} }
} }
else
{
DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status);
} }
DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextLocation to device stack\n"); DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextLocation to device stack\n");
@ -1781,7 +1796,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_DEVICE_TEXT, IRP_MN_QUERY_DEVICE_TEXT,
&Stack); &Stack);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status) && IoStatusBlock.Information)
{ {
DPRINT("LocationInformation: %S\n", (PWSTR)IoStatusBlock.Information); DPRINT("LocationInformation: %S\n", (PWSTR)IoStatusBlock.Information);
RtlInitUnicodeString(&ValueName, L"LocationInformation"); RtlInitUnicodeString(&ValueName, L"LocationInformation");
@ -1798,7 +1813,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
} }
else else
{ {
DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status);
} }
DPRINT("Sending IRP_MN_QUERY_BUS_INFORMATION to device stack\n"); DPRINT("Sending IRP_MN_QUERY_BUS_INFORMATION to device stack\n");
@ -1808,7 +1823,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_BUS_INFORMATION, IRP_MN_QUERY_BUS_INFORMATION,
NULL); NULL);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status) && IoStatusBlock.Information)
{ {
PPNP_BUS_INFORMATION BusInformation = PPNP_BUS_INFORMATION BusInformation =
(PPNP_BUS_INFORMATION)IoStatusBlock.Information; (PPNP_BUS_INFORMATION)IoStatusBlock.Information;
@ -1820,7 +1835,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
} }
else else
{ {
DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status);
DeviceNode->ChildBusNumber = 0xFFFFFFF0; DeviceNode->ChildBusNumber = 0xFFFFFFF0;
DeviceNode->ChildInterfaceType = InterfaceTypeUndefined; DeviceNode->ChildInterfaceType = InterfaceTypeUndefined;
@ -1834,7 +1849,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
&IoStatusBlock, &IoStatusBlock,
IRP_MN_QUERY_RESOURCES, IRP_MN_QUERY_RESOURCES,
NULL); NULL);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status) && IoStatusBlock.Information)
{ {
DeviceNode->BootResources = DeviceNode->BootResources =
(PCM_RESOURCE_LIST)IoStatusBlock.Information; (PCM_RESOURCE_LIST)IoStatusBlock.Information;