January 2023 - Wine-Commits

Zebediah Figura : d3d8: Filter out redundant buffer discards.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 379ae701c04046661a092cacd7263ca97101f51b URL: https://gitlab.winehq.org/wine/wine/-/commit/379ae701c04046661a092cacd7263c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 12:33:15 2022 -0600 d3d8: Filter out redundant buffer discards. I was unable to write tests for this; it seems it doesn't consistently work on Windows. However, Rayman 3 seems to rely on it; it maps the same buffer twice immediately after creation, with DISCARD flags on both maps, and expects the same address to be returned. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53752 --- dlls/d3d8/buffer.c | 10 ++++++++++ dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 28 ++++++++++++++++++++++++++-- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 2b0f0a41888..23dcf05044c 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -192,6 +192,11 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, UINT TRACE("iface %p, offset %u, size %u, data %p, flags %#lx.\n", iface, offset, size, data, flags); + if (buffer->discarded) + flags &= ~D3DLOCK_DISCARD; + if (flags & D3DLOCK_DISCARD) + buffer->discarded = true; + wined3d_box.left = offset; wined3d_box.right = offset + size; wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); @@ -508,6 +513,11 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, UINT o TRACE("iface %p, offset %u, size %u, data %p, flags %#lx.\n", iface, offset, size, data, flags); + if (buffer->discarded) + flags &= ~D3DLOCK_DISCARD; + if (flags & D3DLOCK_DISCARD) + buffer->discarded = true; + wined3d_box.left = offset; wined3d_box.right = offset + size; wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 340f4f2d07d..dda85062dea 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -217,6 +217,7 @@ struct d3d8_vertexbuffer IDirect3DDevice8 *parent_device; struct wined3d_buffer *draw_buffer; DWORD fvf, usage; + bool discarded; }; HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, @@ -232,6 +233,7 @@ struct d3d8_indexbuffer enum wined3d_format_id format; DWORD usage; bool sysmem; + bool discarded; }; HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fb7e25a6bc1..539dd7a89b9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2516,7 +2516,8 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, D3DPRIMITIVETYPE primitive_type, UINT start_vertex, UINT primitive_count) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - unsigned int vertex_count; + struct d3d8_vertexbuffer *vb; + unsigned int vertex_count, i; TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n", iface, primitive_type, start_vertex, primitive_count); @@ -2529,6 +2530,16 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); + + for (i = 0; i < ARRAY_SIZE(device->stateblock_state->streams); ++i) + { + if (device->stateblock_state->streams[i].buffer) + { + vb = wined3d_buffer_get_parent(device->stateblock_state->streams[i].buffer); + vb->discarded = false; + } + } + wined3d_mutex_unlock(); return D3D_OK; @@ -2539,7 +2550,9 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, UINT start_idx, UINT primitive_count) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - unsigned int index_count; + struct d3d8_vertexbuffer *vb; + struct d3d8_indexbuffer *ib; + unsigned int index_count, i; int base_vertex_index; HRESULT hr; @@ -2567,6 +2580,17 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, } wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_index, start_idx, index_count, 0, 0); + ib = wined3d_buffer_get_parent(device->stateblock_state->index_buffer); + ib->discarded = false; + for (i = 0; i < ARRAY_SIZE(device->stateblock_state->streams); ++i) + { + if (device->stateblock_state->streams[i].buffer) + { + vb = wined3d_buffer_get_parent(device->stateblock_state->streams[i].buffer); + vb->discarded = false; + } + } + wined3d_mutex_unlock(); return D3D_OK;

1 0

