Re: [PATCH v4 7/9] ntoskrnl: Set device ContainerID from driver

[Zebediah Figura]

On 7/12/22 13:01, Claire Girka wrote:
> From: Claire Girka
>
> dlls/ntoskrnl.exe/pnp.c | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c
> index 69f15d82875..e12e46f94f1 100644
> --- a/dlls/ntoskrnl.exe/pnp.c
> +++ b/dlls/ntoskrnl.exe/pnp.c
> @@ -281,6 +281,13 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN
>               sizeof_multiszW( ids ) * sizeof(WCHAR) );
>       ExFreePool( ids );
> - if (!get_device_id(device, BusQueryContainerID, &ids) && ids)

Here, too, I don't think the driver should be returning success and 
NULL. We handle that elsewhere but I'm not sure we should.
> - {
> -
>    SetupDiSetDeviceRegistryPropertyW( set, sp_device, SPDRP_BASE_CONTAINERID, (BYTE *)ids,
> -
>        (lstrlenW( ids ) + 1) * sizeof(WCHAR) );
> -
>    ExFreePool( ids );
> - }
> -
> if (!SetupDiBuildDriverInfoList( set, sp_device, SPDIT_COMPATDRIVER ))
> {
>     ERR("Failed to build compatible driver list, error %#lx.\n", GetLastError());