November 2022 - Wine-commits

Jacek Caban : winevulkan: Always fill output in fill_luid_property.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 52ae9be12af9de7123d4ab6a76928343faf8a2c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/52ae9be12af9de7123d4ab6a769283… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 12:36:34 2022 +0100 winevulkan: Always fill output in fill_luid_property. --- dlls/winevulkan/loader.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 20bd9d38c27..cddcd0360ac 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -414,26 +414,26 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) { device_luid_valid = VK_TRUE; device_node_mask = 1; - - if (id) - { - memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); - id->deviceLUIDValid = device_luid_valid; - id->deviceNodeMask = device_node_mask; - } - - if (vk11) - { - memcpy(&vk11->deviceLUID, &luid, sizeof(vk11->deviceLUID)); - vk11->deviceLUIDValid = device_luid_valid; - vk11->deviceNodeMask = device_node_mask; - } break; } } SetupDiDestroyDeviceInfoList(devinfo); release_display_device_init_mutex(mutex); + if (id) + { + if (device_luid_valid) memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); + id->deviceLUIDValid = device_luid_valid; + id->deviceNodeMask = device_node_mask; + } + + if (vk11) + { + if (device_luid_valid) memcpy(&vk11->deviceLUID, &luid, sizeof(vk11->deviceLUID)); + vk11->deviceLUIDValid = device_luid_valid; + vk11->deviceNodeMask = device_node_mask; + } + TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08lx:%08lx deviceNodeMask:%#x.\n", properties2->properties.deviceName, device_luid_valid, luid.HighPart, luid.LowPart, device_node_mask);

1 0

