Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ACPI]

Browse source 
- Fix AcpiRegQueryValue, to allow querying the required buffer size only (which was already used, but just didn't work)
- Fix GetProcessorInformation. Previously the function failed at the start, but no one checked the return value. Check return values of called functions, and properly NULL-Terminate the components of the REG_MULTI_SZ style value that  ProcessorHardwareIds is supposed to be.
- Fix NULL-termination in Bus_PDO_QueryDeviceId as well as clean up the code, fix indentation and broken if/else cases
- Add some ASSERTs and comments 

svn path=/trunk/; revision=61666
This commit is contained in:
Timo Kreuzer 2014-01-18 00:50:10 +00:00
parent ade4c1fae8
commit 48912992a4
2 changed files with 196 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
reactos/drivers/bus/acpi/buspdo.c
View file

@ -419,6 +419,9 @@ Bus_PDO_QueryDeviceId(
switch (stack->Parameters.QueryId.IdType) { switch (stack->Parameters.QueryId.IdType) {
case BusQueryDeviceID: case BusQueryDeviceID:
/* This is a REG_SZ value */
if (DeviceData->AcpiHandle) if (DeviceData->AcpiHandle)
{ {
acpi_bus_get_device(DeviceData->AcpiHandle, &Device); acpi_bus_get_device(DeviceData->AcpiHandle, &Device);
@ -437,9 +440,11 @@ Bus_PDO_QueryDeviceId(
L"ACPI\\FixedButton"); L"ACPI\\FixedButton");
} }
temp[++length] = UNICODE_NULL; temp[length++] = UNICODE_NULL;
buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA'); NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp));
buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA');
if (!buffer) { if (!buffer) {
status = STATUS_INSUFFICIENT_RESOURCES; status = STATUS_INSUFFICIENT_RESOURCES;
@ -452,6 +457,9 @@ Bus_PDO_QueryDeviceId(
break; break;
case BusQueryInstanceID: case BusQueryInstanceID:
/* This is a REG_SZ value */
/* See comment in BusQueryDeviceID case */ /* See comment in BusQueryDeviceID case */
if(DeviceData->AcpiHandle) if(DeviceData->AcpiHandle)
{ {
@ -466,10 +474,14 @@ Bus_PDO_QueryDeviceId(
length = swprintf(temp, L"%ls", L"0000"); length = swprintf(temp, L"%ls", L"0000");
} }
else else
{
/* FIXME: Generate unique id! */ /* FIXME: Generate unique id! */
length = swprintf(temp, L"%ls", L"0000"); length = swprintf(temp, L"%ls", L"0000");
}
temp[++length] = UNICODE_NULL; temp[length++] = UNICODE_NULL;
NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp));
buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof (WCHAR), 'IPCA'); buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof (WCHAR), 'IPCA');
if (!buffer) { if (!buffer) {
@ -483,6 +495,8 @@ Bus_PDO_QueryDeviceId(
break; break;
case BusQueryHardwareIDs: case BusQueryHardwareIDs:
/* This is a REG_MULTI_SZ value */
length = 0; length = 0;
/* See comment in BusQueryDeviceID case */ /* See comment in BusQueryDeviceID case */
@ -495,17 +509,6 @@ Bus_PDO_QueryDeviceId(
if (strcmp(Device->pnp.hardware_id, "Processor") == 0) if (strcmp(Device->pnp.hardware_id, "Processor") == 0)
{ {
/*
length += swprintf(&temp[length],
L"ACPI\\%s - %s",
ProcessorVendorIdentifier, ProcessorIdentifier);
length++;
length += swprintf(&temp[length],
L"*%s - %s",
ProcessorVendorIdentifier, ProcessorIdentifier);
length++;
*/
length = ProcessorHardwareIds.Length / sizeof(WCHAR); length = ProcessorHardwareIds.Length / sizeof(WCHAR);
src = ProcessorHardwareIds.Buffer; src = ProcessorHardwareIds.Buffer;
} }
@ -514,40 +517,30 @@ Bus_PDO_QueryDeviceId(
length += swprintf(&temp[length], length += swprintf(&temp[length],
L"ACPI\\%hs", L"ACPI\\%hs",
Device->pnp.hardware_id); Device->pnp.hardware_id);
length++; temp[length++] = UNICODE_NULL;
length += swprintf(&temp[length], length += swprintf(&temp[length],
L"*%hs", L"*%hs",
Device->pnp.hardware_id); Device->pnp.hardware_id);
length++; temp[length++] = UNICODE_NULL;
temp[length++] = UNICODE_NULL;
temp[length] = UNICODE_NULL; src = temp;
length++;
temp[length] = UNICODE_NULL;
src = temp;
} }
} }
else else
{ {
length += swprintf(&temp[length], length += swprintf(&temp[length],
L"ACPI\\FixedButton"); L"ACPI\\FixedButton");
length++; temp[length++] = UNICODE_NULL;
length += swprintf(&temp[length], length += swprintf(&temp[length],
L"*FixedButton"); L"*FixedButton");
length++; temp[length++] = UNICODE_NULL;
temp[length++] = UNICODE_NULL;
temp[length] = UNICODE_NULL; src = temp;
}
length++;
temp[length] = UNICODE_NULL;
src = temp;
}
NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp));
buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA'); buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA');
@ -562,6 +555,8 @@ Bus_PDO_QueryDeviceId(
break; break;
case BusQueryCompatibleIDs: case BusQueryCompatibleIDs:
/* This is a REG_MULTI_SZ value */
length = 0; length = 0;
status = STATUS_NOT_SUPPORTED; status = STATUS_NOT_SUPPORTED;
@ -578,18 +573,15 @@ Bus_PDO_QueryDeviceId(
length += swprintf(&temp[length], length += swprintf(&temp[length],
L"ACPI\\%hs", L"ACPI\\%hs",
Device->pnp.hardware_id); Device->pnp.hardware_id);
length++; temp[length++] = UNICODE_NULL;
length += swprintf(&temp[length], length += swprintf(&temp[length],
L"*%hs", L"*%hs",
Device->pnp.hardware_id); Device->pnp.hardware_id);
length++; temp[length++] = UNICODE_NULL;
temp[length++] = UNICODE_NULL;
temp[length] = UNICODE_NULL; NT_ASSERT(length * sizeof(WCHAR) <= sizeof(temp));
length++;
temp[length] = UNICODE_NULL;
buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA'); buffer = ExAllocatePoolWithTag (PagedPool, length * sizeof(WCHAR), 'IPCA');
if (!buffer) if (!buffer)
@ -988,7 +980,7 @@ Bus_PDO_QueryResources(
ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO;
ResourceDescriptor->u.Port.Start.QuadPart = io_data->Address; ResourceDescriptor->u.Port.Start.QuadPart = io_data->Address;
ResourceDescriptor->u.Port.Length = io_data->AddressLength; ResourceDescriptor->u.Port.Length = io_data->AddressLength;
ResourceDescriptor++; ResourceDescriptor++;
break; break;
} }
@ -1118,7 +1110,7 @@ Bus_PDO_QueryResources(
case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break;
case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break;
case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break;
} }
ResourceDescriptor->u.Memory.Start.QuadPart = addr64_data->Minimum; ResourceDescriptor->u.Memory.Start.QuadPart = addr64_data->Minimum;
ResourceDescriptor->u.Memory.Length = addr64_data->AddressLength; ResourceDescriptor->u.Memory.Length = addr64_data->AddressLength;
} }
@ -1163,7 +1155,7 @@ Bus_PDO_QueryResources(
case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; case ACPI_CACHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break;
case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; case ACPI_WRITE_COMBINING_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break;
case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; case ACPI_PREFETCHABLE_MEMORY: ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break;
} }
ResourceDescriptor->u.Memory.Start.QuadPart = addr64_data->Minimum; ResourceDescriptor->u.Memory.Start.QuadPart = addr64_data->Minimum;
ResourceDescriptor->u.Memory.Length = addr64_data->AddressLength; ResourceDescriptor->u.Memory.Length = addr64_data->AddressLength;
} }
@ -1214,7 +1206,7 @@ Bus_PDO_QueryResources(
ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE;
ResourceDescriptor->u.Memory.Start.QuadPart = memfixed32_data->Address; ResourceDescriptor->u.Memory.Start.QuadPart = memfixed32_data->Address;
ResourceDescriptor->u.Memory.Length = memfixed32_data->AddressLength; ResourceDescriptor->u.Memory.Length = memfixed32_data->AddressLength;
ResourceDescriptor++; ResourceDescriptor++;
break; break;
} }
@ -1466,7 +1458,7 @@ Bus_PDO_QueryResourceRequirements(
RequirementDescriptor->u.Port.Alignment = 1; RequirementDescriptor->u.Port.Alignment = 1;
RequirementDescriptor->u.Port.MinimumAddress.QuadPart = io_data->Address; RequirementDescriptor->u.Port.MinimumAddress.QuadPart = io_data->Address;
RequirementDescriptor->u.Port.MaximumAddress.QuadPart = io_data->Address + io_data->AddressLength - 1; RequirementDescriptor->u.Port.MaximumAddress.QuadPart = io_data->Address + io_data->AddressLength - 1;
RequirementDescriptor++; RequirementDescriptor++;
break; break;
} }
@ -1607,7 +1599,7 @@ Bus_PDO_QueryResourceRequirements(
case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break;
case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break;
case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break;
} }
RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum; RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum;
RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1;
RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength; RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength;
@ -1656,7 +1648,7 @@ Bus_PDO_QueryResourceRequirements(
case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break; case ACPI_CACHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_CACHEABLE; break;
case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break; case ACPI_WRITE_COMBINING_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_COMBINEDWRITE; break;
case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break;
} }
RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum; RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum;
RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1;
RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength; RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength;
@ -1714,7 +1706,7 @@ Bus_PDO_QueryResourceRequirements(
RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = fixedmem32_data->Address; RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = fixedmem32_data->Address;
RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = fixedmem32_data->Address + fixedmem32_data->AddressLength - 1; RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = fixedmem32_data->Address + fixedmem32_data->AddressLength - 1;
RequirementDescriptor->u.Memory.Length = fixedmem32_data->AddressLength; RequirementDescriptor->u.Memory.Length = fixedmem32_data->AddressLength;
RequirementDescriptor++; RequirementDescriptor++;
break; break;
} }

