From: Alexander Morozov amorozov@etersoft.ru
--- dlls/ntoskrnl.exe/pnp.c | 3 +-- dlls/ntoskrnl.exe/tests/driver_pnp.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index f887bfc619d..49af547d4fa 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -573,14 +573,13 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP { WCHAR *id, *ptr;
- status = get_device_id( device, BusQueryInstanceID, &id ); + status = get_device_id( device, BusQueryDeviceID, &id ); if (status != STATUS_SUCCESS) { ERR("Failed to get instance ID, status %#lx.\n", status); break; }
- wcsupr( id ); ptr = wcschr( id, '\' ); if (ptr) *ptr = 0;
diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index 7e94c643ae9..a5fb145c387 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -741,9 +741,9 @@ static void test_enumerator_name(void) memset(buffer, 0, sizeof(buffer)); status = IoGetDeviceProperty(bus_pdo, DevicePropertyEnumeratorName, sizeof(buffer), buffer, &req_size); ok(status == STATUS_SUCCESS, "IoGetDeviceProperty failed: %#lx\n", status); - todo_wine ok(req_size == sizeof(root), "unexpected size %lu\n", req_size); + ok(req_size == sizeof(root), "unexpected size %lu\n", req_size); if (status == STATUS_SUCCESS) - todo_wine ok(!wcscmp(root, buffer), "unexpected property value '%ls'\n", buffer); + ok(!wcscmp(root, buffer), "unexpected property value '%ls'\n", buffer); }
static void test_child_enumerator_name(DEVICE_OBJECT *device) @@ -757,9 +757,9 @@ static void test_child_enumerator_name(DEVICE_OBJECT *device) status = IoGetDeviceProperty(device, DevicePropertyEnumeratorName, sizeof(buffer), buffer, &req_size); todo_wine ok(query_id_count == 0, "expected no IRP_MN_QUERY_ID\n"); ok(status == STATUS_SUCCESS, "IoGetDeviceProperty failed: %#lx\n", status); - todo_wine ok(req_size == sizeof(wine), "unexpected size %lu\n", req_size); + ok(req_size == sizeof(wine), "unexpected size %lu\n", req_size); if (status == STATUS_SUCCESS) - todo_wine ok(!wcscmp(wine, buffer), "unexpected property value '%ls'\n", buffer); + ok(!wcscmp(wine, buffer), "unexpected property value '%ls'\n", buffer); }
static void test_device_registry_key(void)