June 2022 - Wine-Devel - list.winehq.org

[PATCH 2/6] winegstreamer: Release wg_transform output sample when too small.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/wg_transform.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index e05432f6ac7..b0048fad644 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -314,10 +314,15 @@ static struct wg_sample *transform_request_sample(gsize size, void *context) GST_LOG("size %#zx, context %p", size, transform); - sample = InterlockedExchangePointer((void **)&transform->output_wg_sample, NULL); - if (!sample || sample->max_size < size) + if (!(sample = InterlockedExchangePointer((void **)&transform->output_wg_sample, NULL))) return NULL; + if (sample->max_size < size) + { + InterlockedDecrement(&sample->refcount); + return NULL; + } + return sample; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/302

June 23, 2022

[PATCH 1/6] mf/tests: Add todo_wine for newer FFmpeg versions.

by Rémi Bernon

From: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2f3ee3151da..5f26b1a6238 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5911,7 +5911,7 @@ static void check_sample_pcm16_(int line, IMFSample *sample, const BYTE *expect_ if (expect - value + 512 > 1024) break; } - todo_wine_if(todo) + todo_wine_if(todo && i < length / 2) ok_(__FILE__, line)(i == length, "unexpected buffer data\n"); if (output_file) WriteFile(output_file, buffer, length, &length, NULL); @@ -6544,6 +6544,9 @@ static void test_wma_decoder(void) hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); winetest_pop_context(); + + /* some FFmpeg version request more input to complete decoding */ + if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT && i == 2) break; } todo_wine ok(wmadec_data_len == 0, "missing %#lx bytes\n", wmadec_data_len); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/302

June 23, 2022

[PATCH 0/6] MR302: winegstreamer: Some wg_transform H264 fixes for Mortal Kombat 11 and Yakuza 4.

by Rémi Bernon

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/302

June 23, 2022

Re: [PATCH v4 2/7] mfplat/tests: Use a more unique pattern when testing image formats.

by Nikolay Sivov

On 6/21/22 14:22, Giovanni Mascellani wrote: > case MAKEFOURCC('I','M','C','2'): > case MAKEFOURCC('I','M','C','4'): > - for (j = ptr->height; j < length2 / stride; j++) > - for (k = 0; k < ptr->width / 2; k++) > - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); > - for (j = ptr->height; j < length2 / stride; j++) > - for (k = pitch / 2; k < pitch / 2 + ptr->width / 2; k++) > - ok(data[j * pitch + k] == 0xff, "Unexpected byte %02x at test %d row %d column %d.\n", data[j * pitch + k], i, j, k); > + for (j = 0; j < ptr->height; j++) > + for (k = 0; k < stride / 2; k++) > + todo_if(ptr->height % 2 == 1 && j >= 2) > + ok(data[j * (pitch / 2) + k] == (((j + ptr->height) % 16) << 4) + (k % 16), > + "Unexpected byte %02x instead of %02x at test %d row %d column %d.\n", > + data[j * (pitch / 2) + k], (((j + ptr->height) % 16) << 4) + (k % 16), i, j + ptr->height, k); > break; Should this use todo_wine_if()? I think that's why it fails on the bot.

June 23, 2022

[PATCH 1/1] iphlpapi: Don't allocate the IO status block on the stack.

