[ISAPNP] Fix reporting of devices with hexadecimal productId

This commit is contained in:
Hervé Poussineau 2020-03-22 23:22:48 +01:00
parent 1edfddf07a
commit eb66324d7c
2 changed files with 4 additions and 4 deletions

View file

@ -80,7 +80,7 @@ IsaFdoCreateDeviceIDs(
TempString.MaximumLength / sizeof(WCHAR), TempString.MaximumLength / sizeof(WCHAR),
&End, &End,
NULL, 0, NULL, 0,
L"ISAPNP\\%3S%04X", L"ISAPNP\\%.3S%04x",
LogDev->VendorId, LogDev->VendorId,
LogDev->ProdId); LogDev->ProdId);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -98,8 +98,8 @@ IsaFdoCreateDeviceIDs(
TempString.MaximumLength / sizeof(WCHAR), TempString.MaximumLength / sizeof(WCHAR),
&End, &End,
NULL, 0, NULL, 0,
L"ISAPNP\\%3S%04X@" L"ISAPNP\\%.3S%04x@"
L"*%3S%04X@", L"*%.3S%04x@",
LogDev->VendorId, LogDev->VendorId,
LogDev->ProdId, LogDev->ProdId,
LogDev->VendorId, LogDev->VendorId,

View file

@ -59,7 +59,7 @@ IsaPdoQueryCapabilities(
if (LogDev) if (LogDev)
{ {
DeviceCapabilities->UniqueID = LogDev->SerialNumber != 0xffffffff; DeviceCapabilities->UniqueID = TRUE;
DeviceCapabilities->Address = LogDev->CSN; DeviceCapabilities->Address = LogDev->CSN;
} }
else else