[PATCH 1/2] ntoskrnl/tests: Add tests for getting IRP_MN_QUERY_DEVICE_TEXT based device properties.

[Connor McAdams]

From: Connor McAdams

Signed-off-by: Connor McAdams 
---
 dlls/ntoskrnl.exe/tests/driver_pnp.c | 37 +++++++++++++++++++++++++
 dlls/ntoskrnl.exe/tests/ntoskrnl.c   | 41 ++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c
index 1a0717656c5..c33a8d6a082 100644
--- a/dlls/ntoskrnl.exe/tests/driver_pnp.c
+++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c
@@ -265,6 +265,38 @@ static NTSTATUS query_id(struct device *device, IRP *irp, BUS_QUERY_ID_TYPE type
     return STATUS_SUCCESS;
 }

+static NTSTATUS query_text(struct device *device, IRP *irp, DEVICE_TEXT_TYPE type, LCID locale)
+{
+    static const WCHAR device_text2[] = L"WineTestDeviceLocation";
+    static const WCHAR device_text[] = L"WineTestDevice";
+    WCHAR *text = NULL;
+
+    irp->IoStatus.Information = 0;
+    switch (type)
+    {
+        case DeviceTextDescription:
+            todo_wine ok(locale, "Expected locale to be set.\n");
+            if (!(text = ExAllocatePool(PagedPool, sizeof(device_text))))
+                return STATUS_NO_MEMORY;
+            wcscpy(text, device_text);
+            break;
+
+        case DeviceTextLocationInformation:
+            todo_wine ok(locale, "Expected locale to be set.\n");
+            if (!(text = ExAllocatePool(PagedPool, sizeof(device_text2))))
+                return STATUS_NO_MEMORY;
+            wcscpy(text, device_text2);
+            break;
+
+        default:
+            ok(0, "Unexpected device text type %#x.\n", type);
+            return irp->IoStatus.Status;
+    }
+
+    irp->IoStatus.Information = (ULONG_PTR)text;
+    return STATUS_SUCCESS;
+}
+
 static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp)
 {
     IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp);
@@ -422,6 +454,11 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp)
             cancel_remove_device_count++;
             ret = STATUS_SUCCESS;
             break;
+
+        case IRP_MN_QUERY_DEVICE_TEXT:
+            ret = query_text(device, irp, stack->Parameters.QueryDeviceText.DeviceTextType,
+                    stack->Parameters.QueryDeviceText.LocaleId);
+            break;
     }

irp->IoStatus.Status = ret;
diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
index 6d3914c8c0b..63b7f13d6b4 100644
--- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
@@ -1640,6 +1640,9 @@ static void test_pnp_devices(void)
     static const char expect_hardware_id[] = "winetest_hardware\0winetest_hardware_1\0";
     static const WCHAR expect_hardware_id_w[] = L"winetest_hardware\0winetest_hardware_1\0";
     static const char expect_compat_id[] = "winetest_compat\0winetest_compat_1\0";
+    static const char expect_device_location[] = "WineTestDeviceLocation";
+    static const WCHAR expect_device_location_w[] = L"WineTestDeviceLocation";
+    static const WCHAR expect_device_bus_desc_w[] = L"WineTestDevice";
     static const WCHAR expect_compat_id_w[] = L"winetest_compat\0winetest_compat_1\0";
     static const WCHAR expect_container_id_w[] = L"{12345678-1234-1234-1234-123456789123}";
     static const char foobar[] = "foobar";
@@ -1926,6 +1929,16 @@ static void test_pnp_devices(void)
         ok(!strcmp(buffer, "\Device\winetest_pnp_1"), "got PDO name %s\n", debugstr_a(buffer));
     }

+    ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_LOCATION_INFORMATION, &type, (BYTE *)buffer,
+            sizeof(buffer), &size);
+    todo_wine ok(ret, "Got error %#lx.\n", GetLastError());
+    if (ret)
+    {
+        ok(type == REG_SZ, "Got type %lu.\n", type);
+        ok(size == sizeof(expect_device_location), "Got size %lu.\n", size);
+        ok(!strcmp(buffer, expect_device_location), "Got location information %s.\n", debugstr_a(buffer));
+    }
+
     prop_type = DEVPROP_TYPE_EMPTY;
     size = 0;
     memset(buffer_w, 0, sizeof(buffer_w));
@@ -1956,6 +1969,34 @@ static void test_pnp_devices(void)
     ok(IsEqualGUID(&buffer_guid, &expect_container_id_guid), "got container ID %s != %s\n",
        debugstr_guid(&buffer_guid), debugstr_guid(&expect_container_id_guid));

+    /* DEVPKEY_Device_BusReportedDeviceDesc. */
+    prop_type = DEVPROP_TYPE_EMPTY;
+    size = 0;
+    memset(buffer_w, 0, sizeof(buffer_w));
+    ret = SetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_BusReportedDeviceDesc, &prop_type, (BYTE *)buffer_w,
+                                    sizeof(buffer_w), &size, 0);
+    todo_wine ok(ret, "Got error %#lx.\n", GetLastError());
+    if (ret)
+    {
+        ok(prop_type == DEVPROP_TYPE_STRING, "got type %#lx\n", prop_type);
+        ok(size == sizeof(expect_device_bus_desc_w), "Got size %lu.\n", size);
+        ok(!wcscmp(buffer_w, expect_device_bus_desc_w), "Got device bus desc %s.\n", debugstr_w(buffer_w));
+    }
+
+    /* DEVPKEY_Device_LocationInfo. */
+    prop_type = DEVPROP_TYPE_EMPTY;
+    size = 0;
+    memset(buffer_w, 0, sizeof(buffer_w));
+    ret = SetupDiGetDevicePropertyW(set, &device, &DEVPKEY_Device_LocationInfo, &prop_type, (BYTE *)buffer_w,
+                                    sizeof(buffer_w), &size, 0);
+    todo_wine ok(ret, "Got error %#lx.\n", GetLastError());
+    if (ret)
+    {
+        ok(prop_type == DEVPROP_TYPE_STRING, "got type %#lx\n", prop_type);
+        ok(size == sizeof(expect_device_location_w), "Got size %lu.\n", size);
+        ok(!wcscmp(buffer_w, expect_device_location_w), "Got device location info %s.\n", debugstr_w(buffer_w));
+    }
+
     ret = SetupDiEnumDeviceInterfaces(set, NULL, &child_class, 0, &iface);
     ok(ret, "failed to get interface, error %#lx\n", GetLastError());
     ok(IsEqualGUID(&iface.InterfaceClassGuid, &child_class),