Alex Henrie : include: Define PROPSHEETPAGE[AW]_V[1-4].
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: f7e1bb9f36b579a500cac1b480aed2faf6d65a2b URL: https://gitlab.winehq.org/wine/wine/-/commit/f7e1bb9f36b579a500cac1b480aed2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 7 21:25:05 2022 -0700 include: Define PROPSHEETPAGE[AW]_V[1-4]. Needed to compile Tera Term. --- include/prsht.h | 170 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 118 insertions(+), 52 deletions(-) diff --git a/include/prsht.h b/include/prsht.h index a88351701ed..f1ab90b02cc 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -61,79 +61,133 @@ typedef LPCDLGTEMPLATEA PROPSHEETPAGE_RESOURCEA; typedef LPCDLGTEMPLATEW PROPSHEETPAGE_RESOURCEW; DECL_WINELIB_TYPE_AW(PROPSHEETPAGE_RESOURCE) +#define PROPSHEETPAGEA_V1_FIELDS \ + DWORD dwSize; \ + DWORD dwFlags; \ + HINSTANCE hInstance; \ + union \ + { \ + const char *pszTemplate; \ + PROPSHEETPAGE_RESOURCEA pResource; \ + } DUMMYUNIONNAME; \ + union \ + { \ + HICON hIcon; \ + const char *pszIcon; \ + } DUMMYUNIONNAME2; \ + const char *pszTitle; \ + DLGPROC pfnDlgProc; \ + LPARAM lParam; \ + LPFNPSPCALLBACKA pfnCallback; \ + UINT *pcRefParent; + +typedef struct _PROPSHEETPAGEA_V1 +{ + PROPSHEETPAGEA_V1_FIELDS +} PROPSHEETPAGEA_V1, *LPPROPSHEETPAGEA_V1; + +typedef struct _PROPSHEETPAGEA_V2 +{ + PROPSHEETPAGEA_V1_FIELDS + const char *pszHeaderTitle; + const char *pszHeaderSubTitle; +} PROPSHEETPAGEA_V2, *LPPROPSHEETPAGEA_V2; + +typedef struct _PROPSHEETPAGEA_V3 +{ + PROPSHEETPAGEA_V1_FIELDS + const char *pszHeaderTitle; + const char *pszHeaderSubTitle; + HANDLE hActCtx; +} PROPSHEETPAGEA_V3, *LPPROPSHEETPAGEA_V3; + typedef struct _PROPSHEETPAGEA { - DWORD dwSize; - DWORD dwFlags; - HINSTANCE hInstance; - union - { - LPCSTR pszTemplate; - PROPSHEETPAGE_RESOURCEA pResource; - } DUMMYUNIONNAME; - union - { - HICON hIcon; - LPCSTR pszIcon; - } DUMMYUNIONNAME2; - LPCSTR pszTitle; - DLGPROC pfnDlgProc; - LPARAM lParam; - LPFNPSPCALLBACKA pfnCallback; - UINT* pcRefParent; - LPCSTR pszHeaderTitle; - LPCSTR pszHeaderSubTitle; + PROPSHEETPAGEA_V1_FIELDS + const char *pszHeaderTitle; + const char *pszHeaderSubTitle; HANDLE hActCtx; union { HBITMAP hbmHeader; - LPCSTR pszbmHeader; + const char *pszbmHeader; } DUMMYUNIONNAME3; } PROPSHEETPAGEA, *LPPROPSHEETPAGEA, + PROPSHEETPAGEA_V4, *LPPROPSHEETPAGEA_V4, PROPSHEETPAGEA_LATEST, *LPPROPSHEETPAGEA_LATEST; -typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_LATEST; -#define PROPSHEETPAGEA_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pcRefParent) -#define PROPSHEETPAGEA_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pszHeaderSubTitle) -#define PROPSHEETPAGEA_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, hActCtx) -#define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETPAGEA) +typedef const PROPSHEETPAGEA_V1 *LPCPROPSHEETPAGEA_V1; +typedef const PROPSHEETPAGEA_V2 *LPCPROPSHEETPAGEA_V2; +typedef const PROPSHEETPAGEA_V3 *LPCPROPSHEETPAGEA_V3; +typedef const PROPSHEETPAGEA_V4 *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_V4, *LPCPROPSHEETPAGEA_LATEST; +#define PROPSHEETPAGEA_V1_SIZE sizeof(PROPSHEETPAGEA_V1) +#define PROPSHEETPAGEA_V2_SIZE sizeof(PROPSHEETPAGEA_V2) +#define PROPSHEETPAGEA_V3_SIZE sizeof(PROPSHEETPAGEA_V3) +#define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETPAGEA_V4) + +#define PROPSHEETPAGEW_V1_FIELDS \ + DWORD dwSize; \ + DWORD dwFlags; \ + HINSTANCE hInstance; \ + union \ + { \ + const WCHAR *pszTemplate; \ + PROPSHEETPAGE_RESOURCEW pResource; \ + } DUMMYUNIONNAME; \ + union \ + { \ + HICON hIcon; \ + const WCHAR *pszIcon; \ + } DUMMYUNIONNAME2; \ + const WCHAR *pszTitle; \ + DLGPROC pfnDlgProc; \ + LPARAM lParam; \ + LPFNPSPCALLBACKW pfnCallback; \ + UINT *pcRefParent; + +typedef struct _PROPSHEETPAGEW_V1 +{ + PROPSHEETPAGEW_V1_FIELDS +} PROPSHEETPAGEW_V1, *LPPROPSHEETPAGEW_V1; + +typedef struct _PROPSHEETPAGEW_V2 +{ + PROPSHEETPAGEW_V1_FIELDS + const WCHAR *pszHeaderTitle; + const WCHAR *pszHeaderSubTitle; +} PROPSHEETPAGEW_V2, *LPPROPSHEETPAGEW_V2; + +typedef struct _PROPSHEETPAGEW_V3 +{ + PROPSHEETPAGEW_V1_FIELDS + const WCHAR *pszHeaderTitle; + const WCHAR *pszHeaderSubTitle; + HANDLE hActCtx; +} PROPSHEETPAGEW_V3, *LPPROPSHEETPAGEW_V3; typedef struct _PROPSHEETPAGEW { - DWORD dwSize; - DWORD dwFlags; - HINSTANCE hInstance; - union - { - LPCWSTR pszTemplate; - PROPSHEETPAGE_RESOURCEW pResource; - } DUMMYUNIONNAME; - union - { - HICON hIcon; - LPCWSTR pszIcon; - } DUMMYUNIONNAME2; - LPCWSTR pszTitle; - DLGPROC pfnDlgProc; - LPARAM lParam; - LPFNPSPCALLBACKW pfnCallback; - UINT* pcRefParent; - LPCWSTR pszHeaderTitle; - LPCWSTR pszHeaderSubTitle; + PROPSHEETPAGEW_V1_FIELDS + const WCHAR *pszHeaderTitle; + const WCHAR *pszHeaderSubTitle; HANDLE hActCtx; union { HBITMAP hbmHeader; - LPCWSTR pszbmHeader; + const WCHAR *pszbmHeader; } DUMMYUNIONNAME3; } PROPSHEETPAGEW, *LPPROPSHEETPAGEW, + PROPSHEETPAGEW_V4, *LPPROPSHEETPAGEW_V4, PROPSHEETPAGEW_LATEST, *LPPROPSHEETPAGEW_LATEST; -typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_LATEST; -#define PROPSHEETPAGEW_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pcRefParent) -#define PROPSHEETPAGEW_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pszHeaderSubTitle) -#define PROPSHEETPAGEW_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, hActCtx) -#define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETPAGEW) +typedef const PROPSHEETPAGEW_V1 *LPCPROPSHEETPAGEW_V1; +typedef const PROPSHEETPAGEW_V2 *LPCPROPSHEETPAGEW_V2; +typedef const PROPSHEETPAGEW_V3 *LPCPROPSHEETPAGEW_V3; +typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_V4, *LPCPROPSHEETPAGEW_LATEST; +#define PROPSHEETPAGEW_V1_SIZE sizeof(PROPSHEETPAGEW_V1) +#define PROPSHEETPAGEW_V2_SIZE sizeof(PROPSHEETPAGEW_V2) +#define PROPSHEETPAGEW_V3_SIZE sizeof(PROPSHEETPAGEW_V3) +#define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETPAGEW_V4) typedef struct _PROPSHEETHEADERA @@ -256,6 +310,18 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK) # define DECL_PRSHT_TYPE_AW(base, suffix) typedef PRSHT_NAME_AW(base, suffix) base##_##suffix; #endif /* WINE_NO_UNICODE_MACROS */ +DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, V1) +DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, V1) +DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, V1) +DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, V2) +DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, V2) +DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, V2) +DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, V3) +DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, V3) +DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, V3) +DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, V4) +DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, V4) +DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, V4) DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, LATEST) DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, LATEST) DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, LATEST)

