September 2022 - Wine-commits

Tag wine-7.18 : Alexandre Julliard : Release 7.18
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: refs/tags/wine-7.18 Tag: 863d3fbd4ab310b891b9d1a3533f1ba2e8cf972e URL: https://gitlab.winehq.org/wine/wine/-/tags/863d3fbd4ab310b891b9d1a3533f1ba2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 21:59:24 2022 +0200 Release 7.18

1 0

Rémi Bernon : win32u: Factor out display_device lookup in separate helpers.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: aa1e59390f4aea7d881aa3618bbc00321fdf01df URL: https://gitlab.winehq.org/wine/wine/-/commit/aa1e59390f4aea7d881aa3618bbc00… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 11:27:31 2022 +0200 win32u: Factor out display_device lookup in separate helpers. --- dlls/win32u/sysparams.c | 68 +++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3c47205cc32..eaeb3d72cc7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1973,6 +1973,45 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in return ERROR_SUCCESS; } +/* display_lock mutex must be held */ +static struct display_device *find_monitor_device( struct display_device *adapter, DWORD index ) +{ + struct monitor *monitor; + + LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) + if (&monitor->adapter->dev == adapter && index == monitor->id) + return &monitor->dev; + + WARN( "Failed to find adapter %s monitor with id %u.\n", debugstr_w(adapter->device_name), index ); + return NULL; +} + +/* display_lock mutex must be held */ +static struct display_device *find_adapter_device_by_id( DWORD index ) +{ + struct adapter *adapter; + + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) + if (index == adapter->id) return &adapter->dev; + + WARN( "Failed to find adapter with id %u.\n", index ); + return NULL; +} + +/* display_lock mutex must be held */ +static struct display_device *find_adapter_device_by_name( UNICODE_STRING *name ) +{ + SIZE_T len = name->Length / sizeof(WCHAR); + struct adapter *adapter; + + LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) + if (!wcsnicmp( name->Buffer, adapter->dev.device_name, len ) && !adapter->dev.device_name[len]) + return &adapter->dev; + + WARN( "Failed to find adapter with name %s.\n", debugstr_us(name) ); + return NULL; +} + /* Find and acquire the adapter matching name, or primary adapter if name is NULL. * If not NULL, the returned adapter needs to be released with adapter_release. */ @@ -1997,8 +2036,6 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, DISPLAY_DEVICEW *info, DWORD flags ) { struct display_device *found = NULL; - struct adapter *adapter; - struct monitor *monitor; TRACE( "%s %u %p %#x\n", debugstr_us( device ), index, info, flags ); @@ -2006,31 +2043,8 @@ NTSTATUS WINAPI NtUserEnumDisplayDevices( UNICODE_STRING *device, DWORD index, if (!lock_display_devices()) return STATUS_UNSUCCESSFUL; - if (!device || !device->Length) - { - /* Enumerate adapters */ - LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) - { - if (index == adapter->id) - { - found = &adapter->dev; - break; - } - } - } - else if ((adapter = find_adapter( device ))) - { - /* Enumerate monitors */ - LIST_FOR_EACH_ENTRY(monitor, &monitors, struct monitor, entry) - { - if (monitor->adapter == adapter && index == monitor->id) - { - found = &monitor->dev; - break; - } - } - adapter_release( adapter ); - } + if (!device || !device->Length) found = find_adapter_device_by_id( index ); + else if ((found = find_adapter_device_by_name( device ))) found = find_monitor_device( found, index ); if (found) {

1 0

