- Wine-Devel - list.winehq.org

[PATCH 6/6] ntdll: add initial ZFS case sensitivity support
by Damjan Jovanovic Nov. 10, 2020

Nov. 10, 2020

ZFS supports a creation-time "casesensitivity" property on filesystems, whose "insensitive" and possibly "mixed" values are of benefit to us. This patch adds initial support for the "insensitive" case. There are 10 directories of header files needed in the include path for libzfs, which don't always ship with FreeBSD releases, so useful bits have been copied here instead, types abstracted (eg. void* instead of struct pointers), and libzfs loaded through run-time dynamic linking. It's only been tested on FreeBSD so far. Kernel and Wine bitness must match, as there is no 32->64 ZFS ioctl compatibility at present; such cases are always treated as case-sensitive. The licensing situation is unclear. The ZFS headers and libzfs are under the CDDL licence. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/file.c | 226 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+)

1 0

[PATCH 5/6] ntdll: document a few other filesystem case-sensitivity cases
by Damjan Jovanovic Nov. 10, 2020

Nov. 10, 2020

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/file.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH 4/6] ntdll: treat smbfs as case-insensitive on FreeBSD
by Damjan Jovanovic Nov. 10, 2020

Nov. 10, 2020

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH 3/6] ntdll: msdosfs was case-insensitive since FreeBSD 8 or even earlier
by Damjan Jovanovic Nov. 10, 2020

Nov. 10, 2020

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 2/6] ntdll: FAT filesystems are called "msdosfs" on FreeBSD >= 5
by Damjan Jovanovic Nov. 10, 2020

Nov. 10, 2020

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 1/6] ntdll: fix wrong return values in get_dir_case_sensitivity_stat()
by Damjan Jovanovic Nov. 10, 2020

Nov. 10, 2020

It should be returning TRUE (= case sensitive) on failure as case sensitive is the safe assumption, but some returns are FALSE on failure and even TRUE when case insensitive. Fix that. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH] po: Update Lithuanian translatio
by Aurimas Fišeras Nov. 9, 2020

Nov. 9, 2020

2 1

[PATCH v2 1/5] winegstreamer: Require media source's IMFByteStream to be seekable.
by Derek Lesho Nov. 9, 2020

Nov. 9, 2020

If there is ever a need to support an un-seekable bytestream, we'll have to use GstAppSrc. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index dbc656a24da..df5dedd484d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1232,6 +1232,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + DWORD bytestream_caps; unsigned int i; HRESULT hr; int ret; @@ -1239,6 +1240,12 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (!object) return E_OUTOFMEMORY; + if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &bytestream_caps))) + return hr; + + if (!(bytestream_caps & MFBYTESTREAM_IS_SEEKABLE)) + return MF_E_BYTESTREAM_NOT_SEEKABLE; + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; -- 2.28.0

3 10

[PATCH v3 1/5] winegstreamer: Require media source's IMFByteStream to be seekable.
by Derek Lesho Nov. 9, 2020

Nov. 9, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v3: Output FIXME message when failing to create source because of non-seekable bytestream. --- dlls/winegstreamer/media_source.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index dbc656a24da..545c94b4001 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1232,6 +1232,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + DWORD bytestream_caps; unsigned int i; HRESULT hr; int ret; @@ -1239,6 +1240,15 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (!object) return E_OUTOFMEMORY; + if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &bytestream_caps))) + return hr; + + if (!(bytestream_caps & MFBYTESTREAM_IS_SEEKABLE)) + { + FIXME("Non-seekable bytestreams not supported.\n"); + return MF_E_BYTESTREAM_NOT_SEEKABLE; + } + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; -- 2.28.0

2 1

[PATCH] mountmgr: Add SCSI addresses of udisks2 devices to the registry.
by Esme Povirk Nov. 9, 2020

Nov. 9, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49788 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/mountmgr.sys/dbus.c | 54 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 98b2a47ba6d..ebe0152bf1c 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -385,7 +385,8 @@ static const char *udisks2_string_from_array( DBusMessageIter *iter ) /* find the drive entry in the dictionary and get its parameters */ static void udisks2_get_drive_info( const char *drive_name, DBusMessageIter *dict, - enum device_type *drive_type, int *removable, const char **serial ) + enum device_type *drive_type, int *removable, const char **serial, + int *optical, const char **model ) { DBusMessageIter iter, drive, variant; const char *name; @@ -405,11 +406,49 @@ static void udisks2_get_drive_info( const char *drive_name, DBusMessageIter *dic *drive_type = udisks_parse_media_compatibility( &variant ); else if (!strcmp( name, "Id" )) p_dbus_message_iter_get_basic( &variant, serial ); + else if (!strcmp( name, "Optical" )) + p_dbus_message_iter_get_basic( &variant, optical ); + else if (!strcmp( name, "Model" )) + p_dbus_message_iter_get_basic( &variant, model ); } } } } +static void udisks2_add_scsi_device( const char *unix_device, int optical, + const char *model, UNICODE_STRING *devname ) +{ + WCHAR *name; + HANDLE handle; + SCSI_ADDRESS scsi_addr; + DWORD size; + + if (!unix_device) + return; + + if (!(name = wine_get_dos_file_name( unix_device ))) + { + ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); + return; + } + handle = CreateFileW( name, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0 ); + RtlFreeHeap( GetProcessHeap(), 0, name ); + if (handle == INVALID_HANDLE_VALUE) + { + WARN("Failed to open %s, err %u\n", debugstr_a(unix_device), GetLastError()); + return; + } + + if (DeviceIoControl( handle, IOCTL_SCSI_GET_ADDRESS, NULL, 0, &scsi_addr, sizeof(scsi_addr), &size, 0 )) + { + create_scsi_entry( &scsi_addr, 255, optical ? "atapi" : "WINE SCSI", + optical ? SCSI_CDROM_PERIPHERAL : SCSI_DISK_PERIPHERAL, model, devname ); + } + + CloseHandle( handle ); +} + static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMessageIter *block ) { DBusMessageIter iter, variant, paths, string; @@ -418,9 +457,10 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess const char *type = NULL; const char *drive = NULL; const char *id = NULL; + const char *model = NULL; GUID guid, *guid_ptr = NULL; const char *iface, *name; - int removable = FALSE; + int removable = FALSE, optical = FALSE; enum device_type drive_type = DEVICE_UNKNOWN; while ((iface = udisks_next_dict_entry( block, &iter ))) @@ -451,7 +491,7 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess else if (!strcmp( name, "Drive" )) { p_dbus_message_iter_get_basic( &variant, &drive ); - udisks2_get_drive_info( drive, dict, &drive_type, &removable, &id ); + udisks2_get_drive_info( drive, dict, &drive_type, &removable, &id, &optical, &model ); } else if (!strcmp( name, "IdUUID" )) { @@ -485,7 +525,13 @@ static void udisks2_add_device( const char *udi, DBusMessageIter *dict, DBusMess } if (device) { - if (removable) add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, NULL ); + if (removable) + { + UNICODE_STRING devname; + devname.Buffer = NULL; + add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr, &devname ); + udisks2_add_scsi_device( device, optical, model, &devname ); + } else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr, id ); } } -- 2.17.1

2 1