1 0

Brendan Shanks : ntdll: Suppress deprecation warnings when calling MPTaskIsPreemptive().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 3873d434616067e6219bf5969d4da27db8e0c9ac URL: https://gitlab.winehq.org/wine/wine/-/commit/3873d434616067e6219bf5969d4da2… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 8 10:45:40 2022 -0800 ntdll: Suppress deprecation warnings when calling MPTaskIsPreemptive(). --- dlls/ntdll/unix/loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 306f73dff4f..896247e109a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2358,10 +2358,13 @@ static void apple_main_thread(void) if (!pthread_main_np()) return; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" /* Multi-processing Services can get confused about the main thread if the * first time it's used is on a secondary thread. Use it here to make sure * that doesn't happen. */ MPTaskIsPreemptive(MPCurrentTaskID()); +#pragma clang diagnostic pop /* Give ourselves the best chance of having the distributed notification * center scheduled on this thread's run loop. In theory, it's scheduled

1 0

Brendan Shanks : ntdll: Stop using deprecated kIOMasterPortDefault constant.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 13cc08e32d6c04f8f915d07cda39638ee99c3d43 URL: https://gitlab.winehq.org/wine/wine/-/commit/13cc08e32d6c04f8f915d07cda3963… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Nov 8 10:47:23 2022 -0800 ntdll: Stop using deprecated kIOMasterPortDefault constant. --- dlls/ntdll/unix/cdrom.c | 2 +- dlls/ntdll/unix/system.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index a9385daf099..a4a9400a518 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -367,7 +367,7 @@ static NTSTATUS get_parent_device( int fd, char *name, size_t len ) CFDictionaryAddValue( dict, CFSTR("Removable"), kCFBooleanTrue ); - service = IOServiceGetMatchingService( kIOMasterPortDefault, dict ); + service = IOServiceGetMatchingService( 0, dict ); /* now look for the parent that has the "Whole" attribute set to TRUE */ diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 4ca07c2e34c..ba2051da65e 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1632,7 +1632,7 @@ static NTSTATUS get_smbios_from_iokit( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, struct smbios_prologue *prologue; BYTE major_version = 2, minor_version = 0; - if (!(service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleSMBIOS")))) + if (!(service = IOServiceGetMatchingService(0, IOServiceMatching("AppleSMBIOS")))) { WARN("can't find AppleSMBIOS service\n"); return STATUS_NO_MEMORY; @@ -1727,7 +1727,7 @@ static NTSTATUS generate_smbios( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG struct smbios_board_args board_args; struct smbios_chassis_args chassis_args; - platform_expert = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice")); + platform_expert = IOServiceGetMatchingService(0, IOServiceMatching("IOPlatformExpertDevice")); if (!platform_expert) return STATUS_NO_MEMORY; @@ -3493,7 +3493,7 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) uint32_t value, voltage; CFTimeInterval remain; - if (IOPMCopyBatteryInfo( kIOMasterPortDefault, &batteries ) != kIOReturnSuccess) + if (IOPMCopyBatteryInfo( 0, &batteries ) != kIOReturnSuccess) return STATUS_ACCESS_DENIED; if (CFArrayGetCount( batteries ) == 0)