260
reactos/drivers/bus/acpi/main.c
View file

@ -225,7 +225,7 @@ ButtonWaitThread(PVOID Context)
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
} }
NTSTATUS NTSTATUS
NTAPI NTAPI
@ -372,18 +372,27 @@ AcpiRegQueryValue(IN HANDLE KeyHandle,
ULONG BufferLength = 0; ULONG BufferLength = 0;
NTSTATUS Status; NTSTATUS Status;
RtlInitUnicodeString(&Name, RtlInitUnicodeString(&Name, ValueName);
ValueName);
if (DataLength != NULL) if (DataLength != NULL)
BufferLength = *DataLength; BufferLength = *DataLength;
BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); /* Check if the caller provided a valid buffer */
if ((Data != NULL) && (BufferLength != 0))
{
BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data);
/* Allocate memory for the value */ /* Allocate memory for the value */
ValueInfo = ExAllocatePoolWithTag(PagedPool, BufferLength, 'IPCA'); ValueInfo = ExAllocatePoolWithTag(PagedPool, BufferLength, 'IPCA');
if (ValueInfo == NULL) if (ValueInfo == NULL)
return STATUS_NO_MEMORY; return STATUS_NO_MEMORY;
}
else
{
/* Caller didn't provide a valid buffer, assume he wants the size only */
ValueInfo = NULL;
BufferLength = 0;
}
/* Query the value */ /* Query the value */
Status = ZwQueryValueKey(KeyHandle, Status = ZwQueryValueKey(KeyHandle,
@ -392,26 +401,37 @@ AcpiRegQueryValue(IN HANDLE KeyHandle,
ValueInfo, ValueInfo,
BufferLength, BufferLength,
&BufferLength); &BufferLength);
if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW))
if (DataLength != NULL)
*DataLength = BufferLength;
/* Check if we have the size only */
if (ValueInfo == NULL)
{
/* Check for unexpected status */
if ((Status != STATUS_BUFFER_OVERFLOW) &&
(Status != STATUS_BUFFER_TOO_SMALL))
{
return Status;
}
/* All is well */
Status = STATUS_SUCCESS;
}
/* Otherwise the caller wanted data back, check if we got it */
else if (NT_SUCCESS(Status))
{ {
if (Type != NULL) if (Type != NULL)
*Type = ValueInfo->Type; *Type = ValueInfo->Type;
if (DataLength != NULL)
*DataLength = ValueInfo->DataLength;
}
/* Check if the caller wanted data back, and we got it */
if ((NT_SUCCESS(Status)) && (Data != NULL))
{
/* Copy it */ /* Copy it */
RtlMoveMemory(Data, RtlMoveMemory(Data, ValueInfo->Data, ValueInfo->DataLength);
ValueInfo->Data,
ValueInfo->DataLength);
/* if the type is REG_SZ and data is not 0-terminated /* if the type is REG_SZ and data is not 0-terminated
* and there is enough space in the buffer NT appends a \0 */ * and there is enough space in the buffer NT appends a \0 */
if (((ValueInfo->Type == REG_SZ) || (ValueInfo->Type == REG_EXPAND_SZ) || (ValueInfo->Type == REG_MULTI_SZ)) && if (((ValueInfo->Type == REG_SZ) ||
(ValueInfo->Type == REG_EXPAND_SZ) ||
(ValueInfo->Type == REG_MULTI_SZ)) &&
(ValueInfo->DataLength <= *DataLength - sizeof(WCHAR))) (ValueInfo->DataLength <= *DataLength - sizeof(WCHAR)))
{ {
WCHAR *ptr = (WCHAR *)((ULONG_PTR)Data + ValueInfo->DataLength); WCHAR *ptr = (WCHAR *)((ULONG_PTR)Data + ValueInfo->DataLength);
@ -421,10 +441,10 @@ AcpiRegQueryValue(IN HANDLE KeyHandle,
} }
/* Free the memory and return status */ /* Free the memory and return status */
ExFreePoolWithTag(ValueInfo, 'IPCA'); if (ValueInfo != NULL)
{
if ((Data == NULL) && (Status == STATUS_BUFFER_OVERFLOW)) ExFreePoolWithTag(ValueInfo, 'IPCA');
Status = STATUS_SUCCESS; }
return Status; return Status;
} }
@ -438,13 +458,15 @@ GetProcessorInformation(VOID)
LPWSTR HardwareIdsBuffer = NULL; LPWSTR HardwareIdsBuffer = NULL;
HANDLE ProcessorHandle = NULL; HANDLE ProcessorHandle = NULL;
ULONG Length, Level1Length = 0, Level2Length = 0, Level3Length = 0; ULONG Length, Level1Length = 0, Level2Length = 0, Level3Length = 0;
ULONG HardwareIdsLength = 0; SIZE_T HardwareIdsLength = 0;
SIZE_T VendorIdentifierLength;
ULONG i; ULONG i;
PWCHAR Ptr; PWCHAR Ptr;
NTSTATUS Status; NTSTATUS Status;
DPRINT1("GetProcessorInformation()\n"); DPRINT1("GetProcessorInformation()\n");
/* Open the key for CPU 0 */
Status = AcpiRegOpenKey(NULL, Status = AcpiRegOpenKey(NULL,
L"\\Registry\\Machine\\Hardware\\Description\\System\\CentralProcessor\\0", L"\\Registry\\Machine\\Hardware\\Description\\System\\CentralProcessor\\0",
KEY_READ, KEY_READ,
@ -452,84 +474,93 @@ GetProcessorInformation(VOID)
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
goto done; goto done;
AcpiRegQueryValue(ProcessorHandle, /* Query the processor identifier length */
L"Identifier", Status = AcpiRegQueryValue(ProcessorHandle,
NULL, L"Identifier",
NULL, NULL,
&Length); NULL,
&Length);
if (!NT_SUCCESS(Status))
goto done;
if (Length != 0) /* Remember the length as fallback for level 1-3 length */
Level1Length = Level2Length = Level3Length = Length;
/* Allocate a buffer large enough to be zero terminated */
Length += sizeof(UNICODE_NULL);
ProcessorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA');
if (ProcessorIdentifier == NULL)
{ {
ProcessorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); Status = STATUS_INSUFFICIENT_RESOURCES;
if (ProcessorIdentifier == NULL) goto done;
{
Status = STATUS_INSUFFICIENT_RESOURCES;
goto done;
}
Status = AcpiRegQueryValue(ProcessorHandle,
L"Identifier",
NULL,
ProcessorIdentifier,
&Length);
if (!NT_SUCCESS(Status))
goto done;
Length = 0;
} }
AcpiRegQueryValue(ProcessorHandle, /* Query the processor identifier string */
L"ProcessorNameString", Status = AcpiRegQueryValue(ProcessorHandle,
NULL, L"Identifier",
NULL, NULL,
&Length); ProcessorIdentifier,
&Length);
if (!NT_SUCCESS(Status))
goto done;
if (Length != 0) /* Query the processor name length */
Length = 0;
Status = AcpiRegQueryValue(ProcessorHandle,
L"ProcessorNameString",
NULL,
NULL,
&Length);
if (!NT_SUCCESS(Status))
goto done;
/* Allocate a buffer large enough to be zero terminated */
Length += sizeof(UNICODE_NULL);
ProcessorNameString = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA');
if (ProcessorNameString == NULL)
{ {
ProcessorNameString = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); Status = STATUS_INSUFFICIENT_RESOURCES;
if (ProcessorNameString == NULL) goto done;
{
Status = STATUS_INSUFFICIENT_RESOURCES;
goto done;
}
Status = AcpiRegQueryValue(ProcessorHandle,
L"ProcessorNameString",
NULL,
ProcessorNameString,
&Length);
if (!NT_SUCCESS(Status))
goto done;
Length = 0;
} }
AcpiRegQueryValue(ProcessorHandle, /* Query the processor name string */
L"VendorIdentifier", Status = AcpiRegQueryValue(ProcessorHandle,
NULL, L"ProcessorNameString",
NULL, NULL,
&Length); ProcessorNameString,
&Length);
if (!NT_SUCCESS(Status))
goto done;
if (Length != 0) /* Query the vendor identifier length */
Length = 0;
Status = AcpiRegQueryValue(ProcessorHandle,
L"VendorIdentifier",
NULL,
NULL,
&Length);
if (!NT_SUCCESS(Status) || (Length == 0))
goto done;
/* Allocate a buffer large enough to be zero terminated */
Length += sizeof(UNICODE_NULL);
ProcessorVendorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA');
if (ProcessorVendorIdentifier == NULL)
{ {
ProcessorVendorIdentifier = ExAllocatePoolWithTag(PagedPool, Length, 'IPCA'); Status = STATUS_INSUFFICIENT_RESOURCES;
if (ProcessorVendorIdentifier == NULL) goto done;
{
Status = STATUS_INSUFFICIENT_RESOURCES;
goto done;
}
Status = AcpiRegQueryValue(ProcessorHandle,
L"VendorIdentifier",
NULL,
ProcessorVendorIdentifier,
&Length);
if (!NT_SUCCESS(Status))
goto done;
Length = 0;
} }
/* Query the vendor identifier string */
Status = AcpiRegQueryValue(ProcessorHandle,
L"VendorIdentifier",
NULL,
ProcessorVendorIdentifier,
&Length);
if (!NT_SUCCESS(Status))
goto done;
/* Change spaces to underscores */
for (i = 0; i < wcslen(ProcessorIdentifier); i++) for (i = 0; i < wcslen(ProcessorIdentifier); i++)
{ {
if (ProcessorIdentifier[i] == L' ') if (ProcessorIdentifier[i] == L' ')
@ -557,15 +588,19 @@ GetProcessorInformation(VOID)
Level3Length = (ULONG)(Ptr - ProcessorIdentifier); Level3Length = (ULONG)(Ptr - ProcessorIdentifier);
} }
HardwareIdsLength = 5 + wcslen(ProcessorVendorIdentifier) + 3 + Level1Length + 1 + VendorIdentifierLength = (USHORT)wcslen(ProcessorVendorIdentifier);
1 + wcslen(ProcessorVendorIdentifier) + 3 + Level1Length + 1 +
5 + wcslen(ProcessorVendorIdentifier) + 3 + Level2Length + 1 +
1 + wcslen(ProcessorVendorIdentifier) + 3 + Level2Length + 1 +
5 + wcslen(ProcessorVendorIdentifier) + 3 + Level3Length + 1 +
1 + wcslen(ProcessorVendorIdentifier) + 3 + Level3Length + 1 +
2;
HardwareIdsBuffer = ExAllocatePoolWithTag(PagedPool, HardwareIdsLength * sizeof(WCHAR), 'IPCA'); /* Calculate the size of the full REG_MULTI_SZ data (see swprintf below) */
HardwareIdsLength = (5 + VendorIdentifierLength + 3 + Level1Length + 1 +
1 + VendorIdentifierLength + 3 + Level1Length + 1 +
5 + VendorIdentifierLength + 3 + Level2Length + 1 +
1 + VendorIdentifierLength + 3 + Level2Length + 1 +
5 + VendorIdentifierLength + 3 + Level3Length + 1 +
1 + VendorIdentifierLength + 3 + Level3Length + 1 +
1) * sizeof(WCHAR);
/* Allocate a buffer to the data */
HardwareIdsBuffer = ExAllocatePoolWithTag(PagedPool, HardwareIdsLength, 'IPCA');
if (HardwareIdsBuffer == NULL) if (HardwareIdsBuffer == NULL)
{ {
Status = STATUS_INSUFFICIENT_RESOURCES; Status = STATUS_INSUFFICIENT_RESOURCES;
@ -574,25 +609,28 @@ GetProcessorInformation(VOID)
Length = 0; Length = 0;
Length += swprintf(&HardwareIdsBuffer[Length], L"ACPI\\%s_-_%.*s", ProcessorVendorIdentifier, Level1Length, ProcessorIdentifier); Length += swprintf(&HardwareIdsBuffer[Length], L"ACPI\\%s_-_%.*s", ProcessorVendorIdentifier, Level1Length, ProcessorIdentifier);
Length++; HardwareIdsBuffer[Length++] = UNICODE_NULL;
Length += swprintf(&HardwareIdsBuffer[Length], L"*%s_-_%.*s", ProcessorVendorIdentifier, Level1Length, ProcessorIdentifier); Length += swprintf(&HardwareIdsBuffer[Length], L"*%s_-_%.*s", ProcessorVendorIdentifier, Level1Length, ProcessorIdentifier);
Length++; HardwareIdsBuffer[Length++] = UNICODE_NULL;
Length += swprintf(&HardwareIdsBuffer[Length], L"ACPI\\%s_-_%.*s", ProcessorVendorIdentifier, Level2Length, ProcessorIdentifier); Length += swprintf(&HardwareIdsBuffer[Length], L"ACPI\\%s_-_%.*s", ProcessorVendorIdentifier, Level2Length, ProcessorIdentifier);
Length++; HardwareIdsBuffer[Length++] = UNICODE_NULL;
Length += swprintf(&HardwareIdsBuffer[Length], L"*%s_-_%.*s", ProcessorVendorIdentifier, Level2Length, ProcessorIdentifier); Length += swprintf(&HardwareIdsBuffer[Length], L"*%s_-_%.*s", ProcessorVendorIdentifier, Level2Length, ProcessorIdentifier);
Length++; HardwareIdsBuffer[Length++] = UNICODE_NULL;
Length += swprintf(&HardwareIdsBuffer[Length], L"ACPI\\%s_-_%.*s", ProcessorVendorIdentifier, Level3Length, ProcessorIdentifier); Length += swprintf(&HardwareIdsBuffer[Length], L"ACPI\\%s_-_%.*s", ProcessorVendorIdentifier, Level3Length, ProcessorIdentifier);
Length++; HardwareIdsBuffer[Length++] = UNICODE_NULL;
Length += swprintf(&HardwareIdsBuffer[Length], L"*%s_-_%.*s", ProcessorVendorIdentifier, Level3Length, ProcessorIdentifier); Length += swprintf(&HardwareIdsBuffer[Length], L"*%s_-_%.*s", ProcessorVendorIdentifier, Level3Length, ProcessorIdentifier);
Length++; HardwareIdsBuffer[Length++] = UNICODE_NULL;
HardwareIdsBuffer[Length] = UNICODE_NULL; HardwareIdsBuffer[Length++] = UNICODE_NULL;
ProcessorHardwareIds.Length = HardwareIdsLength * sizeof(WCHAR); /* Make sure we counted correctly */
NT_ASSERT(Length * sizeof(WCHAR) == HardwareIdsLength);
ProcessorHardwareIds.Length = (SHORT)HardwareIdsLength;
ProcessorHardwareIds.MaximumLength = ProcessorHardwareIds.Length; ProcessorHardwareIds.MaximumLength = ProcessorHardwareIds.Length;
ProcessorHardwareIds.Buffer = HardwareIdsBuffer; ProcessorHardwareIds.Buffer = HardwareIdsBuffer;
@ -622,9 +660,15 @@ DriverEntry (
PUNICODE_STRING RegistryPath PUNICODE_STRING RegistryPath
) )
{ {
NTSTATUS Status;
DPRINT("Driver Entry \n"); DPRINT("Driver Entry \n");
GetProcessorInformation(); Status = GetProcessorInformation();
if (!NT_SUCCESS(Status))
{
NT_ASSERT(FALSE);
return Status;
}
// //
// Set entry points into the driver // Set entry points into the driver