Ziqing Hui : mfplat/tests: Add more RGB24 image size tests.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: c96d34e86e624159287dea0f3db12e3175000b15 URL: https://gitlab.winehq.org/wine/wine/-/commit/c96d34e86e624159287dea0f3db12e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jan 4 11:08:13 2023 +0800 mfplat/tests: Add more RGB24 image size tests. --- dlls/mfplat/tests/mfplat.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f8bd56698b1..f1f61e25d00 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4262,6 +4262,7 @@ image_size_tests[] = { &MFVideoFormat_RGB565, 1, 1, 4, 0, 64, 4, 64 }, { &MFVideoFormat_RGB24, 3, 5, 60, 0, 320, 60, 64 }, { &MFVideoFormat_RGB24, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_RGB24, 4, 3, 36, 0, 192, 36, 64 }, { &MFVideoFormat_RGB32, 3, 5, 60, 0, 320, 60, 64 }, { &MFVideoFormat_RGB32, 1, 1, 4, 0, 64, 4, 64 }, { &MFVideoFormat_ARGB32, 3, 5, 60, 0, 320, 60, 64 }, @@ -4278,6 +4279,7 @@ image_size_tests[] = { &MEDIASUBTYPE_RGB565, 1, 1, 4 }, { &MEDIASUBTYPE_RGB24, 3, 5, 60 }, { &MEDIASUBTYPE_RGB24, 1, 1, 4 }, + { &MEDIASUBTYPE_RGB24, 4, 3, 36 }, { &MEDIASUBTYPE_RGB32, 3, 5, 60 }, { &MEDIASUBTYPE_RGB32, 1, 1, 4 }, @@ -4390,7 +4392,9 @@ static void test_MFCalculateImageSize(void) hr = MFCalculateImageSize(ptr->subtype, ptr->width, ptr->height, &size); todo_wine_if(is_MEDIASUBTYPE_RGB(ptr->subtype) || IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#lx.\n", i, hr); - todo_wine_if(is_MEDIASUBTYPE_RGB(ptr->subtype) || IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) + todo_wine_if(is_MEDIASUBTYPE_RGB(ptr->subtype) + || IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11) + || (IsEqualGUID(ptr->subtype, &MFVideoFormat_RGB24) && ptr->width % 4 == 0)) ok(size == ptr->size, "%u: unexpected image size %u, expected %u. Size %u x %u, format %s.\n", i, size, ptr->size, ptr->width, ptr->height, wine_dbgstr_an((char *)&ptr->subtype->Data1, 4)); } @@ -4418,11 +4422,12 @@ static void test_MFGetPlaneSize(void) const struct image_size_test *ptr = &image_size_tests[i]; unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; if ((is_MEDIASUBTYPE_RGB(ptr->subtype))) - plane_size = 0; + continue; hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); ok(hr == S_OK, "%u: failed to get plane size, hr %#lx.\n", i, hr); - todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11)) + todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_NV11) + || (IsEqualGUID(ptr->subtype, &MFVideoFormat_RGB24) && ptr->width % 4 == 0)) ok(size == plane_size, "%u: unexpected plane size %lu, expected %u. Size %u x %u, format %s.\n", i, size, plane_size, ptr->width, ptr->height, wine_dbgstr_an((char*)&ptr->subtype->Data1, 4)); } @@ -5989,11 +5994,13 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMF2DBuffer_GetContiguousLength(_2dbuffer, &length); ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); + todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_RGB24) && ptr->width % 4 == 0) ok(length == ptr->contiguous_length, "%d: unexpected contiguous length %lu for %u x %u, format %s.\n", i, length, ptr->width, ptr->height, wine_dbgstr_guid(ptr->subtype)); hr = IMFMediaBuffer_Lock(buffer, &data, &length2, NULL); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); + todo_wine_if(IsEqualGUID(ptr->subtype, &MFVideoFormat_RGB24) && ptr->width % 4 == 0) ok(length2 == ptr->contiguous_length, "%d: unexpected linear buffer length %lu for %u x %u, format %s.\n", i, length2, ptr->width, ptr->height, wine_dbgstr_guid(ptr->subtype));

1 0