1 0

Rémi Bernon : winegstreamer: Introduce new wm_stream_allocate_sample helper.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 2d442738f5fb24d497dd954fd0cd4c1712c7b76b URL: https://gitlab.winehq.org/wine/wine/-/commit/2d442738f5fb24d497dd954fd0cd4c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 24 00:59:15 2022 +0200 winegstreamer: Introduce new wm_stream_allocate_sample helper. --- dlls/winegstreamer/wm_reader.c | 46 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 55d98671931..f514475d3eb 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1572,6 +1572,30 @@ static const char *get_major_type_string(enum wg_major_type type) return NULL; } +static HRESULT wm_stream_allocate_sample(struct wm_stream *stream, DWORD size, INSSBuffer **sample) +{ + struct buffer *buffer; + + if (!stream->read_compressed && stream->output_allocator) + return IWMReaderAllocatorEx_AllocateForOutputEx(stream->output_allocator, stream->index, + size, sample, 0, 0, 0, NULL); + + if (stream->read_compressed && stream->stream_allocator) + return IWMReaderAllocatorEx_AllocateForStreamEx(stream->stream_allocator, stream->index + 1, + size, sample, 0, 0, 0, NULL); + + /* FIXME: Should these be pooled? */ + if (!(buffer = calloc(1, offsetof(struct buffer, data[size])))) + return E_OUTOFMEMORY; + buffer->INSSBuffer_iface.lpVtbl = &buffer_vtbl; + buffer->refcount = 1; + buffer->capacity = size; + + TRACE("Created buffer %p.\n", buffer); + *sample = &buffer->INSSBuffer_iface; + return S_OK; +} + /* Find the earliest buffer by PTS. * * Native seems to behave similarly to this with the async reader, although our @@ -1621,7 +1645,6 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; struct wm_stream *stream; - struct buffer *object; DWORD size, capacity; INSSBuffer *sample; HRESULT hr = S_OK; @@ -1668,26 +1691,7 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); - if (!stream->read_compressed && stream->output_allocator) - hr = IWMReaderAllocatorEx_AllocateForOutputEx(stream->output_allocator, stream->index, - wg_buffer.size, &sample, 0, 0, 0, NULL); - else if (stream->read_compressed && stream->stream_allocator) - hr = IWMReaderAllocatorEx_AllocateForStreamEx(stream->stream_allocator, stream->index + 1, - wg_buffer.size, &sample, 0, 0, 0, NULL); - /* FIXME: Should these be pooled? */ - else if (!(object = calloc(1, offsetof(struct buffer, data[wg_buffer.size])))) - hr = E_OUTOFMEMORY; - else - { - object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; - object->refcount = 1; - object->capacity = wg_buffer.size; - - TRACE("Created buffer %p.\n", object); - sample = &object->INSSBuffer_iface; - } - - if (FAILED(hr)) + if (FAILED(hr = wm_stream_allocate_sample(stream, wg_buffer.size, &sample))) { ERR("Failed to allocate sample of %u bytes, hr %#lx.\n", wg_buffer.size, hr); wg_parser_stream_release_buffer(wg_stream);