Rémi Bernon : win32u: Use find_adapter_device_by_(name|id) helpers in find_adapter.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: fa32c2efc796cc47aaf6c656e9355d4be1496a44 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa32c2efc796cc47aaf6c656e9355d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 11:27:31 2022 +0200 win32u: Use find_adapter_device_by_(name|id) helpers in find_adapter. --- dlls/win32u/sysparams.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index eaeb3d72cc7..2927c94f2a7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2017,16 +2017,16 @@ static struct display_device *find_adapter_device_by_name( UNICODE_STRING *name */ static struct adapter *find_adapter( UNICODE_STRING *name ) { + struct display_device *device; struct adapter *adapter; - LIST_FOR_EACH_ENTRY(adapter, &adapters, struct adapter, entry) - { - if (!name || !name->Length) return adapter_acquire( adapter ); /* use primary adapter */ - if (!wcsnicmp( name->Buffer, adapter->dev.device_name, name->Length / sizeof(WCHAR) ) && - !adapter->dev.device_name[name->Length / sizeof(WCHAR)]) - return adapter_acquire( adapter ); - } - return NULL; + if (name && name->Length) device = find_adapter_device_by_name( name ); + else device = find_adapter_device_by_id( 0 ); /* use primary adapter */ + + if (!device) adapter = NULL; + else adapter = adapter_acquire( CONTAINING_RECORD( device, struct adapter, dev ) ); + + return adapter; } /*********************************************************************** @@ -2496,11 +2496,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm if (!lock_display_devices()) return DISP_CHANGE_FAILED; adapter = find_adapter( devname ); unlock_display_devices(); - if (!adapter) - { - WARN( "Invalid device name %s.\n", debugstr_us(devname) ); - return DISP_CHANGE_BADPARAM; - } + if (!adapter) return DISP_CHANGE_BADPARAM; if (!adapter_get_full_mode( adapter, devmode, &full_mode )) ret = DISP_CHANGE_BADMODE; else if ((flags & CDS_UPDATEREGISTRY) && !adapter_set_registry_settings( adapter, &full_mode )) ret = DISP_CHANGE_NOTUPDATED; @@ -2559,11 +2555,7 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD index, DEVM if (!lock_display_devices()) return FALSE; adapter = find_adapter( device ); unlock_display_devices(); - if (!adapter) - { - WARN( "Invalid device name %s.\n", debugstr_us(device) ); - return FALSE; - } + if (!adapter) return FALSE; lstrcpynW( devmode->dmDeviceName, wine_display_driverW, ARRAY_SIZE(devmode->dmDeviceName) ); devmode->dmSpecVersion = DM_SPECVERSION;

1 0

Rémi Bernon : win32u: Lock display devices mutex in find_adapter.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 59a76b3a868c67c27c777b7bd4be85214612e957 URL: https://gitlab.winehq.org/wine/wine/-/commit/59a76b3a868c67c27c777b7bd4be85… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 11:32:30 2022 +0200 win32u: Lock display devices mutex in find_adapter. --- dlls/win32u/sysparams.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2927c94f2a7..867332624d1 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2020,12 +2020,15 @@ static struct adapter *find_adapter( UNICODE_STRING *name ) struct display_device *device; struct adapter *adapter; + if (!lock_display_devices()) return NULL; + if (name && name->Length) device = find_adapter_device_by_name( name ); else device = find_adapter_device_by_id( 0 ); /* use primary adapter */ if (!device) adapter = NULL; else adapter = adapter_acquire( CONTAINING_RECORD( device, struct adapter, dev ) ); + unlock_display_devices(); return adapter; } @@ -2493,10 +2496,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm if ((!devname || !devname->Length) && !devmode) return apply_display_settings( NULL, NULL, hwnd, flags, lparam ); - if (!lock_display_devices()) return DISP_CHANGE_FAILED; - adapter = find_adapter( devname ); - unlock_display_devices(); - if (!adapter) return DISP_CHANGE_BADPARAM; + if (!(adapter = find_adapter( devname ))) return DISP_CHANGE_BADPARAM; if (!adapter_get_full_mode( adapter, devmode, &full_mode )) ret = DISP_CHANGE_BADMODE; else if ((flags & CDS_UPDATEREGISTRY) && !adapter_set_registry_settings( adapter, &full_mode )) ret = DISP_CHANGE_NOTUPDATED; @@ -2552,10 +2552,7 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD index, DEVM TRACE( "device %s, index %#x, devmode %p, flags %#x\n", debugstr_us(device), index, devmode, flags ); - if (!lock_display_devices()) return FALSE; - adapter = find_adapter( device ); - unlock_display_devices(); - if (!adapter) return FALSE; + if (!(adapter = find_adapter( device ))) return FALSE; lstrcpynW( devmode->dmDeviceName, wine_display_driverW, ARRAY_SIZE(devmode->dmDeviceName) ); devmode->dmSpecVersion = DM_SPECVERSION;