Zebediah Figura : winegstreamer: Protect the "streaming" member of struct parser with a separate lock.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 9c531232779e70a7704b648375cf97c8fcab5f80 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c531232779e70a7704b648375cf97… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 3 13:47:06 2023 -0600 winegstreamer: Protect the "streaming" member of struct parser with a separate lock. The code previously relied on inherent atomicity of atomic types, but atomicity doesn't imply the right memory ordering. Be explicit about the threading model we want. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 8a227145d78..36ca84debba 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -54,6 +54,15 @@ struct parser struct wg_parser *wg_parser; + /* This protects the "streaming" field, accessed by both the application + * and streaming threads. + * We cannot use the filter lock for this, since that is held while waiting + * for the streaming thread, and hence the streaming thread cannot take the + * filter lock. + * This lock must not be acquired before acquiring the filter lock or + * flushing_cs. */ + CRITICAL_SECTION streaming_cs; + /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ @@ -972,10 +981,18 @@ static DWORD CALLBACK stream_thread(void *arg) TRACE("Starting streaming thread for pin %p.\n", pin); - while (filter->streaming) + for (;;) { struct wg_parser_buffer buffer; + EnterCriticalSection(&filter->streaming_cs); + if (!filter->streaming) + { + LeaveCriticalSection(&filter->streaming_cs); + break; + } + LeaveCriticalSection(&filter->streaming_cs); + EnterCriticalSection(&pin->flushing_cs); if (pin->eos) @@ -1095,6 +1112,9 @@ static void parser_destroy(struct strmbase_filter *iface) wg_parser_destroy(filter->wg_parser); + filter->streaming_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->streaming_cs); + strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -1167,7 +1187,9 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) if (!filter->sink_connected) return S_OK; + EnterCriticalSection(&filter->streaming_cs); filter->streaming = false; + LeaveCriticalSection(&filter->streaming_cs); for (i = 0; i < filter->source_count; ++i) { @@ -1359,6 +1381,9 @@ static HRESULT parser_create(enum wg_parser_type type, struct parser **parser) return E_OUTOFMEMORY; } + InitializeCriticalSection(&object->streaming_cs); + object->streaming_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": parser.streaming_cs"); + *parser = object; return S_OK; }

1 0

Rémi Bernon : dinput/tests: Test W.G.I condition effect with negative direction.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 51c73f003fae7e06fce2f7c966dee09afed0a12d URL: https://gitlab.winehq.org/wine/wine/-/commit/51c73f003fae7e06fce2f7c966dee0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 2 15:34:08 2023 +0100 dinput/tests: Test W.G.I condition effect with negative direction. --- dlls/dinput/tests/force_feedback.c | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index b7289ed60ac..b40c8446e09 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5748,6 +5748,37 @@ static void test_windows_gaming_input(void) .report_buf = {3,0x01,0x03,0x04,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0x00,0x00,0x00}, }, }; + struct hid_expect expect_create_condition_neg[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 3, + .report_buf = {2,0x03,0x00}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set condition */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 4, + .report_len = 12, + .report_buf = {4,0x01,0x00,0x70,0x17,0x7b,0x02,0xe9,0x04,0x4c,0x66,0x7f}, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x03,0x04,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xcf,0x00,0x00,0x00}, + }, + }; struct hid_expect expect_create_constant[] = { /* create new effect */ @@ -6593,6 +6624,32 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); + + hr = IForceFeedbackEffect_QueryInterface( effect, &IID_IConditionForceEffect, (void **)&condition_effect ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + direction.X = -direction.X; + hr = IConditionForceEffect_SetParameters( condition_effect, direction, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6 ); + ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); + direction.X = -direction.X; + IConditionForceEffect_Release( condition_effect ); + + set_hid_expect( file, expect_create_condition_neg, sizeof(expect_create_condition_neg) ); + hr = IForceFeedbackMotor_LoadEffectAsync( motor, effect, &result_async ); + ok( hr == S_OK, "LoadEffectAsync returned %#lx\n", hr ); + await_result( result_async ); + check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_unload, sizeof(expect_unload) ); + hr = IForceFeedbackMotor_TryUnloadEffectAsync( motor, effect, &bool_async ); + ok( hr == S_OK, "TryUnloadEffectAsync returned %#lx\n", hr ); + await_bool( bool_async ); + check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); + IAsyncOperation_boolean_Release( bool_async ); + set_hid_expect( file, NULL, 0 ); + + IForceFeedbackEffect_Release( effect ); IConditionForceEffectFactory_Release( condition_factory );

1 0

