hidclass: Improve error handling in get_device_id.

Do not assume the underlying driver will return meaningful data, as it may not support BusQueryContainerID which will be queried in a next commit.

hidclass: Improve error handling in get_device_id.
8ed6b160 · Claire Girka · Alexandre Julliard · d930a0cc · 8ed6b160
Commit 8ed6b160 authored Jul 12, 2022 by Claire Girka Committed by Alexandre Julliard Jul 25, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

pnp.c dlls/hidclass.sys/pnp.c +7 -2

No files found.
--- a/dlls/hidclass.sys/pnp.c
+++ b/dlls/hidclass.sys/pnp.c
@@ -84,11 +84,16 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH
    irpsp->MinorFunction = IRP_MN_QUERY_ID;
    irpsp->Parameters.QueryId.IdType = type;

+    irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
    if (IoCallDriver(device, irp) == STATUS_PENDING)
        KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL);

-    wcscpy(id, (WCHAR *)irp_status.Information);
-    ExFreePool((WCHAR *)irp_status.Information);
+    if (!irp_status.Status)
+    {
+        wcscpy(id, (WCHAR *)irp_status.Information);
+        ExFreePool((WCHAR *)irp_status.Information);
+    }
+
    return irp_status.Status;
 }