[PATCH v5 8/8] ntoskrnl: Set Device ContainerID from driver when registering an interface

[Claire Girka]

From: Claire Girka

---
 dlls/ntoskrnl.exe/pnp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c
index 52da30d0c97..0d3d0dd3286 100644
--- a/dlls/ntoskrnl.exe/pnp.c
+++ b/dlls/ntoskrnl.exe/pnp.c
@@ -880,6 +880,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla
     struct wine_rb_entry *entry;
     DWORD required;
     HDEVINFO set;
+    WCHAR *id;

TRACE("device %p, class_guid %s, refstr %s, symbolic_link %p.\n",
             device, debugstr_guid(class_guid), debugstr_us(refstr), symbolic_link);
@@ -913,6 +914,13 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla
         return STATUS_UNSUCCESSFUL;
     }

+    if (!get_device_id(device, BusQueryContainerID, &id) && id)
+    {
+        SetupDiSetDeviceRegistryPropertyW( set, &sp_device, SPDRP_BASE_CONTAINERID, (BYTE *)id,
+            (lstrlenW( id ) + 1) * sizeof(WCHAR) );
+        ExFreePool( id );
+    }
+
     data->DevicePath[1] = '?';
     TRACE("Returning path %s.\n", debugstr_w(data->DevicePath));
     RtlCreateUnicodeString( &device_path, data->DevicePath);