by Huw Davies

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index fc8ee3d2040..65d3793011b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4628,6 +4628,21 @@ DWORD WINAPI IcmpSendEcho2( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_rou opts, reply, reply_size, timeout ); } +struct icmp_apc_ctxt +{ + void *apc_ctxt; + PIO_APC_ROUTINE apc_routine; + IO_STATUS_BLOCK iosb; +}; + +void WINAPI icmp_apc_routine( void *context, IO_STATUS_BLOCK *iosb, ULONG reserved ) +{ + struct icmp_apc_ctxt *ctxt = context; + + ctxt->apc_routine( ctxt->apc_ctxt, iosb, reserved ); + heap_free( ctxt ); +} + /*********************************************************************** * IcmpSendEcho2Ex (IPHLPAPI.@) */ @@ -4636,24 +4651,30 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r void *reply, DWORD reply_size, DWORD timeout ) { struct icmp_handle_data *data = (struct icmp_handle_data *)handle; + struct icmp_apc_ctxt *ctxt = heap_alloc( sizeof(*ctxt) ); + IO_STATUS_BLOCK *iosb = &ctxt->iosb; DWORD opt_size, in_size, ret = 0; struct nsiproxy_icmp_echo *in; HANDLE request_event; - IO_STATUS_BLOCK iosb; NTSTATUS status; if (handle == INVALID_HANDLE_VALUE || !reply) { + heap_free( ctxt ); SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + ctxt->apc_routine = apc_routine; + ctxt->apc_ctxt = apc_ctxt; + opt_size = opts ? (opts->OptionsSize + 3) & ~3 : 0; in_size = FIELD_OFFSET(struct nsiproxy_icmp_echo, data[opt_size + request_size]); in = heap_alloc_zero( in_size ); if (!in) { + heap_free( ctxt ); SetLastError( IP_NO_RESOURCES ); return 0; } @@ -4678,20 +4699,21 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r request_event = event ? event : (apc_routine ? NULL : CreateEventW( NULL, 0, 0, NULL )); - status = NtDeviceIoControlFile( data->nsi_device, request_event, apc_routine, apc_ctxt, - &iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, - reply, reply_size ); + status = NtDeviceIoControlFile( data->nsi_device, request_event, apc_routine ? icmp_apc_routine : NULL, + apc_routine ? ctxt : apc_ctxt, iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, + in, in_size, reply, reply_size ); if (status == STATUS_PENDING) { if (!event && !apc_routine && !WaitForSingleObject( request_event, INFINITE )) - status = iosb.Status; + status = iosb->Status; } if (!status) ret = IcmpParseReplies( reply, reply_size ); if (!event && request_event) CloseHandle( request_event ); + if (!apc_routine || status != STATUS_PENDING) heap_free( ctxt ); heap_free( in ); if (status) SetLastError( RtlNtStatusToDosError( status ) ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/301

June 23, 2022

[PATCH 0/1] MR301: iphlpapi: Don't allocate the IO status block on the stack.

by Huw Davies (＠huw)

Signed-off-by: Huw Davies <huw(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/301

June 23, 2022

[PATCH 2/2] d2d1/effect: Forward IsBufferPrecisionSupported() to corresponding device context.

by Nikolay Sivov

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f5d5494c67a..f1b877821c8 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -367,9 +367,12 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CheckFeatureSupport(ID2D1Eff static BOOL STDMETHODCALLTYPE d2d_effect_context_IsBufferPrecisionSupported(ID2D1EffectContext *iface, D2D1_BUFFER_PRECISION precision) { - FIXME("iface %p, precision %#x stub!\n", iface, precision); + struct d2d_effect_context *effect_context = impl_from_ID2D1EffectContext(iface); - return FALSE; + TRACE("iface %p, precision %u.\n", iface, precision); + + return ID2D1DeviceContext1_IsBufferPrecisionSupported(&effect_context->device_context->ID2D1DeviceContext1_iface, + precision); } static const ID2D1EffectContextVtbl d2d_effect_context_vtbl = -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/300

June 23, 2022

[PATCH 1/2] d2d1: Implement IsBufferPrecisionSupported().

by Nikolay Sivov

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index be7b8f9f8e2..04a31992ba2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -2045,9 +2045,31 @@ static BOOL STDMETHODCALLTYPE d2d_device_context_IsDxgiFormatSupported(ID2D1Devi static BOOL STDMETHODCALLTYPE d2d_device_context_IsBufferPrecisionSupported(ID2D1DeviceContext1 *iface, D2D1_BUFFER_PRECISION buffer_precision) { - FIXME("iface %p, buffer_precision %#x stub!\n", iface, buffer_precision); + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + DXGI_FORMAT format; + UINT support = 0; + HRESULT hr; - return FALSE; + TRACE("iface %p, buffer_precision %u.\n", iface, buffer_precision); + + switch (buffer_precision) + { + case D2D1_BUFFER_PRECISION_8BPC_UNORM: format = DXGI_FORMAT_R8G8B8A8_UNORM; break; + case D2D1_BUFFER_PRECISION_8BPC_UNORM_SRGB: format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; break; + case D2D1_BUFFER_PRECISION_16BPC_UNORM: format = DXGI_FORMAT_R16G16B16A16_UNORM; break; + case D2D1_BUFFER_PRECISION_16BPC_FLOAT: format = DXGI_FORMAT_R16G16B16A16_FLOAT; break; + case D2D1_BUFFER_PRECISION_32BPC_FLOAT: format = DXGI_FORMAT_R32G32B32A32_FLOAT; break; + default: + WARN("Unexpected precision %u.\n", buffer_precision); + return FALSE; + } + + if (FAILED(hr = ID3D11Device1_CheckFormatSupport(context->d3d_device, format, &support))) + { + WARN("Format support check failed, hr %#lx.\n", hr); + } + + return !!(support & D3D11_FORMAT_SUPPORT_BUFFER); } static void STDMETHODCALLTYPE d2d_device_context_GetImageLocalBounds(ID2D1DeviceContext1 *iface, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/300

June 23, 2022

[PATCH 0/2] MR300: d2d1: Implement IsBufferPrecisionSupported().

by Nikolay Sivov (＠nsivov)

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/300

June 23, 2022

Re: vkd3d release schedule

by Giovanni Mascellani

Hi, Il 23/06/22 09:49, Henri Verbeet ha scritto: > As you may have noticed, the time between the vkd3d 1.3 and 1.4 > releases was a fair bit shorter than the time between the 1.2 and 1.3 > releases. That was deliberate; at the start of the year the plan was > made to aim for about 4 vkd3d releases per year. I think that has > worked out well so far, so we'd like to continue along those lines. In > practical terms, that puts the tentative release dates for vkd3d 1.5 > and 1.6 at late September and late December this year. Shall we also define a freeze schedule, possibly a bit more in advance than we did this time? For 1.4 we had a soft freeze (API and architecture) and a hard freeze (only important bugfixes), both a week long. In practice during the soft freeze there were two accepted patch sets (one by me with matrix support, which was mostly discussed before freeze anyway, and another by Biswapriyo with some IDL additions) and one during the hard freeze (essentially doing the release itself, plus a small bugfix). I would propose to have a significantly longer soft freeze (at least a month) so that API has to be frozen well in advance, and a slightly longer hard freeze, but with a perhaps wider filter (e.g., two weeks, during which only important bugfixes to the main code are accepted, but it is still possible to commit pretty much everything to testing code, tests and documentation). Ideally this would allow us to consolidate work in tests and docs (not that the situation is terrible in vkd3d, but it's not bad to have some time specifically dedicated to that). My two cents, Giovanni.

June 23, 2022