wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Zebediah Figura : d3d10core/tests: Add a stress test for dynamic buffer maps.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 2ece80c3008d396af747d4af0091d3e460f087eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ece80c3008d396af747d4af… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 00:32:46 2021 -0500 d3d10core/tests: Add a stress test for dynamic buffer maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 67 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 58b5f90fadb..e2fb870279e 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19089,6 +19089,72 @@ static void test_texture_compressed_3d(void) release_test_context(&test_context); } +static void fill_dynamic_vb_quad(void *data, unsigned int x, unsigned int y) +{ + struct vec3 *quad = (struct vec3 *)data + 4 * x; + + memset(quad, 0, 4 * sizeof(*quad)); + + quad[0].x = quad[1].x = -1.0f + 0.01f * x; + quad[2].x = quad[3].x = -1.0f + 0.01f * (x + 1); + + quad[0].y = quad[2].y = -1.0f + 0.01f * y; + quad[1].y = quad[3].y = -1.0f + 0.01f * (y + 1); +} + +/* Stress-test dynamic maps, to ensure that we are applying the correct + * synchronization guarantees. */ +static void test_dynamic_map_synchronization(void) +{ + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + struct d3d10core_test_context test_context; + D3D10_BUFFER_DESC buffer_desc = {0}; + ID3D10Device *device; + unsigned int x, y; + HRESULT hr; + void *data; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + buffer_desc.ByteWidth = 200 * 4 * sizeof(struct vec3); + buffer_desc.Usage = D3D10_USAGE_DYNAMIC; + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &test_context.vb); + ok(hr == S_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + + for (y = 0; y < 200; ++y) + { + hr = ID3D10Buffer_Map(test_context.vb, D3D10_MAP_WRITE_DISCARD, 0, &data); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(data, 0, y); + + ID3D10Buffer_Unmap(test_context.vb); + draw_color_quad(&test_context, &green); + + for (x = 1; x < 200; ++x) + { + hr = ID3D10Buffer_Map(test_context.vb, D3D10_MAP_WRITE_NO_OVERWRITE, 0, &data); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(data, x, y); + + ID3D10Buffer_Unmap(test_context.vb); + ID3D10Device_Draw(device, 4, x * 4); + } + } + + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19215,6 +19281,7 @@ START_TEST(d3d10core) queue_test(test_dual_source_blend); queue_test(test_unbound_streams); queue_test(test_texture_compressed_3d); + queue_test(test_dynamic_map_synchronization); run_queued_tests();

1 0

Zebediah Figura : d3d11/tests: Add a stress test for dynamic buffer maps.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 2c1ce46be379ec107a5a0ddbc6193edbc44f8926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1ce46be379ec107a5a0ddb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 00:32:45 2021 -0500 d3d11/tests: Add a stress test for dynamic buffer maps. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ae3020e130d..0f8e59573ed 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33696,6 +33696,100 @@ static void test_constant_buffer_offset(void) release_test_context(&test_context); } +static void fill_dynamic_vb_quad(const D3D11_MAPPED_SUBRESOURCE *map_desc, unsigned int x, unsigned int y) +{ + struct vec3 *quad = (struct vec3 *)map_desc->pData + 4 * x; + + memset(quad, 0, 4 * sizeof(*quad)); + + quad[0].x = quad[1].x = -1.0f + 0.01f * x; + quad[2].x = quad[3].x = -1.0f + 0.01f * (x + 1); + + quad[0].y = quad[2].y = -1.0f + 0.01f * y; + quad[1].y = quad[3].y = -1.0f + 0.01f * (y + 1); +} + +/* Stress-test dynamic maps, to ensure that we are applying the correct + * synchronization guarantees. */ +static void test_dynamic_map_synchronization(void) +{ + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + ID3D11DeviceContext *immediate, *deferred; + struct d3d11_test_context test_context; + D3D11_BUFFER_DESC buffer_desc = {0}; + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11CommandList *list; + ID3D11Device *device; + unsigned int x, y; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + immediate = test_context.immediate_context; + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + buffer_desc.ByteWidth = 200 * 4 * sizeof(struct vec3); + buffer_desc.Usage = D3D11_USAGE_DYNAMIC; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &test_context.vb); + ok(hr == S_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &red.x); + + for (y = 0; y < 200; ++y) + { + if (y % 2) + { + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(&map_desc, 0, y); + + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); + draw_color_quad(&test_context, &green); + } + else + { + hr = ID3D11DeviceContext_Map(deferred, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(&map_desc, 0, y); + + ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)test_context.vb, 0); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list); + ok(hr == S_OK, "Failed to record command list, hr %#x.\n", hr); + ID3D11DeviceContext_ExecuteCommandList(immediate, list, TRUE); + ID3D11CommandList_Release(list); + draw_color_quad(&test_context, &green); + } + + for (x = 1; x < 200; ++x) + { + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)test_context.vb, + 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &map_desc); + ok(hr == S_OK, "Failed to map buffer, hr %#x.\n", hr); + + fill_dynamic_vb_quad(&map_desc, x, y); + + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)test_context.vb, 0); + ID3D11DeviceContext_Draw(immediate, 4, x * 4); + } + } + + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + ID3D11DeviceContext_Release(deferred); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -33870,6 +33964,7 @@ START_TEST(d3d11) queue_test(test_unbound_streams); queue_test(test_texture_compressed_3d); queue_test(test_constant_buffer_offset); + queue_test(test_dynamic_map_synchronization); run_queued_tests(); }