Rémi Bernon : dinput/tests: Test W.G.I periodic effect with negative direction.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 3a6e5277787710bfc58de300ff3677f7e655d4fa URL: https://gitlab.winehq.org/wine/wine/-/commit/3a6e5277787710bfc58de300ff3677… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 2 15:33:44 2023 +0100 dinput/tests: Test W.G.I periodic effect with negative direction. --- dlls/dinput/tests/force_feedback.c | 65 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index aaa240cdf01..b7289ed60ac 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5678,6 +5678,45 @@ static void test_windows_gaming_input(void) .report_buf = {3,0x01,0x02,0x04,0x78,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, }, }; + struct hid_expect expect_create_periodic_neg[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 3, + .report_buf = {2,0x02,0x00}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set periodic */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 7, + .report_len = 10, + .report_buf = {7,0x01,0x10,0x27,0x00,0x00,0x70,0xff,0xe8,0x03}, + }, + /* set envelope (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 8, + .report_len = 8, + .report_buf = {8,0x01,0x00,0x00,0x00,0x00,0x00,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x02,0x04,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x1a,0x00,0x00,0x00}, + }, + }; struct hid_expect expect_create_condition[] = { /* create new effect */ @@ -6452,6 +6491,32 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); + + hr = IForceFeedbackEffect_QueryInterface( effect, &IID_IPeriodicForceEffect, (void **)&periodic_effect ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + direction.X = -direction.X; + hr = IPeriodicForceEffect_SetParameters( periodic_effect, direction, 1.0, 0.1, 0.0, duration ); + ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); + direction.X = -direction.X; + IPeriodicForceEffect_Release( periodic_effect ); + + set_hid_expect( file, expect_create_periodic_neg, sizeof(expect_create_periodic_neg) ); + hr = IForceFeedbackMotor_LoadEffectAsync( motor, effect, &result_async ); + ok( hr == S_OK, "LoadEffectAsync returned %#lx\n", hr ); + await_result( result_async ); + check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_unload, sizeof(expect_unload) ); + hr = IForceFeedbackMotor_TryUnloadEffectAsync( motor, effect, &bool_async ); + ok( hr == S_OK, "TryUnloadEffectAsync returned %#lx\n", hr ); + await_bool( bool_async ); + check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); + IAsyncOperation_boolean_Release( bool_async ); + set_hid_expect( file, NULL, 0 ); + + IForceFeedbackEffect_Release( effect ); IPeriodicForceEffectFactory_Release( periodic_factory );

1 0

Zebediah Figura : winegstreamer: Explicitly sleep in the streaming thread when flushing.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: fcdc76388f6b9d5abfe17bdee1d2577b62866a96 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcdc76388f6b9d5abfe17bdee1d257… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 3 13:58:40 2023 -0600 winegstreamer: Explicitly sleep in the streaming thread when flushing. The code originally intended to achieve this by simply waiting on flushing_cs, and having the application thread hold flushing_cs while seeking. Unfortunately, this can result in starvation of the application thread, since the streaming thread always reacquires flushing_cs immediately after releasing it. Avoid this by using a separate condition variable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53403 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/quartz_parser.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 36ca84debba..5561b106327 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -54,20 +54,23 @@ struct parser struct wg_parser *wg_parser; - /* This protects the "streaming" field, accessed by both the application - * and streaming threads. + /* This protects the "streaming" and "flushing" fields, accessed by both + * the application and streaming threads. * We cannot use the filter lock for this, since that is held while waiting * for the streaming thread, and hence the streaming thread cannot take the * filter lock. * This lock must not be acquired before acquiring the filter lock or * flushing_cs. */ CRITICAL_SECTION streaming_cs; + CONDITION_VARIABLE flushing_cv; /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ bool streaming, sink_connected; + bool flushing; + HANDLE read_thread; BOOL (*init_gst)(struct parser *filter); @@ -986,11 +989,16 @@ static DWORD CALLBACK stream_thread(void *arg) struct wg_parser_buffer buffer; EnterCriticalSection(&filter->streaming_cs); + + while (filter->flushing) + SleepConditionVariableCS(&filter->flushing_cv, &filter->streaming_cs, INFINITE); + if (!filter->streaming) { LeaveCriticalSection(&filter->streaming_cs); break; } + LeaveCriticalSection(&filter->streaming_cs); EnterCriticalSection(&pin->flushing_cs); @@ -1384,6 +1392,8 @@ static HRESULT parser_create(enum wg_parser_type type, struct parser **parser) InitializeCriticalSection(&object->streaming_cs); object->streaming_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": parser.streaming_cs"); + InitializeConditionVariable(&object->flushing_cv); + *parser = object; return S_OK; } @@ -1532,8 +1542,13 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, IAsyncReader_BeginFlush(filter->reader); } - /* Acquire the flushing locks. This blocks the streaming threads, and - * ensures the seek is serialized between flushes. */ + /* Signal the streaming threads to "pause". */ + EnterCriticalSection(&filter->streaming_cs); + filter->flushing = true; + LeaveCriticalSection(&filter->streaming_cs); + + /* Acquire the flushing locks, to make sure the streaming threads really + * are paused. This ensures the seek is serialized between flushes. */ for (i = 0; i < filter->source_count; ++i) { struct parser_source *flush_pin = filter->sources[i]; @@ -1576,6 +1591,12 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, } } + /* Signal the streaming threads to resume. */ + EnterCriticalSection(&filter->streaming_cs); + filter->flushing = false; + LeaveCriticalSection(&filter->streaming_cs); + WakeConditionVariable(&filter->flushing_cv); + return S_OK; }

