zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-21 17:09:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

mountmgr.sys: Stub StorageDeviceSeekPenaltyProperty query.

Browse source
This commit is contained in:
Paul Gofman 2024-08-16 09:34:30 -06:00 committed by Alexandre Julliard
parent a7abbfd172
commit 4e3037592b
Notes: Alexandre Julliard 2024-11-05 22:28:38 +01:00 
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/wine/merge_requests/6769
3 changed files with 107 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
dlls/kernel32/tests/volume.c
View file

@ -620,6 +620,7 @@ static void test_disk_query_property(void)
STORAGE_PROPERTY_QUERY query = {0};
STORAGE_DESCRIPTOR_HEADER header = {0};
STORAGE_DEVICE_DESCRIPTOR descriptor = {0};
DEVICE_SEEK_PENALTY_DESCRIPTOR seek_pen = {0};
HANDLE handle;
DWORD error;
DWORD size;
@ -656,6 +657,40 @@ static void test_disk_query_property(void)
ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %ld\n", descriptor.Version);
ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %ld\n", descriptor.Size);
query.PropertyId = StorageDeviceSeekPenaltyProperty;
query.QueryType = PropertyStandardQuery;
SetLastError(0xdeadbeef);
ret = DeviceIoControl(handle, IOCTL_STORAGE_QUERY_PROPERTY, &query, sizeof(query), &header, sizeof(header), &size,
NULL);
error = GetLastError();
if (!ret && error == ERROR_INVALID_FUNCTION)
{
win_skip( "StorageDeviceSeekPenaltyProperty is not supported.\n" ); /* Win7 */
}
else
{
ok(ret, "expect ret %#x, got %#x\n", TRUE, ret);
ok(error == 0xdeadbeef, "expect err %#x, got err %#lx\n", 0xdeadbeef, error);
ok(size == sizeof(header), "got size %ld\n", size);
ok(header.Version == sizeof(seek_pen), "got header.Version %ld\n", header.Version);
ok(header.Size == sizeof(seek_pen), "got header.Size %ld\n", header.Size);
memset(&seek_pen, 0xcc, sizeof(seek_pen));
ret = DeviceIoControl(handle, IOCTL_STORAGE_QUERY_PROPERTY, &query, sizeof(query), &seek_pen, sizeof(seek_pen),
&size, NULL);
error = GetLastError();
ok(ret || (error == ERROR_INVALID_FUNCTION /* Win8 VMs */ || (error == ERROR_GEN_FAILURE /* VMs */)),
"got ret %d, error %#lx\n", ret, error);
if (ret)
{
ok(size == sizeof(seek_pen), "got size %ld\n", size);
ok(seek_pen.Version == sizeof(seek_pen), "got %ld\n", seek_pen.Version);
ok(seek_pen.Size == sizeof(seek_pen), "got %ld\n", seek_pen.Size);
ok(seek_pen.IncursSeekPenalty == TRUE || seek_pen.IncursSeekPenalty == FALSE, "got %d.\n", seek_pen.IncursSeekPenalty);
}
}
CloseHandle(handle);
}

28
dlls/mountmgr.sys/device.c
View file

@ -1594,6 +1594,34 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
break;
}
case StorageDeviceSeekPenaltyProperty:
{
DEVICE_SEEK_PENALTY_DESCRIPTOR *d = irp->AssociatedIrp.SystemBuffer;
if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER))
{
status = STATUS_INVALID_PARAMETER;
}
else
{
if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(*d))
{
d->Version = d->Size = sizeof(*d);
irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER);
}
else
{
FIXME( "Faking StorageDeviceSeekPenaltyProperty data.\n" );
memset( d, 0, sizeof(*d) );
d->Version = d->Size = sizeof(*d);
irp->IoStatus.Information = sizeof(*d);
}
status = STATUS_SUCCESS;
}
break;
}
default:
FIXME( "Unsupported property %#x\n", query->PropertyId );
status = STATUS_NOT_SUPPORTED;

45
include/ntddstor.h
View file

@ -214,7 +214,44 @@ typedef enum _STORAGE_QUERY_TYPE {
typedef enum _STORAGE_PROPERTY_ID {
StorageDeviceProperty = 0,
StorageAdapterProperty
StorageAdapterProperty,
StorageDeviceIdProperty,
StorageDeviceUniqueIdProperty,
StorageDeviceWriteCacheProperty,
StorageMiniportProperty,
StorageAccessAlignmentProperty,
StorageDeviceSeekPenaltyProperty,
StorageDeviceTrimProperty,
StorageDeviceWriteAggregationProperty,
StorageDeviceDeviceTelemetryProperty,
StorageDeviceLBProvisioningProperty,
StorageDevicePowerProperty,
StorageDeviceCopyOffloadProperty,
StorageDeviceResiliencyProperty,
StorageDeviceMediumProductType,
StorageAdapterRpmbProperty,
StorageAdapterCryptoProperty,
StorageDeviceIoCapabilityProperty = 48,
StorageAdapterProtocolSpecificProperty,
StorageDeviceProtocolSpecificProperty,
StorageAdapterTemperatureProperty,
StorageDeviceTemperatureProperty,
StorageAdapterPhysicalTopologyProperty,
StorageDevicePhysicalTopologyProperty,
StorageDeviceAttributesProperty,
StorageDeviceManagementStatus,
StorageAdapterSerialNumberProperty,
StorageDeviceLocationProperty,
StorageDeviceNumaProperty,
StorageDeviceZonedDeviceProperty,
StorageDeviceUnsafeShutdownCount,
StorageDeviceEnduranceProperty,
StorageDeviceLedStateProperty,
StorageDeviceSelfEncryptionProperty = 64,
StorageFruIdProperty,
StorageStackProperty,
StorageAdapterProtocolSpecificPropertyEx,
StorageDeviceProtocolSpecificPropertyEx,
} STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID;
typedef struct _STORAGE_PROPERTY_QUERY {
@ -223,6 +260,12 @@ typedef struct _STORAGE_PROPERTY_QUERY {
UCHAR AdditionalParameters[1];
} STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY;
typedef struct _DEVICE_SEEK_PENALTY_DESCRIPTOR {
DWORD Version;
DWORD Size;
BOOLEAN IncursSeekPenalty;
} DEVICE_SEEK_PENALTY_DESCRIPTOR, *PDEVICE_SEEK_PENALTY_DESCRIPTOR;
typedef struct _STORAGE_DESCRIPTOR_HEADER {
ULONG Version;
ULONG Size;