1 0

Rémi Bernon : winegstreamer: Split the wm_reader_get_stream_sample helper.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: af751b594e1654c4991c7a491997091c0c85603e URL: https://gitlab.winehq.org/wine/wine/-/commit/af751b594e1654c4991c7a49199709… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 24 01:00:11 2022 +0200 winegstreamer: Split the wm_reader_get_stream_sample helper. --- dlls/winegstreamer/wm_reader.c | 110 ++++++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 52 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index f514475d3eb..09d7bbda3e1 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1596,6 +1596,58 @@ static HRESULT wm_stream_allocate_sample(struct wm_stream *stream, DWORD size, I return S_OK; } +static HRESULT wm_reader_read_stream_sample(struct wm_reader *reader, struct wm_stream *stream, + struct wg_parser_buffer *buffer, INSSBuffer **sample, QWORD *pts, QWORD *duration, DWORD *flags) +{ + DWORD size, capacity; + HRESULT hr; + BYTE *data; + + TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); + + if (FAILED(hr = wm_stream_allocate_sample(stream, buffer->size, sample))) + { + ERR("Failed to allocate sample of %u bytes, hr %#lx.\n", buffer->size, hr); + wg_parser_stream_release_buffer(stream->wg_stream); + return hr; + } + + if (FAILED(hr = INSSBuffer_GetBufferAndLength(*sample, &data, &size))) + ERR("Failed to get data pointer, hr %#lx.\n", hr); + if (FAILED(hr = INSSBuffer_GetMaxLength(*sample, &capacity))) + ERR("Failed to get capacity, hr %#lx.\n", hr); + if (buffer->size > capacity) + ERR("Returned capacity %lu is less than requested capacity %u.\n", capacity, buffer->size); + + if (!wg_parser_stream_copy_buffer(stream->wg_stream, data, 0, buffer->size)) + { + /* The GStreamer pin has been flushed. */ + INSSBuffer_Release(*sample); + *sample = NULL; + return S_FALSE; + } + + if (FAILED(hr = INSSBuffer_SetLength(*sample, buffer->size))) + ERR("Failed to set size %u, hr %#lx.\n", buffer->size, hr); + + wg_parser_stream_release_buffer(stream->wg_stream); + + if (!buffer->has_pts) + FIXME("Missing PTS.\n"); + if (!buffer->has_duration) + FIXME("Missing duration.\n"); + + *pts = buffer->pts; + *duration = buffer->duration; + *flags = 0; + if (buffer->discontinuity) + *flags |= WM_SF_DISCONTINUITY; + if (!buffer->delta) + *flags |= WM_SF_CLEANPOINT; + + return S_OK; +} + /* Find the earliest buffer by PTS. * * Native seems to behave similarly to this with the async reader, although our @@ -1642,15 +1694,11 @@ static WORD get_earliest_buffer(struct wm_reader *reader, struct wg_parser_buffe static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number) { - struct wg_parser_stream *wg_stream; struct wg_parser_buffer wg_buffer; struct wm_stream *stream; - DWORD size, capacity; - INSSBuffer *sample; HRESULT hr = S_OK; - BYTE *data; - for (;;) + do { if (!stream_number) { @@ -1661,7 +1709,6 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream } stream = wm_reader_get_stream_by_stream_number(reader, stream_number); - wg_stream = stream->wg_stream; } else { @@ -1670,7 +1717,6 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream WARN("Invalid stream number %u; returning E_INVALIDARG.\n", stream_number); return E_INVALIDARG; } - wg_stream = stream->wg_stream; if (stream->selection == WMT_OFF) { @@ -1681,7 +1727,7 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream if (stream->eos) return NS_E_NO_MORE_SAMPLES; - if (!wg_parser_stream_get_buffer(wg_stream, &wg_buffer)) + if (!wg_parser_stream_get_buffer(stream->wg_stream, &wg_buffer)) { stream->eos = true; TRACE("End of stream.\n"); @@ -1689,51 +1735,11 @@ static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream } } - TRACE("Got buffer for '%s' stream %p.\n", get_major_type_string(stream->format.major_type), stream); - - if (FAILED(hr = wm_stream_allocate_sample(stream, wg_buffer.size, &sample))) - { - ERR("Failed to allocate sample of %u bytes, hr %#lx.\n", wg_buffer.size, hr); - wg_parser_stream_release_buffer(wg_stream); - return hr; - } - - if (FAILED(hr = INSSBuffer_GetBufferAndLength(sample, &data, &size))) - ERR("Failed to get data pointer, hr %#lx.\n", hr); - if (FAILED(hr = INSSBuffer_GetMaxLength(sample, &capacity))) - ERR("Failed to get capacity, hr %#lx.\n", hr); - if (wg_buffer.size > capacity) - ERR("Returned capacity %lu is less than requested capacity %u.\n", capacity, wg_buffer.size); - - if (!wg_parser_stream_copy_buffer(wg_stream, data, 0, wg_buffer.size)) - { - /* The GStreamer pin has been flushed. */ - INSSBuffer_Release(sample); - continue; - } - - if (FAILED(hr = INSSBuffer_SetLength(sample, wg_buffer.size))) - ERR("Failed to set size %u, hr %#lx.\n", wg_buffer.size, hr); - - wg_parser_stream_release_buffer(wg_stream); - - if (!wg_buffer.has_pts) - FIXME("Missing PTS.\n"); - if (!wg_buffer.has_duration) - FIXME("Missing duration.\n"); + if (SUCCEEDED(hr = wm_reader_read_stream_sample(reader, stream, &wg_buffer, ret_sample, pts, duration, flags))) + *ret_stream_number = stream_number; + } while (hr == S_FALSE); - *pts = wg_buffer.pts; - *duration = wg_buffer.duration; - *flags = 0; - if (wg_buffer.discontinuity) - *flags |= WM_SF_DISCONTINUITY; - if (!wg_buffer.delta) - *flags |= WM_SF_CLEANPOINT; - - *ret_sample = sample; - *ret_stream_number = stream_number; - return S_OK; - } + return hr; } static struct wm_reader *impl_from_IUnknown(IUnknown *iface)