1 0

Zebediah Figura : d3d9: Pass a valid map box to wined3d_resource_map().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: b19cdef00e5d633e10c2357f8ec42808aee635d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b19cdef00e5d633e10c2357f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 24 16:47:41 2021 -0500 d3d9: Pass a valid map box to wined3d_resource_map(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 7af652e7d1a..07bdfa9320e 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -191,14 +191,14 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; + struct wined3d_box wined3d_box; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); - wined3d_box.left = offset; - wined3d_box.right = offset + size; + wined3d_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1); + wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box, @@ -527,14 +527,14 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, struct d3d9_indexbuffer *buffer = impl_from_IDirect3DIndexBuffer9(iface); struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; + struct wined3d_box wined3d_box; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); - wined3d_box.left = offset; - wined3d_box.right = offset + size; + wined3d_box_set(&wined3d_box, offset, 0, offset + size, 1, 0, 1); + wined3d_mutex_lock(); wined3d_resource = wined3d_buffer_get_resource(buffer->wined3d_buffer); hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, &wined3d_box,

1 0

Zebediah Figura : wined3d: Implement Vulkan NULL cube array image shader resource view descriptors.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 1ebe7e8b0e603291a39a54275b1ce97734264b7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ebe7e8b0e603291a39a5427… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 24 16:18:44 2021 -0500 wined3d: Implement Vulkan NULL cube array image shader resource view descriptors. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 4 ++++ dlls/wined3d/device.c | 15 +++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index aeaeca322ff..bb6c0bfd706 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2678,6 +2678,10 @@ static bool wined3d_shader_resource_bindings_add_null_srv_binding(struct wined3d return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_2dms_array, NULL); + case WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY: + return wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, + binding_idx, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, NULL, &v->vk_info_cube_array, NULL); + default: FIXME("Unhandled resource type %#x.\n", type); return false; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 07bd7c65ad7..71b1e3c3f88 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -855,9 +855,23 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st v->vk_info_2dms_array.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; TRACE("Created 2D MSAA array image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_2dms_array.imageView)); + view_desc.image = r->image_2d.vk_image; + view_desc.subresourceRange.layerCount = 6; + view_desc.viewType = VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; + if ((vr = VK_CALL(vkCreateImageView(device_vk->vk_device, &view_desc, NULL, &v->vk_info_cube_array.imageView))) < 0) + { + ERR("Failed to create cube array image view, vr %s.\n", wined3d_debug_vkresult(vr)); + goto fail; + } + v->vk_info_cube_array.sampler = VK_NULL_HANDLE; + v->vk_info_cube_array.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + TRACE("Created cube array image view 0x%s.\n", wine_dbgstr_longlong(v->vk_info_cube_array.imageView)); + return true; fail: + if (v->vk_info_cube_array.imageView) + VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_cube_array.imageView, NULL)); if (v->vk_info_2d_array.imageView) VK_CALL(vkDestroyImageView(device_vk->vk_device, v->vk_info_2d_array.imageView, NULL)); if (v->vk_info_cube.imageView) @@ -883,6 +897,7 @@ void wined3d_device_vk_destroy_null_views(struct wined3d_device_vk *device_vk, s struct wined3d_null_views_vk *v = &device_vk->null_views_vk; uint64_t id = context_vk->current_command_buffer.id; + wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_cube_array.imageView, id); wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2dms_array.imageView, id); wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_2d_array.imageView, id); wined3d_context_vk_destroy_vk_image_view(context_vk, v->vk_info_cube.imageView, id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 97be4bd5e2a..8c49e694fa9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3942,6 +3942,7 @@ struct wined3d_null_views_vk VkDescriptorImageInfo vk_info_1d_array; VkDescriptorImageInfo vk_info_2d_array; VkDescriptorImageInfo vk_info_2dms_array; + VkDescriptorImageInfo vk_info_cube_array; }; #define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024)

1 0

Giovanni Mascellani : winegstreamer/media_source: Implement paused state.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: d869f4a8bcf7284e4fb6915cadcc4abca37ec54e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d869f4a8bcf7284e4fb6915c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 22 13:18:39 2021 +0200 winegstreamer/media_source: Implement paused state. For asynchronous elements like a media source the paused state is rather similar to the playing state. The most revelant difference is that RequestSample commands are not immediately executed, but are scheduled in an internal queue. As soon as playback is restarted, all pending operations are submitted again (or they are discarded if playback is stopped). This patch implements such a queue, together with proper event emitting when the media source is paused. Also, the characteristic MFMEDIASOURCE_CAN_PAUSE is announced. This patch is required for correct playback of some videos in Deep Rock Galactic. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 107 +++++++++++++++++++++++++++++++++++--- 1 file changed, 101 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 46cb94d4cde..12ca14ca139 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -37,6 +37,10 @@ struct media_stream struct wg_parser_stream *wg_stream; + IUnknown **token_queue; + LONG token_queue_count; + LONG token_queue_cap; + enum { STREAM_INACTIVE, @@ -50,6 +54,7 @@ struct media_stream enum source_async_op { SOURCE_ASYNC_START, + SOURCE_ASYNC_PAUSE, SOURCE_ASYNC_STOP, SOURCE_ASYNC_REQUEST_SAMPLE, }; @@ -96,6 +101,7 @@ struct media_source { SOURCE_OPENING, SOURCE_STOPPED, + SOURCE_PAUSED, SOURCE_RUNNING, SOURCE_SHUTDOWN, } state; @@ -260,6 +266,55 @@ static IMFStreamDescriptor *stream_descriptor_from_id(IMFPresentationDescriptor return NULL; } +static BOOL enqueue_token(struct media_stream *stream, IUnknown *token) +{ + if (stream->token_queue_count == stream->token_queue_cap) + { + IUnknown **buf; + stream->token_queue_cap = stream->token_queue_cap * 2 + 1; + buf = realloc(stream->token_queue, stream->token_queue_cap * sizeof(*buf)); + if (buf) + stream->token_queue = buf; + else + { + stream->token_queue_cap = stream->token_queue_count; + return FALSE; + } + } + stream->token_queue[stream->token_queue_count++] = token; + return TRUE; +} + +static void flush_token_queue(struct media_stream *stream, BOOL send) +{ + LONG i; + + for (i = 0; i < stream->token_queue_count; i++) + { + if (send) + { + HRESULT hr; + struct source_async_command *command; + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_REQUEST_SAMPLE, &command))) + { + command->u.request_sample.stream = stream; + command->u.request_sample.token = stream->token_queue[i]; + + hr = MFPutWorkItem(stream->parent_source->async_commands_queue, + &stream->parent_source->async_commands_callback, &command->IUnknown_iface); + } + if (FAILED(hr)) + WARN("Could not enqueue sample request, hr %#x\n", hr); + } + else if (stream->token_queue[i]) + IUnknown_Release(stream->token_queue[i]); + } + free(stream->token_queue); + stream->token_queue = NULL; + stream->token_queue_count = 0; + stream->token_queue_cap = 0; +} + static void start_pipeline(struct media_source *source, struct source_async_command *command) { PROPVARIANT *position = &command->u.start.position; @@ -333,6 +388,27 @@ static void start_pipeline(struct media_source *source, struct source_async_comm unix_funcs->wg_parser_stream_seek(source->streams[0]->wg_stream, 1.0, position->hVal.QuadPart, 0, AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning); unix_funcs->wg_parser_end_flush(source->wg_parser); + + for (i = 0; i < source->stream_count; i++) + flush_token_queue(source->streams[i], position->vt == VT_EMPTY); +} + +static void pause_pipeline(struct media_source *source) +{ + unsigned int i; + + for (i = 0; i < source->stream_count; i++) + { + struct media_stream *stream = source->streams[i]; + if (stream->state != STREAM_INACTIVE) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamPaused, &GUID_NULL, S_OK, NULL); + } + } + + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourcePaused, &GUID_NULL, S_OK, NULL); + + source->state = SOURCE_PAUSED; } static void stop_pipeline(struct media_source *source) @@ -354,6 +430,9 @@ static void stop_pipeline(struct media_source *source) IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL); source->state = SOURCE_STOPPED; + + for (i = 0; i < source->stream_count; i++) + flush_token_queue(source->streams[i], FALSE); } static void dispatch_end_of_presentation(struct media_source *source) @@ -502,11 +581,17 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA case SOURCE_ASYNC_START: start_pipeline(source, command); break; + case SOURCE_ASYNC_PAUSE: + pause_pipeline(source); + break; case SOURCE_ASYNC_STOP: stop_pipeline(source); break; case SOURCE_ASYNC_REQUEST_SAMPLE: - wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token); + if (source->state == SOURCE_PAUSED) + enqueue_token(command->u.request_sample.stream, command->u.request_sample.token); + else + wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token); break; } @@ -617,6 +702,7 @@ static ULONG WINAPI media_stream_Release(IMFMediaStream *iface) { if (stream->event_queue) IMFMediaEventQueue_Release(stream->event_queue); + flush_token_queue(stream, FALSE); free(stream); } @@ -719,8 +805,8 @@ static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown IUnknown_AddRef(token); command->u.request_sample.token = token; - /* Once pause support is added, this will need to put into a stream queue, and synchronization will need to be added*/ - hr = MFPutWorkItem(stream->parent_source->async_commands_queue, &stream->parent_source->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(stream->parent_source->async_commands_queue, + &stream->parent_source->async_commands_callback, &command->IUnknown_iface); } return hr; @@ -1147,7 +1233,7 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - *characteristics = MFMEDIASOURCE_CAN_SEEK; + *characteristics = MFMEDIASOURCE_CAN_SEEK | MFMEDIASOURCE_CAN_PAUSE; return S_OK; } @@ -1211,13 +1297,22 @@ static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); + struct source_async_command *command; + HRESULT hr; - FIXME("%p: stub\n", iface); + TRACE("%p.\n", iface); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + if (source->state != SOURCE_RUNNING) + return MF_E_INVALID_STATE_TRANSITION; + + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_PAUSE, &command))) + hr = MFPutWorkItem(source->async_commands_queue, + &source->async_commands_callback, &command->IUnknown_iface); + + return S_OK; } static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface)