1 0

Zebediah Figura : winegstreamer: Factor out a parser_create() helper.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 794763bb601809e63f51bfc2fd53482a7dfd1d8c URL: https://gitlab.winehq.org/wine/wine/-/commit/794763bb601809e63f51bfc2fd5348… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 3 15:10:24 2023 -0600 winegstreamer: Factor out a parser_create() helper. --- dlls/winegstreamer/quartz_parser.c | 67 ++++++++++++++------------------------ 1 file changed, 24 insertions(+), 43 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 6e31f2736fe..8a227145d78 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1343,29 +1343,34 @@ static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, return VFW_S_NO_MORE_ITEMS; } -static BOOL parser_init_gstreamer(void) -{ - if (!init_gstreamer()) - return FALSE; - return TRUE; -} - -HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) +static HRESULT parser_create(enum wg_parser_type type, struct parser **parser) { struct parser *object; - if (!parser_init_gstreamer()) + if (!init_gstreamer()) return E_FAIL; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - if (!(object->wg_parser = wg_parser_create(WG_PARSER_DECODEBIN, false))) + if (!(object->wg_parser = wg_parser_create(type, false))) { free(object); return E_OUTOFMEMORY; } + *parser = object; + return S_OK; +} + +HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) +{ + struct parser *object; + HRESULT hr; + + if (FAILED(hr = parser_create(WG_PARSER_DECODEBIN, &object))) + return hr; + strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, L"input pin", &sink_ops, NULL); @@ -1881,18 +1886,10 @@ static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) { struct parser *object; + HRESULT hr; - if (!parser_init_gstreamer()) - return E_FAIL; - - if (!(object = calloc(1, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (!(object->wg_parser = wg_parser_create(WG_PARSER_WAVPARSE, false))) - { - free(object); - return E_OUTOFMEMORY; - } + if (FAILED(hr = parser_create(WG_PARSER_WAVPARSE, &object))) + return hr; strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, L"input pin", &wave_parser_sink_ops, NULL); @@ -1967,18 +1964,10 @@ static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) { struct parser *object; + HRESULT hr; - if (!parser_init_gstreamer()) - return E_FAIL; - - if (!(object = calloc(1, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (!(object->wg_parser = wg_parser_create(WG_PARSER_AVIDEMUX, false))) - { - free(object); - return E_OUTOFMEMORY; - } + if (FAILED(hr = parser_create(WG_PARSER_AVIDEMUX, &object))) + return hr; strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, L"input pin", &avi_splitter_sink_ops, NULL); @@ -2074,18 +2063,10 @@ static const struct strmbase_filter_ops mpeg_splitter_ops = HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) { struct parser *object; + HRESULT hr; - if (!parser_init_gstreamer()) - return E_FAIL; - - if (!(object = calloc(1, sizeof(*object)))) - return E_OUTOFMEMORY; - - if (!(object->wg_parser = wg_parser_create(WG_PARSER_MPEGAUDIOPARSE, false))) - { - free(object); - return E_OUTOFMEMORY; - } + if (FAILED(hr = parser_create(WG_PARSER_MPEGAUDIOPARSE, &object))) + return hr; strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); strmbase_sink_init(&object->sink, &object->filter, L"Input", &mpeg_splitter_sink_ops, NULL);