1 0

Rémi Bernon : win32u: Broadcast WM_DISPLAYCHANGE message on display settings change.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 7384591c71788bc99a3e4be48bfc09d1139e5243 URL: https://gitlab.winehq.org/wine/wine/-/commit/7384591c71788bc99a3e4be48bfc09… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 6 10:39:39 2022 +0200 win32u: Broadcast WM_DISPLAYCHANGE message on display settings change. --- dlls/user32/tests/sysparams.c | 1 - dlls/win32u/sysparams.c | 14 ++++++++++++++ dlls/winemac.drv/display.c | 35 ++--------------------------------- dlls/winemac.drv/window.c | 3 +-- dlls/winex11.drv/desktop.c | 10 ++-------- dlls/winex11.drv/display.c | 6 +++--- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 4 ++-- dlls/winex11.drv/xrandr.c | 6 +----- 9 files changed, 26 insertions(+), 55 deletions(-)

1 0

Jacek Caban : winevulkan: Introduce VkVariable.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: df8fc0b33bbd83d330e4722172af5c809bc275aa URL: https://gitlab.winehq.org/wine/wine/-/commit/df8fc0b33bbd83d330e4722172af5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 6 21:55:24 2022 +0200 winevulkan: Introduce VkVariable. --- dlls/winevulkan/make_vulkan | 166 ++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 92 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 381fe281b4d..99bad6b4c57 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1139,20 +1139,83 @@ class VkHandle(object): def needs_unwrapping(self): return self.is_wrapped() -class VkMember(object): - def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): +class VkVariable(object): + def __init__(self, const=False, type_info=None, type=None, name=None, pointer=None, array_len=None, + dyn_array_len=None, object_type=None): self.const = const - self.struct_fwd_decl = struct_fwd_decl + self.type_info = type_info + self.type = type self.name = name self.pointer = pointer - self.type = _type - self.type_info = None self.array_len = array_len self.dyn_array_len = dyn_array_len + self.object_type = object_type + if type_info: + self.set_type_info(type_info) + + def set_type_info(self, type_info): + """ Helper function to set type information from the type registry. + This is needed, because not all type data is available at time of + parsing. + """ + self.type_info = type_info + self.handle = type_info["data"] if type_info["category"] == "handle" else None + self.struct = type_info["data"] if type_info["category"] == "struct" else None + + def is_const(self): + return self.const + + def is_pointer(self): + return self.pointer is not None + + def is_handle(self): + return self.handle is not None + + def is_struct(self): + return self.struct is not None + + def is_dynamic_array(self): + """ Returns if the member is an array element. + Vulkan uses this for dynamically sized arrays for which + there is a 'count' parameter. + """ + return self.dyn_array_len is not None + + def is_static_array(self): + """ Returns if the member is an array. + Vulkan uses this often for fixed size arrays in which the + length is part of the member. + """ + return self.array_len is not None + + def needs_alignment(self): + """ Check if this member needs alignment for 64-bit data. + Various structures need alignment on 64-bit variables due + to compiler differences on 32-bit between Win32 and Linux. + """ + + if self.is_pointer(): + return False + elif self.type == "size_t": + return False + elif self.type in ["uint64_t", "VkDeviceSize"]: + return True + elif self.is_struct(): + return self.struct.needs_alignment() + elif self.is_handle(): + # Dispatchable handles are pointers to objects, while + # non-dispatchable are uint64_t and hence need alignment. + return not self.handle.is_dispatchable() + return False + +class VkMember(VkVariable): + def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, + dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): + VkVariable.__init__(self, const=const, type=_type, name=name, pointer=pointer, array_len=array_len, + dyn_array_len=dyn_array_len, object_type=object_type) + self.struct_fwd_decl = struct_fwd_decl self.optional = optional self.values = values - self.object_type = object_type self.bit_width = bit_width def __eq__(self, other): @@ -1379,32 +1442,6 @@ class VkMember(object): return conversions - def is_const(self): - return self.const - - def is_dynamic_array(self): - """ Returns if the member is an array element. - Vulkan uses this for dynamically sized arrays for which - there is a 'count' parameter. - """ - return self.dyn_array_len is not None - - def is_handle(self): - return self.type_info["category"] == "handle" - - def is_pointer(self): - return self.pointer is not None - - def is_static_array(self): - """ Returns if the member is an array. - Vulkan uses this often for fixed size arrays in which the - length is part of the member. - """ - return self.array_len is not None - - def is_struct(self): - return self.type_info["category"] == "struct" - def is_struct_forward_declaration(self): return self.struct_fwd_decl @@ -1421,28 +1458,6 @@ class VkMember(object): def is_bit_field(self): return self.bit_width is not None - def needs_alignment(self): - """ Check if this member needs alignment for 64-bit data. - Various structures need alignment on 64-bit variables due - to compiler differences on 32-bit between Win32 and Linux. - """ - - if self.is_pointer(): - return False - elif self.type == "size_t": - return False - elif self.type in ["uint64_t", "VkDeviceSize"]: - return True - elif self.is_struct(): - struct = self.type_info["data"] - return struct.needs_alignment() - elif self.is_handle(): - # Dispatchable handles are pointers to objects, while - # non-dispatchable are uint64_t and hence need alignment. - handle = self.type_info["data"] - return False if handle.is_dispatchable() else True - return False - def needs_conversion(self): """ Structures requiring alignment, need conversion between win32 and host. """ @@ -1486,28 +1501,13 @@ class VkMember(object): struct = self.type_info["data"] return struct.needs_struct_extensions_conversion() - def set_type_info(self, type_info): - """ Helper function to set type information from the type registry. - This is needed, because not all type data is available at time of - parsing. - """ - self.type_info = type_info - - -class VkParam(object): +class VkParam(VkVariable): """ Helper class which describes a parameter to a function call. """ def __init__(self, type_info, const=None, pointer=None, name=None, array_len=None, dyn_array_len=None, object_type=None): - self.const = const - self.name = name - self.array_len = array_len - self.dyn_array_len = dyn_array_len - self.pointer = pointer - self.object_type = object_type - self.type_info = type_info - self.type = type_info["name"] # For convenience - self.handle = type_info["data"] if type_info["category"] == "handle" else None - self.struct = type_info["data"] if type_info["category"] == "struct" else None + VkVariable.__init__(self, const=const, type_info=type_info, type=type_info["name"], name=name, + pointer=pointer, array_len=array_len, dyn_array_len=dyn_array_len, + object_type=object_type) self._set_direction() self._set_format_string() @@ -1767,30 +1767,12 @@ class VkParam(object): return conversions - def is_const(self): - return self.const is not None - - def is_dynamic_array(self): - return self.dyn_array_len is not None - def is_dispatchable(self): if not self.is_handle(): return False return self.handle.is_dispatchable() - def is_handle(self): - return self.handle is not None - - def is_pointer(self): - return self.pointer is not None - - def is_static_array(self): - return self.array_len is not None - - def is_struct(self): - return self.struct is not None - def needs_conversion(self): """ Returns if parameter needs conversion between win32 and host. """