1 0

Rémi Bernon : winegstreamer: Allow wg_parser_stream_get_buffer to wait on all streams.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 042c1cefa56b1cd53070d3c8770920561bb67585 URL: https://gitlab.winehq.org/wine/wine/-/commit/042c1cefa56b1cd53070d3c8770920… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 23 12:31:54 2022 +0200 winegstreamer: Allow wg_parser_stream_get_buffer to wait on all streams. For the WM reader, returning the earliest buffer. --- dlls/winegstreamer/gst_private.h | 3 +- dlls/winegstreamer/main.c | 6 ++- dlls/winegstreamer/media_source.c | 3 +- dlls/winegstreamer/quartz_parser.c | 2 +- dlls/winegstreamer/unixlib.h | 2 + dlls/winegstreamer/wg_parser.c | 92 +++++++++++++++++++++++++++++--------- dlls/winegstreamer/wm_reader.c | 61 +++++-------------------- 7 files changed, 91 insertions(+), 78 deletions(-)

1 0

Rémi Bernon : winegstreamer: Return no buffer when wg_parser stream is disabled.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 407aba3008dfa6b7a3d41a688929a105407da39b URL: https://gitlab.winehq.org/wine/wine/-/commit/407aba3008dfa6b7a3d41a688929a1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 24 11:48:49 2022 +0200 winegstreamer: Return no buffer when wg_parser stream is disabled. --- dlls/winegstreamer/wg_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index d1230c89f2e..14970d327c8 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -268,7 +268,7 @@ static GstBuffer *wait_parser_stream_buffer(struct wg_parser *parser, struct wg_ /* Note that we can both have a buffer and stream->eos, in which case we * must return the buffer. */ - while (!(buffer = stream->buffer) && !stream->eos) + while (stream->enabled && !(buffer = stream->buffer) && !stream->eos) pthread_cond_wait(&stream->event_cond, &parser->mutex); return buffer; @@ -308,7 +308,7 @@ static NTSTATUS wg_parser_stream_get_buffer(void *args) for (i = 0; i < parser->stream_count; ++i) { - if (!parser->streams[i]->enabled || !(buffer = wait_parser_stream_buffer(parser, parser->streams[i]))) + if (!(buffer = wait_parser_stream_buffer(parser, parser->streams[i]))) continue; /* invalid PTS is GST_CLOCK_TIME_NONE == (guint64)-1, so this will prefer valid timestamps. */ if (!earliest || GST_BUFFER_PTS(buffer) < GST_BUFFER_PTS(earliest))