1 0

Rémi Bernon : dinput/tests: Test W.G.I constant effect with negative direction.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 44799ea3f0dbc91de6e846f7f8f8a74fa1e85f33 URL: https://gitlab.winehq.org/wine/wine/-/commit/44799ea3f0dbc91de6e846f7f8f8a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 2 12:07:54 2023 +0100 dinput/tests: Test W.G.I constant effect with negative direction. --- dlls/dinput/tests/force_feedback.c | 77 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 794a54e8841..aaa240cdf01 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5747,6 +5747,54 @@ static void test_windows_gaming_input(void) .report_buf = {3,0x01,0x04,0x04,0x5a,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0xff,0x7f,0x4e,0x01,0x00,0x00}, }, }; + struct hid_expect expect_create_constant_neg[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 3, + .report_buf = {2,0x04,0x00}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set constant */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 9, + .report_len = 4, + .report_buf = {9,0x01,0x18,0xfc}, + }, + /* set envelope (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 8, + .report_len = 8, + .report_buf = {8,0x01,0x00,0x00,0x00,0x00,0x00,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x04,0x04,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x7f,0x99,0x00,0x00,0x00}, + .wine_only = TRUE, .todo = TRUE, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x04,0x04,0x28,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x7f,0x4e,0x01,0x00,0x00}, + .todo = TRUE, + }, + }; struct hid_expect expect_create_ramp[] = { /* create new effect */ @@ -6556,6 +6604,35 @@ static void test_windows_gaming_input(void) IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, NULL, 0 ); + + hr = IForceFeedbackEffect_QueryInterface( effect, &IID_IConstantForceEffect, (void **)&constant_effect ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + direction.X = -direction.X; + direction.Y = -direction.Y; + direction.Z = -direction.Z; + hr = IConstantForceEffect_SetParameters( constant_effect, direction, duration ); + ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); + direction.X = -direction.X; + direction.Y = -direction.Y; + direction.Z = -direction.Z; + IConstantForceEffect_Release( constant_effect ); + + set_hid_expect( file, expect_create_constant_neg, sizeof(expect_create_constant_neg) ); + hr = IForceFeedbackMotor_LoadEffectAsync( motor, effect, &result_async ); + ok( hr == S_OK, "LoadEffectAsync returned %#lx\n", hr ); + await_result( result_async ); + check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_unload, sizeof(expect_unload) ); + hr = IForceFeedbackMotor_TryUnloadEffectAsync( motor, effect, &bool_async ); + ok( hr == S_OK, "TryUnloadEffectAsync returned %#lx\n", hr ); + await_bool( bool_async ); + check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); + IAsyncOperation_boolean_Release( bool_async ); + set_hid_expect( file, NULL, 0 ); + IForceFeedbackEffect_Release( effect );

1 0

Ziqing Hui : mfplat/tests: Test MFGetStrideForBitmapInfoHeader for NV11.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: bc467de573830e38ac3a618fe73fa4cfec935a0e URL: https://gitlab.winehq.org/wine/wine/-/commit/bc467de573830e38ac3a618fe73fa4… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Dec 22 10:45:35 2022 +0800 mfplat/tests: Test MFGetStrideForBitmapInfoHeader for NV11. --- dlls/mfplat/tests/mfplat.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 13055d4c5e4..f8bd56698b1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5739,6 +5739,9 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_IYUV, 2, 2 }, { &MFVideoFormat_IYUV, 3, 3 }, { &MFVideoFormat_IYUV, 320, 320 }, + { &MFVideoFormat_NV11, 1, 1 }, + { &MFVideoFormat_NV11, 2, 2 }, + { &MFVideoFormat_NV11, 3, 3 }, }; unsigned int i; LONG stride; @@ -5756,7 +5759,9 @@ static void test_MFGetStrideForBitmapInfoHeader(void) for (i = 0; i < ARRAY_SIZE(stride_tests); ++i) { hr = pMFGetStrideForBitmapInfoHeader(stride_tests[i].subtype->Data1, stride_tests[i].width, &stride); + todo_wine_if(IsEqualGUID(stride_tests[i].subtype, &MFVideoFormat_NV11)) ok(hr == S_OK, "%u: failed to get stride, hr %#lx.\n", i, hr); + todo_wine_if(IsEqualGUID(stride_tests[i].subtype, &MFVideoFormat_NV11)) ok(stride == stride_tests[i].stride, "%u: format %s, unexpected stride %ld, expected %ld.\n", i, wine_dbgstr_an((char *)&stride_tests[i].subtype->Data1, 4), stride, stride_tests[i].stride); }