1 0

Giovanni Mascellani : winegstreamer/media_source: Only seek if it was requested by the caller.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: f45c8fd2b8075fb2db72169d6c28af1ea000a047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f45c8fd2b8075fb2db72169d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 22 13:18:38 2021 +0200 winegstreamer/media_source: Only seek if it was requested by the caller. When starting a media source, the caller can specify a timestamp to seek to by mean of a PROPVARIANT argument. If the PROPVARIANT is empty, then no seek operation has to take place: playback has to either restart from the beginning (if the media source was previously in stopped state) or from where it was left (if the media source was in paused state). Also, when a PROPVARIANT is empty it is a bug to use its content, because there is no guarantee that it is initialized to a sensible value. This patch fixes both bugs by gating the seek operation with the check that the PROPVARIANT has the right type. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index a10ad998231..46cb94d4cde 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -329,8 +329,9 @@ static void start_pipeline(struct media_source *source, struct source_async_comm source->state = SOURCE_RUNNING; - unix_funcs->wg_parser_stream_seek(source->streams[0]->wg_stream, 1.0, - position->hVal.QuadPart, 0, AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning); + if (position->vt == VT_I8) + unix_funcs->wg_parser_stream_seek(source->streams[0]->wg_stream, 1.0, + position->hVal.QuadPart, 0, AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning); unix_funcs->wg_parser_end_flush(source->wg_parser); }