1 0

Jacek Caban : winevulkan: Use DECLSPEC_ALIGN instead of pshpack4.h.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: f664af0bca4af1909bd30bc6da1e116d1cd90f9a URL: https://gitlab.winehq.org/wine/wine/-/commit/f664af0bca4af1909bd30bc6da1e11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 6 22:35:36 2022 +0200 winevulkan: Use DECLSPEC_ALIGN instead of pshpack4.h. --- dlls/winevulkan/loader_thunks.h | 512 ++++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 6 +- 2 files changed, 257 insertions(+), 261 deletions(-)

1 0

Rémi Bernon : winegstreamer: Use IWMSyncReader2_OpenStream in the async reader.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: b8aa25fe4edf27315566b95fa513f74fc33248b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b8aa25fe4edf27315566b95fa513f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 16 07:59:41 2022 +0200 winegstreamer: Use IWMSyncReader2_OpenStream in the async reader. --- dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/wm_asyncreader.c | 2 +- dlls/winegstreamer/wm_reader.c | 58 +++++++++++++++++-------------------- 3 files changed, 27 insertions(+), 34 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index a16c72c807b..6430e853777 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -199,7 +199,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, WORD stream_number, WMT_STREAM_SELECTION *selection); -HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration); HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate); HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_number, BOOL allocate); diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 825a042b534..4546a9c3309 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -933,7 +933,7 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface, EnterCriticalSection(&reader->cs); - if (SUCCEEDED(hr = wm_reader_open_stream(reader->wm_reader, stream)) + if (SUCCEEDED(hr = IWMSyncReader2_OpenStream(reader->reader, stream)) && FAILED(hr = async_reader_open(reader, callback, context))) IWMSyncReader2_Close(reader->reader); diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 21efac4df66..d3e71efeac6 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1479,37 +1479,6 @@ out_destroy_parser: return hr; } -HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream) -{ - STATSTG stat; - HRESULT hr; - - if (FAILED(hr = IStream_Stat(stream, &stat, STATFLAG_NONAME))) - { - ERR("Failed to stat stream, hr %#lx.\n", hr); - return hr; - } - - EnterCriticalSection(&reader->cs); - - if (reader->wg_parser) - { - LeaveCriticalSection(&reader->cs); - WARN("Stream is already open; returning E_UNEXPECTED.\n"); - return E_UNEXPECTED; - } - - IStream_AddRef(reader->source_stream = stream); - if (FAILED(hr = init_stream(reader, stat.cbSize.QuadPart))) - { - IStream_Release(stream); - reader->source_stream = NULL; - } - - LeaveCriticalSection(&reader->cs); - return hr; -} - static struct wm_stream *wm_reader_get_stream_by_stream_number(struct wm_reader *reader, WORD stream_number) { if (stream_number && stream_number <= reader->stream_count) @@ -2373,10 +2342,35 @@ static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename) static HRESULT WINAPI reader_OpenStream(IWMSyncReader2 *iface, IStream *stream) { struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + STATSTG stat; + HRESULT hr; TRACE("reader %p, stream %p.\n", reader, stream); - return wm_reader_open_stream(reader, stream); + if (FAILED(hr = IStream_Stat(stream, &stat, STATFLAG_NONAME))) + { + ERR("Failed to stat stream, hr %#lx.\n", hr); + return hr; + } + + EnterCriticalSection(&reader->cs); + + if (reader->wg_parser) + { + LeaveCriticalSection(&reader->cs); + WARN("Stream is already open; returning E_UNEXPECTED.\n"); + return E_UNEXPECTED; + } + + IStream_AddRef(reader->source_stream = stream); + if (FAILED(hr = init_stream(reader, stat.cbSize.QuadPart))) + { + IStream_Release(stream); + reader->source_stream = NULL; + } + + LeaveCriticalSection(&reader->cs); + return hr; } static HRESULT WINAPI reader_SetOutputProps(IWMSyncReader2 *iface, DWORD output, IWMOutputMediaProps *props)