1 0

Rémi Bernon : dinput/tests: Test W.G.I ramp effect with negative directions.
by Alexandre Julliard Jan. 6, 2023

Jan. 6, 2023

Module: wine Branch: master Commit: 61c251ac1039c066074a66ba77d57b89730e2ef2 URL: https://gitlab.winehq.org/wine/wine/-/commit/61c251ac1039c066074a66ba77d57b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 2 12:07:54 2023 +0100 dinput/tests: Test W.G.I ramp effect with negative directions. --- dlls/dinput/tests/force_feedback.c | 79 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index d6eab3850c5..794a54e8841 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5833,6 +5833,54 @@ static void test_windows_gaming_input(void) .todo = TRUE, }, }; + struct hid_expect expect_create_ramp_neg[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 2, + .report_len = 3, + .report_buf = {2,0x05,0x00}, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 3, + .report_len = 5, + .report_buf = {3,0x01,0x01,0x00,0x00}, + }, + /* set ramp */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 10, + .report_len = 6, + .report_buf = {10,0x01,0x18,0xfc,0x60,0xf0}, + }, + /* set envelope (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 8, + .report_len = 8, + .report_buf = {8,0x01,0x00,0x00,0x00,0x00,0x00,0x00}, + .todo = TRUE, .wine_only = TRUE, + }, + /* update effect (wine) */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x05,0x04,0x8f,0xe4,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x99,0x00,0x00,0x00}, + .wine_only = TRUE, .todo = TRUE, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 18, + .report_buf = {3,0x01,0x05,0x04,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x4e,0x01,0x00,0x00}, + .todo = TRUE, + }, + }; struct hid_expect expect_effect_start = { .code = IOCTL_HID_WRITE_REPORT, @@ -6589,6 +6637,37 @@ static void test_windows_gaming_input(void) set_hid_expect( file, NULL, 0 ); + hr = IForceFeedbackEffect_QueryInterface( effect, &IID_IRampForceEffect, (void **)&ramp_effect ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + direction.X = -direction.X; + direction.Y = -direction.Y; + end_direction.X = -end_direction.X; + end_direction.Z = -end_direction.Z; + hr = IRampForceEffect_SetParameters( ramp_effect, direction, end_direction, infinite_duration ); + ok( hr == S_OK, "SetParameters returned %#lx\n", hr ); + direction.X = -direction.X; + direction.Y = -direction.Y; + end_direction.X = -end_direction.X; + end_direction.Z = -end_direction.Z; + IRampForceEffect_Release( ramp_effect ); + + set_hid_expect( file, expect_create_ramp_neg, sizeof(expect_create_ramp_neg) ); + hr = IForceFeedbackMotor_LoadEffectAsync( motor, effect, &result_async ); + ok( hr == S_OK, "LoadEffectAsync returned %#lx\n", hr ); + await_result( result_async ); + check_result_async( result_async, 1, Completed, S_OK, ForceFeedbackLoadEffectResult_Succeeded ); + IAsyncOperation_ForceFeedbackLoadEffectResult_Release( result_async ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_unload, sizeof(expect_unload) ); + hr = IForceFeedbackMotor_TryUnloadEffectAsync( motor, effect, &bool_async ); + ok( hr == S_OK, "TryUnloadEffectAsync returned %#lx\n", hr ); + await_bool( bool_async ); + check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); + IAsyncOperation_boolean_Release( bool_async ); + set_hid_expect( file, NULL, 0 ); + + IForceFeedbackEffect_Release( effect );

1 0