[PATCH v7 1/2] mountmgr.sys: Introduce StorageDeviceSeekPenaltyProperty

[David Koolhoven]

From: Ackurus

Allows programs which demand support for
StorageDeviceSeekPenaltyProperty to function.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51065
Signed-off-by: David Koolhoven 
---
v7: Keep needed ntddstor.h changes.
---
 dlls/mountmgr.sys/device.c | 17 +++++++++++++++++
 include/ntddstor.h         |  9 ++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index 04e8fe3c0f5..8e18ed7ff22 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -1894,6 +1894,23 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )

break;
     }
+    case StorageDeviceSeekPenaltyProperty:
+    {
+        DEVICE_SEEK_PENALTY_DESCRIPTOR *descriptor;
+        FIXME( "Faking StorageDeviceSeekPenaltyProperty data with no penalty\n" );
+        if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR)) {
+		status = STATUS_INVALID_PARAMETER;
+		break;
+	}
+        memset( irp->AssociatedIrp.SystemBuffer, 0, sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR) );
+        descriptor = irp->AssociatedIrp.SystemBuffer;
+        descriptor->Version = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR);
+        descriptor->Size = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR);
+        descriptor->IncursSeekPenalty = FALSE;
+        status = STATUS_SUCCESS;
+        irp->IoStatus.Information = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR);
+        break;
+    }
     default:
         FIXME( "Unsupported property %#x\n", query->PropertyId );
         status = STATUS_NOT_SUPPORTED;
diff --git a/include/ntddstor.h b/include/ntddstor.h
index b8c4bb73b0d..836def413fe 100644
--- a/include/ntddstor.h
+++ b/include/ntddstor.h
@@ -214,7 +214,8 @@ typedef enum _STORAGE_QUERY_TYPE {

typedef enum _STORAGE_PROPERTY_ID {
     StorageDeviceProperty = 0,
-    StorageAdapterProperty
+    StorageAdapterProperty = 1,
+    StorageDeviceSeekPenaltyProperty = 7,
 } STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID;

typedef struct _STORAGE_PROPERTY_QUERY {
@@ -272,6 +273,12 @@ typedef struct _STORAGE_ADAPTER_DESCRIPTOR {
     USHORT                      BusMinorVersion;
 } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR;

+typedef struct _DEVICE_SEEK_PENALTY_DESCRIPTOR {
+    ULONG                       Version;
+    ULONG                       Size;
+    BOOLEAN                     IncursSeekPenalty;
+} DEVICE_SEEK_PENALTY_DESCRIPTOR, *PDEVICE_SEEK_PENALTY_DESCRIPTOR;
+
 #ifdef __cplusplus
 }
 #endif

[PATCH v7 2/2] kernel32/tests: Add SeekPenalty Test to Volume.c

[David Koolhoven]

From: Ackurus

Helps test for compatibility with SeekPenaltyQueryProperty.

Signed-off-by: David Koolhoven 
---
v2: Update module label.
---
 dlls/kernel32/tests/volume.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c
index ed3897a6b94..019f764019c 100644
--- a/dlls/kernel32/tests/volume.c
+++ b/dlls/kernel32/tests/volume.c
@@ -654,6 +654,40 @@ static void test_disk_query_property(void)
     CloseHandle(handle);
 }

+static void test_disk_query_seek_penalty_property(void)
+{
+    STORAGE_PROPERTY_QUERY query = {0};
+    DEVICE_SEEK_PENALTY_DESCRIPTOR descriptor = {0};
+    HANDLE handle;
+    DWORD error;
+    DWORD size;
+    BOOL ret;
+
+    handle = CreateFileA("\\.\PhysicalDrive0", GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
+                         0, 0);
+    if (handle == INVALID_HANDLE_VALUE)
+    {
+        win_skip("can't open \\.\PhysicalDrive0 %#x\n", GetLastError());
+        return;
+    }
+
+    query.PropertyId = (STORAGE_PROPERTY_ID)StorageDeviceSeekPenaltyProperty;
+    query.QueryType = PropertyStandardQuery;
+
+    SetLastError(0xdeadbeef);
+    ret = DeviceIoControl(handle, IOCTL_STORAGE_QUERY_PROPERTY, &query, sizeof(query), &descriptor, sizeof(descriptor),
+                          &size, NULL);
+    error = GetLastError();
+    /* Only should complete on Win7 and Win10 */
+    ok((ret) || (ret == ERROR_NOT_SUPPORTED), "expect ret %#x, got %#x\n", TRUE, ret);
+    ok((error == 0xdeadbeef) || (error == ERROR_NOT_SUPPORTED), "expect err %#x, got err %#x\n", 0xdeadbeef, error);
+    ok(size == sizeof(descriptor), "got size %d\n", size);
+    ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %d\n", descriptor.Version);
+    ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %d\n", descriptor.Size);
+
+    CloseHandle(handle);
+}
+
 static void test_GetVolumePathNameA(void)
 {
     char volume_path[MAX_PATH], cwd[MAX_PATH], expect_path[MAX_PATH];
@@ -1645,6 +1679,7 @@ START_TEST(volume)
     test_enum_vols();
     test_disk_extents();
     test_disk_query_property();
+    test_disk_query_seek_penalty_property();
     test_GetVolumePathNamesForVolumeNameA();
     test_GetVolumePathNamesForVolumeNameW();
     test_cdrom_ioctl();

[PATCH v7 2/2] kernel32/tests: Add SeekPenalty Test to Volume.c

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=91125

Your paranoid android.

=== w2008s64 (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w7u_2qxl (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w7u_el (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w8 (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w864 (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w1064v1507 (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w1064v1809 (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w1064 (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w1064_tsign (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w10pro64 (32 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== wvistau64 (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w2008s64 (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w864 (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w1064v1507 (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w1064v1809 (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w1064 (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w1064_2qxl (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w1064_tsign (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w10pro64 (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w10pro64_ar (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w10pro64_he (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w10pro64_ja (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0

=== w10pro64_zh_CN (64 bit report) ===

kernel32:
volume.c:682: Test failed: expect ret 0x1, got 0
volume.c:683: Test failed: expect err 0xdeadbeef, got err 0x1f
volume.c:684: Test failed: got size 40
volume.c:685: Test failed: got descriptor.Version 0
volume.c:686: Test failed: got descriptor.Size 0