Claire Girka : ntoskrnl/tests: Add test for getting SPDRP_BASE_CONTAINERID from PnP driver.
Alexandre Julliard
julliard at winehq.org
Mon Jul 25 16:18:24 CDT 2022
Module: wine
Branch: master
Commit: d930a0cc5ee1c0468b5955e8d312ed035c35559e
URL: https://gitlab.winehq.org/wine/wine/-/commit/d930a0cc5ee1c0468b5955e8d312ed035c35559e
Author: Claire Girka <claire at sitedethib.com>
Date: Tue Jul 12 20:00:54 2022 +0200
ntoskrnl/tests: Add test for getting SPDRP_BASE_CONTAINERID from PnP driver.
---
dlls/ntoskrnl.exe/tests/driver_pnp.c | 5 ++++-
dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c
index 1f22c4b9997..9a965f584cd 100644
--- a/dlls/ntoskrnl.exe/tests/driver_pnp.c
+++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c
@@ -228,7 +228,10 @@ static NTSTATUS query_id(struct device *device, IRP *irp, BUS_QUERY_ID_TYPE type
}
case BusQueryContainerID:
- return STATUS_NOT_SUPPORTED;
+ if (!(id = ExAllocatePool(PagedPool, 39 * sizeof(WCHAR))))
+ return STATUS_NO_MEMORY;
+ wcscpy(id, L"{12345678-1234-1234-1234-123456789123}");
+ break;
default:
ok(0, "Unexpected ID query type %#x.\n", type);
diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
index 64debcbebbf..6d1185301eb 100644
--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -1462,6 +1462,7 @@ static void test_pnp_devices(void)
static const char expect_compat_id[] = "winetest_compat\0winetest_compat_1\0";
char buffer[200];
+ WCHAR buffer_w[200];
SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer;
SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)};
SP_DEVINFO_DATA device = {sizeof(device)};
@@ -1646,6 +1647,11 @@ static void test_pnp_devices(void)
ok(size == sizeof(expect_hardware_id), "got size %lu\n", size);
ok(!memcmp(buffer, expect_hardware_id, size), "got hardware IDs %s\n", debugstr_an(buffer, size));
+ /* Using the WCHAR variant because Windows returns a WCHAR for this property even when using SetupDiGetDeviceRegistryPropertyA */
+ ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_BASE_CONTAINERID,
+ &type, (BYTE *)buffer_w, sizeof(buffer_w), &size);
+ todo_wine ok(ret, "got error %#lx\n", GetLastError());
+
ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_COMPATIBLEIDS,
&type, (BYTE *)buffer, sizeof(buffer), &size);
ok(ret, "got error %#lx\n", GetLastError());
More information about the wine-cvs
mailing list