1 0

Giovanni Mascellani : winegstreamer/media_source: Emit absolute presentation timestamp.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: c9f0a3ce5c8eee2a0098df74b98208015843fa71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f0a3ce5c8eee2a0098df74… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 22 13:18:37 2021 +0200 winegstreamer/media_source: Emit absolute presentation timestamp. Currently the media source emit a presentation timestamp relative to when the playback was last restarted. I.e., the frame that sits two seconds inside a media file will get timestamp 2 if playback was started at the beginning of the file, but will get timestamp 1 if playback was last restarted at second 1. This does not match Windows behavior, where each frame always gets the same timestamp independently from where playback was started. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 825bad8da27..a10ad998231 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -100,8 +100,6 @@ struct media_source SOURCE_SHUTDOWN, } state; - LONGLONG start_time; - HANDLE read_thread; bool read_thread_shutdown; }; @@ -274,7 +272,6 @@ static void start_pipeline(struct media_source *source, struct source_async_comm position->vt = VT_I8; position->hVal.QuadPart = 0; } - source->start_time = position->hVal.QuadPart; for (i = 0; i < source->stream_count; i++) { @@ -427,7 +424,7 @@ static void send_buffer(struct media_stream *stream, const struct wg_parser_even goto out; } - if (FAILED(hr = IMFSample_SetSampleTime(sample, event->u.buffer.pts - stream->parent_source->start_time))) + if (FAILED(hr = IMFSample_SetSampleTime(sample, event->u.buffer.pts))) { ERR("Failed to set sample time, hr %#x.\n", hr); goto out;

1 0

Paul Gofman : kernelbase: Don't use LdrLockLoaderLock() in GetModuleHandleExW().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 4e50b6179f8f8d4c2f9eda395d479f81f7199bed URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e50b6179f8f8d4c2f9eda39… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 27 13:50:03 2021 +0300 kernelbase: Don't use LdrLockLoaderLock() in GetModuleHandleExW(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 9aff460c955..da139e91176 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -373,10 +373,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExA( DWORD flags, LPCSTR name, HMOD */ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) { - NTSTATUS status = STATUS_SUCCESS; HMODULE ret = NULL; - ULONG_PTR magic; - BOOL lock; + NTSTATUS status; + void *dummy; if (!module) { @@ -394,35 +393,31 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMO return FALSE; } - /* if we are messing with the refcount, grab the loader lock */ - lock = (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT); - if (lock) LdrLockLoaderLock( 0, NULL, &magic ); - - if (!name) - { - ret = NtCurrentTeb()->Peb->ImageBaseAddress; - } - else if (flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) - { - void *dummy; - if (!(ret = RtlPcToFileHeader( (void *)name, &dummy ))) status = STATUS_DLL_NOT_FOUND; - } - else + if (name && !(flags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) { UNICODE_STRING wstr; - RtlInitUnicodeString( &wstr, name ); - status = LdrGetDllHandle( NULL, 0, &wstr, &ret ); - } + ULONG ldr_flags = 0; - if (status == STATUS_SUCCESS) - { if (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) - LdrAddRefDll( LDR_ADDREF_DLL_PIN, ret ); - else if (!(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) - LdrAddRefDll( 0, ret ); + ldr_flags |= LDR_GET_DLL_HANDLE_EX_FLAG_PIN; + if (flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT) + ldr_flags |= LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT; + + RtlInitUnicodeString( &wstr, name ); + status = LdrGetDllHandleEx( ldr_flags, NULL, NULL, &wstr, &ret ); } + else + { + ret = name ? RtlPcToFileHeader( (void *)name, &dummy ) : NtCurrentTeb()->Peb->ImageBaseAddress; - if (lock) LdrUnlockLoaderLock( 0, magic ); + if (ret) + { + if (!(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + status = LdrAddRefDll( flags & GET_MODULE_HANDLE_EX_FLAG_PIN ? LDR_ADDREF_DLL_PIN : 0, ret ); + else + status = STATUS_SUCCESS; + } else status = STATUS_DLL_NOT_FOUND; + } *module = ret; return set_ntstatus( status );

1 0

Paul Gofman : kernelbase: Sanitize flags in GetModuleHandleExW().
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: 7ddd79b8f5e814437afc4aaa25fa82fe45e0c742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ddd79b8f5e814437afc4aaa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 27 13:50:02 2021 +0300 kernelbase: Sanitize flags in GetModuleHandleExW(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 17 +++++++++++++++++ dlls/kernelbase/loader.c | 10 ++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 5ca137ad6ba..bfa389ac9ab 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1011,6 +1011,23 @@ static void testGetModuleHandleEx(void) ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); ok( mod == NULL, "got %p\n", mod ); + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | GET_MODULE_HANDLE_EX_FLAG_PIN, (LPCWSTR)mod_kernel32, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = GetModuleHandleExW( 8, kernel32W, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + FreeLibrary( mod_kernel32 ); } diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index ac463528e3c..9aff460c955 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -384,6 +384,16 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMO return FALSE; } + if ((flags & ~(GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) + || (flags & (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + == (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + { + *module = NULL; + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + /* if we are messing with the refcount, grab the loader lock */ lock = (flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT); if (lock) LdrLockLoaderLock( 0, NULL, &magic );

1 0

Paul Gofman : ntdll: Implement LdrGetDllHandleEx() function.
by Alexandre Julliard 27 Sep '21

27 Sep '21

Module: wine Branch: master Commit: cf0a828b02af45beb0b42ce9dbb08e3ee702deff URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf0a828b02af45beb0b42ce9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 27 13:50:01 2021 +0300 ntdll: Implement LdrGetDllHandleEx() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 44 ++++++++++++++++-- dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 5 ++ 4 files changed, 152 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf0a828b02af45beb0b4…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021