1 0

Rémi Bernon : winegstreamer: Use IWMSyncReader2_SetRange in the async reader.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 96acd9dc327fafda714b0e3f614583f495240a14 URL: https://gitlab.winehq.org/wine/wine/-/commit/96acd9dc327fafda714b0e3f614583… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 01:09:36 2022 +0200 winegstreamer: Use IWMSyncReader2_SetRange in the async reader. --- dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/wm_asyncreader.c | 5 ++--- dlls/winegstreamer/wm_reader.c | 30 ++++++++++++------------------ 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 6430e853777..5ed44f0d50b 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -199,7 +199,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number); HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, WORD stream_number, WMT_STREAM_SELECTION *selection); -void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration); HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate); HRESULT wm_reader_set_allocate_for_stream(struct wm_reader *reader, WORD stream_number, BOOL allocate); HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 4546a9c3309..60cffba2553 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -244,10 +244,9 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) { reader->context = op->u.start.context; if (SUCCEEDED(hr)) - { - wm_reader_seek(reader->wm_reader, op->u.start.start, op->u.start.duration); + hr = IWMSyncReader2_SetRange(reader->reader, op->u.start.start, op->u.start.duration); + if (SUCCEEDED(hr)) reader->clock_start = get_current_time(reader); - } LeaveCriticalSection(&reader->callback_cs); IWMReaderCallback_OnStatus(reader->callback, WMT_STARTED, hr, diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index d3e71efeac6..09af7457b27 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1886,23 +1886,6 @@ HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, IWMReaderCallbackA } } -void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration) -{ - WORD i; - - EnterCriticalSection(&reader->cs); - - reader->start_time = start; - - wg_parser_stream_seek(reader->streams[0].wg_stream, 1.0, start, start + duration, - AM_SEEKING_AbsolutePositioning, duration ? AM_SEEKING_AbsolutePositioning : AM_SEEKING_NoPositioning); - - for (i = 0; i < reader->stream_count; ++i) - reader->streams[i].eos = false; - - LeaveCriticalSection(&reader->cs); -} - HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, const WORD *stream_numbers, const WMT_STREAM_SELECTION *selections) { @@ -2415,10 +2398,21 @@ static HRESULT WINAPI reader_SetOutputSetting(IWMSyncReader2 *iface, DWORD outpu static HRESULT WINAPI reader_SetRange(IWMSyncReader2 *iface, QWORD start, LONGLONG duration) { struct wm_reader *reader = impl_from_IWMSyncReader2(iface); + WORD i; TRACE("reader %p, start %I64u, duration %I64d.\n", reader, start, duration); - wm_reader_seek(reader, start, duration); + EnterCriticalSection(&reader->cs); + + reader->start_time = start; + + wg_parser_stream_seek(reader->streams[0].wg_stream, 1.0, start, start + duration, + AM_SEEKING_AbsolutePositioning, duration ? AM_SEEKING_AbsolutePositioning : AM_SEEKING_NoPositioning); + + for (i = 0; i < reader->stream_count; ++i) + reader->streams[i].eos = false; + + LeaveCriticalSection(&reader->cs); return S_OK; }

1 0

Rémi Bernon : winegstreamer: Avoid accessing NULL pointer if transform didn't provide a sample.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: wine Branch: master Commit: 54590472a7f546926b2fce37fb3e7525cd3d7c45 URL: https://gitlab.winehq.org/wine/wine/-/commit/54590472a7f546926b2fce37fb3e75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 21 11:39:34 2022 +0200 winegstreamer: Avoid accessing NULL pointer if transform didn't provide a sample. This can happen with asynchronous decoding, such as with the VA-API decodebin plugin for H264. --- dlls/winegstreamer/wg_allocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_allocator.c b/dlls/winegstreamer/wg_allocator.c index 5b2c48dcf77..784677e2b2d 100644 --- a/dlls/winegstreamer/wg_allocator.c +++ b/dlls/winegstreamer/wg_allocator.c @@ -164,7 +164,7 @@ static GstMemory *wg_allocator_alloc(GstAllocator *gst_allocator, gsize size, pthread_mutex_lock(&allocator->mutex); sample = allocator->request_sample(size, allocator->request_sample_context); - if (sample->max_size < size) + if (sample && sample->max_size < size) InterlockedDecrement(&sample->refcount); else memory->sample = sample;

1 0