1 0

Rémi Bernon : winegstreamer: Merge wm_reader_get_stream_sample with GetNextSample.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 819a848a5f035d48eb6987d5eeecb21051d049c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/819a848a5f035d48eb6987d5eeecb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 24 01:23:04 2022 +0200 winegstreamer: Merge wm_reader_get_stream_sample with GetNextSample. --- dlls/winegstreamer/wm_reader.c | 74 +++++++++++++----------------------------- 1 file changed, 23 insertions(+), 51 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 43de0f5e970..8ac852a99b0 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1652,55 +1652,6 @@ static HRESULT wm_reader_read_stream_sample(struct wm_reader *reader, struct wg_ return S_OK; } -static HRESULT wm_reader_get_stream_sample(struct wm_reader *reader, WORD stream_number, - INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags, WORD *ret_stream_number) -{ - struct wg_parser_buffer wg_buffer; - struct wm_stream *stream; - HRESULT hr = S_OK; - - do - { - if (!stream_number) - { - if (!wg_parser_stream_get_buffer(reader->wg_parser, NULL, &wg_buffer)) - { - /* All streams are disabled or EOS. */ - return NS_E_NO_MORE_SAMPLES; - } - } - else - { - if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) - { - WARN("Invalid stream number %u; returning E_INVALIDARG.\n", stream_number); - return E_INVALIDARG; - } - - if (stream->selection == WMT_OFF) - { - WARN("Stream %u is deselected; returning NS_E_INVALID_REQUEST.\n", stream_number); - return NS_E_INVALID_REQUEST; - } - - if (stream->eos) - return NS_E_NO_MORE_SAMPLES; - - if (!wg_parser_stream_get_buffer(reader->wg_parser, stream->wg_stream, &wg_buffer)) - { - stream->eos = true; - TRACE("End of stream.\n"); - return NS_E_NO_MORE_SAMPLES; - } - } - - if (SUCCEEDED(hr = wm_reader_read_stream_sample(reader, &wg_buffer, ret_sample, pts, duration, flags))) - *ret_stream_number = wg_buffer.stream + 1; - } while (hr == S_FALSE); - - return hr; -} - static struct wm_reader *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct wm_reader, IUnknown_inner); @@ -1869,7 +1820,8 @@ static HRESULT WINAPI reader_GetNextSample(IWMSyncReader2 *iface, DWORD *flags, DWORD *output_number, WORD *ret_stream_number) { struct wm_reader *reader = impl_from_IWMSyncReader2(iface); - HRESULT hr = NS_E_NO_MORE_SAMPLES; + struct wm_stream *stream; + HRESULT hr = S_FALSE; TRACE("reader %p, stream_number %u, sample %p, pts %p, duration %p," " flags %p, output_number %p, ret_stream_number %p.\n", @@ -1880,7 +1832,27 @@ static HRESULT WINAPI reader_GetNextSample(IWMSyncReader2 *iface, EnterCriticalSection(&reader->cs); - hr = wm_reader_get_stream_sample(reader, stream_number, sample, pts, duration, flags, &stream_number); + if (!stream_number) + stream = NULL; + else if (!(stream = wm_reader_get_stream_by_stream_number(reader, stream_number))) + hr = E_INVALIDARG; + else if (stream->selection == WMT_OFF) + hr = NS_E_INVALID_REQUEST; + else if (stream->eos) + hr = NS_E_NO_MORE_SAMPLES; + + while (hr == S_FALSE) + { + struct wg_parser_buffer wg_buffer; + if (!wg_parser_stream_get_buffer(reader->wg_parser, stream ? stream->wg_stream : NULL, &wg_buffer)) + hr = NS_E_NO_MORE_SAMPLES; + else if (SUCCEEDED(hr = wm_reader_read_stream_sample(reader, &wg_buffer, sample, pts, duration, flags))) + stream_number = wg_buffer.stream + 1; + } + + if (stream && hr == NS_E_NO_MORE_SAMPLES) + stream->eos = true; + if (output_number && hr == S_OK) *output_number = stream_number - 1; if (ret_stream_number && (hr == S_OK || stream_number))

1 0

Gabriel Ivăncescu : mshtml: Use nsIDOMDocument instead of nsIDOMHTMLDocument where possible.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: master Commit: 67f07ffb3f7f83d91b5129743a488db6b0b21371 URL: https://gitlab.winehq.org/wine/wine/-/commit/67f07ffb3f7f83d91b5129743a488d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 8 20:50:35 2022 +0200 mshtml: Use nsIDOMDocument instead of nsIDOMHTMLDocument where possible. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/editor.c | 13 +- dlls/mshtml/htmlbody.c | 6 +- dlls/mshtml/htmlcurstyle.c | 6 +- dlls/mshtml/htmldoc.c | 389 +++++++++++++++++++++++++++---------------- dlls/mshtml/htmlelem.c | 44 ++--- dlls/mshtml/htmlevent.c | 6 +- dlls/mshtml/htmlselect.c | 6 +- dlls/mshtml/htmlwindow.c | 12 +- dlls/mshtml/mshtml_private.h | 9 +- dlls/mshtml/mutation.c | 10 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsembed.c | 7 +- dlls/mshtml/nsevents.c | 6 +- dlls/mshtml/omnavigator.c | 9 +- dlls/mshtml/persist.c | 6 +- dlls/mshtml/range.c | 13 +- dlls/mshtml/script.c | 4 +- dlls/mshtml/selection.c | 11 +- 18 files changed, 330 insertions(+), 229 deletions(-)

1 0