From: Elizabeth Figura <zfigura@codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b3f45751b99..92dbfe7a282 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1646,6 +1646,7 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, device = &wine_device->device_obj; device->DriverObject = driver; + device->Characteristics = characteristics; device->DeviceExtension = wine_device + 1; device->DeviceType = type; device->StackSize = 1; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index aea0a0bd252..76f7fd8d116 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2454,7 +2454,7 @@ static void test_device_object(void) ok(!lower_device->CurrentIrp, "Got current IRP %p.\n", lower_device->CurrentIrp); ok(!lower_device->Timer, "Got timer %p.\n", lower_device->Timer); todo_wine ok(lower_device->Flags == 0x40, "Got flags %#lx.\n", lower_device->Flags); - todo_wine ok(lower_device->Characteristics == (FILE_DEVICE_SECURE_OPEN | FILE_FLOPPY_DISKETTE | FILE_PORTABLE_DEVICE), + ok(lower_device->Characteristics == (FILE_DEVICE_SECURE_OPEN | FILE_FLOPPY_DISKETTE | FILE_PORTABLE_DEVICE), "Got characteristics %#lx.\n", lower_device->Characteristics); ok(!lower_device->Vpb, "Got VPB %p.\n", lower_device->Vpb); todo_wine ok(!lower_device->DeviceExtension, "Got extension %p.\n", lower_device->DeviceExtension); @@ -2474,7 +2474,7 @@ static void test_device_object(void) todo_wine ok(!upper_device->CurrentIrp, "Got current IRP %p.\n", upper_device->CurrentIrp); ok(!upper_device->Timer, "Got timer %p.\n", upper_device->Timer); todo_wine ok(upper_device->Flags == 0x40, "Got flags %#lx.\n", upper_device->Flags); - todo_wine ok(upper_device->Characteristics == (FILE_DEVICE_SECURE_OPEN | FILE_READ_ONLY_DEVICE), + ok(upper_device->Characteristics == (FILE_DEVICE_SECURE_OPEN | FILE_READ_ONLY_DEVICE), "Got characteristics %#lx.\n", upper_device->Characteristics); ok(!upper_device->Vpb, "Got VPB %p.\n", upper_device->Vpb); ok(!!upper_device->DeviceExtension, "Expected extension.\n"); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9941