April 2020 - Wine-commits - list.winehq.org

Jacek Caban : server: Don't wait for client thread to enter suspended state in set_thread_context.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: aa0c4bb5e72caf290b6588bc1f9931cc89a9feb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa0c4bb5e72caf290b6588bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:33:09 2020 +0200 server: Don't wait for client thread to enter suspended state in set_thread_context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 26 -------------------------- server/thread.c | 22 ++++------------------ 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ee3c925f91..b8c270c16d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -787,42 +787,16 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) { NTSTATUS ret; - DWORD dummy, i; SERVER_START_REQ( set_thread_context ) { req->handle = wine_server_obj_handle( handle ); - req->suspend = 1; wine_server_add_data( req, context, sizeof(*context) ); ret = wine_server_call( req ); *self = reply->self; } SERVER_END_REQ; - if (ret == STATUS_PENDING) - { - for (i = 0; i < 100; i++) - { - SERVER_START_REQ( set_thread_context ) - { - req->handle = wine_server_obj_handle( handle ); - req->suspend = 0; - wine_server_add_data( req, context, sizeof(*context) ); - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (ret == STATUS_PENDING) - { - LARGE_INTEGER timeout; - timeout.QuadPart = -10000; - NtDelayExecution( FALSE, &timeout ); - } - else break; - } - NtResumeThread( handle, &dummy ); - if (ret == STATUS_PENDING) ret = STATUS_ACCESS_DENIED; - } - return ret; } diff --git a/server/thread.c b/server/thread.c index 07be868d48..de508c6ace 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1859,35 +1859,21 @@ DECL_HANDLER(set_thread_context) if (!(thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT ))) return; reply->self = (thread == current); - if (thread != current && (!thread->context || thread->context->status == STATUS_PENDING)) - { - /* thread is not suspended, retry (if it's still running) */ - if (thread->state == RUNNING) - { - set_error( STATUS_PENDING ); - if (req->suspend) - { - release_object( thread ); - /* make sure we have suspend access */ - if (!(thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME ))) return; - suspend_thread( thread ); - } - } - else set_error( STATUS_UNSUCCESSFUL ); - } - else if (context->cpu == thread->process->cpu) + if (thread->state == TERMINATED) set_error( STATUS_UNSUCCESSFUL ); + else if (context->cpu != thread->process->cpu) set_error( STATUS_INVALID_PARAMETER ); + else { unsigned int system_flags = get_context_system_regs(context->cpu) & context->flags; unsigned int client_flags = context->flags & ~system_flags; if (system_flags) set_thread_context( thread, context, system_flags ); + if (thread != current && !get_error()) stop_thread( thread ); if (thread->context && !get_error()) { copy_context( &thread->context->regs, context, context->flags ); thread->context->regs.flags |= client_flags; } } - else set_error( STATUS_INVALID_PARAMETER ); release_object( thread ); }

1 0

Henri Verbeet : wined3d: Use the bo binding in wined3d_context_gl_map_bo_address().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 7d43577d89e3be02372c472c95ad42d35bc456f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d43577d89e3be02372c472c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 18:00:42 2020 +0430 wined3d: Use the bo binding in wined3d_context_gl_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 +------- dlls/wined3d/context_gl.c | 14 +++++++------- dlls/wined3d/texture.c | 6 ++---- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index ec8a2cadd2..f2cbb06860 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4629,13 +4629,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) static void *adapter_gl_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { - struct wined3d_context_gl *context_gl; - GLenum binding; - - context_gl = wined3d_context_gl(context); - binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, bind_flags); - - return wined3d_context_gl_map_bo_address(context_gl, data, size, binding, map_flags); + return wined3d_context_gl_map_bo_address(wined3d_context_gl(context), data, size, map_flags); } static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 4e0af7474c..2bb11c3068 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2525,7 +2525,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen } void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) + const struct wined3d_bo_address *data, size_t size, uint32_t flags) { const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *bo; @@ -2535,20 +2535,20 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return data->addr; gl_info = context_gl->gl_info; - wined3d_context_gl_bind_bo(context_gl, binding, bo->id); + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - memory = GL_EXTCALL(glMapBufferRange(binding, (INT_PTR)data->addr, + memory = GL_EXTCALL(glMapBufferRange(bo->binding, (INT_PTR)data->addr, size, wined3d_resource_gl_map_flags(flags))); } else { - memory = GL_EXTCALL(glMapBuffer(binding, wined3d_resource_gl_legacy_map_flags(flags))); + memory = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); memory += (INT_PTR)data->addr; } - wined3d_context_gl_bind_bo(context_gl, binding, 0); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Map buffer object"); return memory; @@ -2604,8 +2604,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } else { - src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, src_bo->binding, WINED3D_MAP_READ); - dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, dst_bo->binding, WINED3D_MAP_WRITE); + src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, WINED3D_MAP_READ); + dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, WINED3D_MAP_WRITE); memcpy(dst_ptr, src_ptr, size); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d075ccc9cd..e549a41309 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2160,8 +2160,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, return; } - src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, - src_slice_pitch * update_d, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, src_slice_pitch * update_d, WINED3D_MAP_READ); for (z = 0; z < update_d; ++z, src_mem += src_slice_pitch) { @@ -2811,8 +2810,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch); - src_mem = wined3d_context_gl_map_bo_address(context_gl, &data, - src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_mem = wined3d_context_gl_map_bo_address(context_gl, &data, src_slice_pitch, WINED3D_MAP_READ); if (!(dst_mem = heap_alloc(dst_slice_pitch))) { ERR("Out of memory (%u).\n", dst_slice_pitch); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5f0b1eee7f..f835432b68 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2200,7 +2200,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_bo_address *data, size_t size, uint32_t flags) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;

1 0

Jacek Caban : server: Block by waiting on context handle in get_thread_context.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: c4dab9b76eb7397f6e5325ff4bdf792cf500e571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4dab9b76eb7397f6e5325ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 14:33:23 2020 +0200 server: Block by waiting on context handle in get_thread_context. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48052 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45546 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 35 ++++++++----------- include/wine/server_protocol.h | 8 ++--- server/protocol.def | 5 ++- server/request.h | 5 ++- server/thread.c | 78 +++++++++++++++++++++++++++++------------- server/trace.c | 3 +- 6 files changed, 77 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4dab9b76eb7397f6e53…

1 0

Henri Verbeet : wined3d: Use the bo binding in wined3d_context_gl_unmap_bo_address().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: b29ea85885ba7f48b1df42219378101c9fc1707b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b29ea85885ba7f48b1df4221… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 18:00:43 2020 +0430 wined3d: Use the bo binding in wined3d_context_gl_unmap_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 +------- dlls/wined3d/context_gl.c | 17 +++++++++-------- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f2cbb06860..9040fad8a9 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4635,13 +4635,7 @@ static void *adapter_gl_map_bo_address(struct wined3d_context *context, static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges) { - struct wined3d_context_gl *context_gl; - GLenum binding; - - context_gl = wined3d_context_gl(context); - binding = wined3d_buffer_gl_binding_from_bind_flags(context_gl->gl_info, bind_flags); - - wined3d_context_gl_unmap_bo_address(context_gl, data, binding, range_count, ranges); + wined3d_context_gl_unmap_bo_address(wined3d_context_gl(context), data, range_count, ranges); } static void adapter_gl_copy_bo_address(struct wined3d_context *context, diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2bb11c3068..a1aa3c0bb9 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2554,8 +2554,8 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return memory; } -void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, - GLenum binding, unsigned int range_count, const struct wined3d_range *ranges) +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, + const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges) { const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *bo; @@ -2565,18 +2565,19 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, return; gl_info = context_gl->gl_info; - wined3d_context_gl_bind_bo(context_gl, binding, bo->id); + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { for (i = 0; i < range_count; ++i) { - GL_EXTCALL(glFlushMappedBufferRange(binding, (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); + GL_EXTCALL(glFlushMappedBufferRange(bo->binding, + (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); } } - GL_EXTCALL(glUnmapBuffer(binding)); - wined3d_context_gl_bind_bo(context_gl, binding, 0); + GL_EXTCALL(glUnmapBuffer(bo->binding)); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Unmap buffer object"); } @@ -2611,8 +2612,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, range.offset = 0; range.size = size; - wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_bo->binding, 1, &range); - wined3d_context_gl_unmap_bo_address(context_gl, src, src_bo->binding, 0, NULL); + wined3d_context_gl_unmap_bo_address(context_gl, dst, 1, &range); + wined3d_context_gl_unmap_bo_address(context_gl, src, 0, NULL); } } else if (!dst_bo && src_bo) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e549a41309..7f31733547 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2178,7 +2178,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); } - wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER, 0, NULL); + wined3d_context_gl_unmap_bo_address(context_gl, &bo, 0, NULL); heap_free(converted_mem); } else @@ -2820,7 +2820,7 @@ static BOOL wined3d_texture_gl_load_texture(struct wined3d_texture_gl *texture_g width, height, &texture_gl->t.async.gl_color_key); src_row_pitch = dst_row_pitch; src_slice_pitch = dst_slice_pitch; - wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER, 0, NULL); + wined3d_context_gl_unmap_bo_address(context_gl, &data, 0, NULL); data.buffer_object = 0; data.addr = dst_mem; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f835432b68..6a6b26a6ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2209,7 +2209,7 @@ void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, - GLenum binding, unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN; + unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN; void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Derive the access mask from the bo usage in adapter_vk_map_bo_address().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 5e5db31cd9f5672690eee3e13957a17139caf323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e5db31cd9f5672690eee3e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 18:00:44 2020 +0430 wined3d: Derive the access mask from the bo usage in adapter_vk_map_bo_address(). Instead of from the bind flags. This allows us to get rid of the bind flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8a6bc2b01c..938f61cf8c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -613,6 +613,26 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); } +static VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) +{ + VkAccessFlags flags = 0; + + if (usage & VK_BUFFER_USAGE_VERTEX_BUFFER_BIT) + flags |= VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT; + if (usage & VK_BUFFER_USAGE_INDEX_BUFFER_BIT) + flags |= VK_ACCESS_INDEX_READ_BIT; + if (usage & VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT) + flags |= VK_ACCESS_UNIFORM_READ_BIT; + if (usage & VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT) + flags |= VK_ACCESS_SHADER_READ_BIT; + if (usage & VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT) + flags |= VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT; + if (usage & VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT) + flags |= VK_ACCESS_INDIRECT_COMMAND_READ_BIT; + + return flags; +} + static void *adapter_vk_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { @@ -644,7 +664,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier.pNext = NULL; - vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(bind_flags); + vk_barrier.srcAccessMask = vk_access_mask_from_buffer_usage(bo->usage); vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;

1 0

Henri Verbeet : wined3d: Drop the "bind_flags" parameter to wined3d_adapter_ops.adapter_unmap_bo_address().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: cef12f97d699a006d5806f94f80fcd1628f438a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef12f97d699a006d5806f94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 18:00:45 2020 +0430 wined3d: Drop the "bind_flags" parameter to wined3d_adapter_ops.adapter_unmap_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/adapter_vk.c | 8 ++++---- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 7 +++---- 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 9040fad8a9..e45ba3fa3f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4632,8 +4632,8 @@ static void *adapter_gl_map_bo_address(struct wined3d_context *context, return wined3d_context_gl_map_bo_address(wined3d_context_gl(context), data, size, map_flags); } -static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, - uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges) +static void adapter_gl_unmap_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges) { wined3d_context_gl_unmap_bo_address(wined3d_context_gl(context), data, range_count, ranges); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 938f61cf8c..1418c1c541 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -701,8 +701,8 @@ map: return (uint8_t *)map_ptr + bo->memory_offset + (uintptr_t)data->addr; } -static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, - uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges) +static void adapter_vk_unmap_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges) { struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_vk_info *vk_info; @@ -849,8 +849,8 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, range.offset = 0; range.size = size; - adapter_vk_unmap_bo_address(context, dst, dst_bind_flags, 1, &range); - adapter_vk_unmap_bo_address(context, src, src_bind_flags, 0, NULL); + adapter_vk_unmap_bo_address(context, dst, 1, &range); + adapter_vk_unmap_bo_address(context, src, 0, NULL); } static HRESULT adapter_vk_create_swapchain(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a9d9d8fb71..402a42af67 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1087,7 +1087,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc { WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); - wined3d_context_unmap_bo_address(context, &addr, resource->bind_flags, 0, NULL); + wined3d_context_unmap_bo_address(context, &addr, 0, NULL); buffer->map_ptr = NULL; if (resource->usage & WINED3DUSAGE_DYNAMIC) @@ -1180,7 +1180,7 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou addr.buffer_object = buffer->buffer_object; addr.addr = 0; - wined3d_context_unmap_bo_address(context, &addr, resource->bind_flags, range_count, buffer->maps); + wined3d_context_unmap_bo_address(context, &addr, range_count, buffer->maps); context_release(context); @@ -1672,7 +1672,7 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc memcpy((uint8_t *)map_ptr + range->offset, (uint8_t *)data + range->offset - data_offset, range->size); } - wined3d_context_unmap_bo_address(context, &dst, resource->bind_flags, range_count, ranges); + wined3d_context_unmap_bo_address(context, &dst, range_count, ranges); } static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b65f13e775..6218aacd4a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2418,8 +2418,8 @@ static void *adapter_no3d_map_bo_address(struct wined3d_context *context, return data->addr; } -static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, - uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges) +static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, + const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges) { if (data->buffer_object) ERR("Unsupported buffer object %#lx.\n", data->buffer_object); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 366dcb9006..4f902141a1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -654,8 +654,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr range.offset = 0; range.size = dst_texture->sub_resources[0].size; wined3d_texture_invalidate_location(dst_texture, 0, ~map_binding); - wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &range); - wined3d_context_unmap_bo_address(context, &src_data, 0, 0, NULL); + wined3d_context_unmap_bo_address(context, &dst_data, 1, &range); + wined3d_context_unmap_bo_address(context, &src_data, 0, NULL); } else { @@ -2116,11 +2116,11 @@ release: } else { - wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); + wined3d_context_unmap_bo_address(context, &dst_data, 1, &dst_range); } if (!same_sub_resource) - wined3d_context_unmap_bo_address(context, &src_data, 0, 0, NULL); + wined3d_context_unmap_bo_address(context, &src_data, 0, NULL); if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) { SetRect(&dst_texture->swapchain->front_buffer_update, @@ -2254,7 +2254,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, memcpy(dst, map.data, w * h * bpp); } - wined3d_context_unmap_bo_address(context, &data, 0, 1, &range); + wined3d_context_unmap_bo_address(context, &data, 1, &range); context_release(context); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7f31733547..b7e9eec685 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -791,7 +791,7 @@ static void wined3d_texture_destroy_dc(void *object) context = context_acquire(device, NULL, 0); range.offset = 0; range.size = texture->sub_resources[sub_resource_idx].size; - wined3d_context_unmap_bo_address(context, &data, 0, 1, &range); + wined3d_context_unmap_bo_address(context, &data, 1, &range); context_release(context); } } @@ -3240,7 +3240,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); range.offset = 0; range.size = sub_resource->size; - wined3d_context_unmap_bo_address(context, &data, 0, !!(sub_resource->map_flags & WINED3D_MAP_WRITE), &range); + wined3d_context_unmap_bo_address(context, &data, !!(sub_resource->map_flags & WINED3D_MAP_WRITE), &range); context_release(context); @@ -4311,7 +4311,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, range.offset = 0; range.size = sub_resource->size; - wined3d_context_unmap_bo_address(context, &staging_bo_addr, 0, 1, &range); + wined3d_context_unmap_bo_address(context, &staging_bo_addr, 1, &range); if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) { @@ -4506,7 +4506,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, range.offset = 0; range.size = sub_resource->size; - wined3d_context_unmap_bo_address(context, &staging_bo_addr, 0, 1, &range); + wined3d_context_unmap_bo_address(context, &staging_bo_addr, 1, &range); wined3d_context_vk_destroy_bo(context_vk, &staging_bo); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a6b26a6ff..b501228376 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2966,7 +2966,7 @@ struct wined3d_adapter_ops void *(*adapter_map_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags); void (*adapter_unmap_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *data, - uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges); + unsigned int range_count, const struct wined3d_range *ranges); void (*adapter_copy_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size); @@ -5481,10 +5481,9 @@ static inline void *wined3d_context_map_bo_address(struct wined3d_context *conte } static inline void wined3d_context_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, uint32_t bind_flags, - unsigned int range_count, const struct wined3d_range *ranges) + const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges) { - context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, bind_flags, range_count, ranges); + context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, range_count, ranges); } static inline void wined3d_context_copy_bo_address(struct wined3d_context *context,

1 0

Henri Verbeet : wined3d: Drop the "bind_flags" parameter to wined3d_adapter_ops.adapter_map_bo_address().
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 32d17f1e9afd34cc432bd6fa0eef8c5731ad22c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32d17f1e9afd34cc432bd6fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 22 18:00:46 2020 +0430 wined3d: Drop the "bind_flags" parameter to wined3d_adapter_ops.adapter_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 6 +++--- dlls/wined3d/buffer.c | 6 ++---- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 12 ++++++------ dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 6 +++--- 7 files changed, 20 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32d17f1e9afd34cc432b…

1 0

Nikolay Sivov : mf: Make SAR stream request some samples on restart.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: 983a6cc4a37403020d098955a10503f972ecac2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=983a6cc4a37403020d098955… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 16:32:09 2020 +0300 mf: Make SAR stream request some samples on restart. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index d14a903eea..da1bd9b216 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -612,6 +612,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockPause(IMFClockStateSink * static HRESULT WINAPI audio_renderer_clock_sink_OnClockRestart(IMFClockStateSink *iface, MFTIME systime) { struct audio_renderer *renderer = impl_from_IMFClockStateSink(iface); + BOOL preroll = FALSE; HRESULT hr = S_OK; TRACE("%p, %s.\n", iface, debugstr_time(systime)); @@ -619,7 +620,7 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockRestart(IMFClockStateSink EnterCriticalSection(&renderer->cs); if (renderer->audio_client) { - if (renderer->state == STREAM_STATE_PAUSED) + if ((preroll = (renderer->state != STREAM_STATE_RUNNING))) { if (FAILED(hr = IAudioClient_Start(renderer->audio_client))) WARN("Failed to start audio client, hr %#x.\n", hr); @@ -630,6 +631,9 @@ static HRESULT WINAPI audio_renderer_clock_sink_OnClockRestart(IMFClockStateSink hr = MF_E_NOT_INITIALIZED; IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkStarted, &GUID_NULL, hr, NULL); + if (preroll) + audio_renderer_preroll(renderer); + LeaveCriticalSection(&renderer->cs); return hr;

1 0

Nikolay Sivov : mf: Implement IMFAudioStreamVolume for SAR stream.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: ac09b5b497e46b5df69860fa86baec8c3aa8151d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac09b5b497e46b5df69860fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 16:32:10 2020 +0300 mf: Implement IMFAudioStreamVolume for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 86 insertions(+), 17 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index da1bd9b216..83d50b7f0b 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -58,6 +58,7 @@ struct audio_renderer IMFMediaType *current_media_type; IMMDevice *device; IAudioClient *audio_client; + IAudioStreamVolume *stream_volume; HANDLE buffer_ready_event; enum stream_state state; BOOL is_shut_down; @@ -161,6 +162,16 @@ static ULONG WINAPI audio_renderer_sink_AddRef(IMFMediaSink *iface) return refcount; } +static void audio_renderer_release_audio_client(struct audio_renderer *renderer) +{ + if (renderer->audio_client) + IAudioClient_Release(renderer->audio_client); + renderer->audio_client = NULL; + if (renderer->stream_volume) + IAudioStreamVolume_Release(renderer->stream_volume); + renderer->stream_volume = NULL; +} + static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); @@ -183,8 +194,7 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) if (renderer->current_media_type) IMFMediaType_Release(renderer->current_media_type); CloseHandle(renderer->buffer_ready_event); - if (renderer->audio_client) - IAudioClient_Release(renderer->audio_client); + audio_renderer_release_audio_client(renderer); DeleteCriticalSection(&renderer->cs); heap_free(renderer); } @@ -812,38 +822,94 @@ static ULONG WINAPI audio_renderer_stream_volume_Release(IMFAudioStreamVolume *i static HRESULT WINAPI audio_renderer_stream_volume_GetChannelCount(IMFAudioStreamVolume *iface, UINT32 *count) { - FIXME("%p, %p.\n", iface, count); + struct audio_renderer *renderer = impl_from_IMFAudioStreamVolume(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, count); + + if (!count) + return E_POINTER; + + *count = 0; + + EnterCriticalSection(&renderer->cs); + if (renderer->stream_volume) + hr = IAudioStreamVolume_GetChannelCount(renderer->stream_volume, count); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_stream_volume_SetChannelVolume(IMFAudioStreamVolume *iface, UINT32 index, float level) { - FIXME("%p, %u, %f.\n", iface, index, level); + struct audio_renderer *renderer = impl_from_IMFAudioStreamVolume(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %f.\n", iface, index, level); + + EnterCriticalSection(&renderer->cs); + if (renderer->stream_volume) + hr = IAudioStreamVolume_SetChannelVolume(renderer->stream_volume, index, level); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_stream_volume_GetChannelVolume(IMFAudioStreamVolume *iface, UINT32 index, float *level) { - FIXME("%p, %u, %p.\n", iface, index, level); + struct audio_renderer *renderer = impl_from_IMFAudioStreamVolume(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, index, level); + + if (!level) + return E_POINTER; + + *level = 0.0f; + + EnterCriticalSection(&renderer->cs); + if (renderer->stream_volume) + hr = IAudioStreamVolume_GetChannelVolume(renderer->stream_volume, index, level); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_stream_volume_SetAllVolumes(IMFAudioStreamVolume *iface, UINT32 count, const float *volumes) { - FIXME("%p, %u, %p.\n", iface, count, volumes); + struct audio_renderer *renderer = impl_from_IMFAudioStreamVolume(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, count, volumes); + + EnterCriticalSection(&renderer->cs); + if (renderer->stream_volume) + hr = IAudioStreamVolume_SetAllVolumes(renderer->stream_volume, count, volumes); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_stream_volume_GetAllVolumes(IMFAudioStreamVolume *iface, UINT32 count, float *volumes) { - FIXME("%p, %u, %p.\n", iface, count, volumes); + struct audio_renderer *renderer = impl_from_IMFAudioStreamVolume(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, count, volumes); + + if (!volumes) + return E_POINTER; + + if (count) + memset(volumes, 0, sizeof(*volumes) * count); + + EnterCriticalSection(&renderer->cs); + if (renderer->stream_volume) + hr = IAudioStreamVolume_GetAllVolumes(renderer->stream_volume, count, volumes); + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMFAudioStreamVolumeVtbl audio_renderer_stream_volume_vtbl = @@ -1229,11 +1295,7 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere WAVEFORMATEX *wfx; HRESULT hr; - if (renderer->audio_client) - { - IAudioClient_Release(renderer->audio_client); - renderer->audio_client = NULL; - } + audio_renderer_release_audio_client(renderer); hr = IMMDevice_Activate(renderer->device, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void **)&renderer->audio_client); @@ -1261,6 +1323,13 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere return hr; } + if (FAILED(hr = IAudioClient_GetService(renderer->audio_client, &IID_IAudioStreamVolume, + (void **)&renderer->stream_volume))) + { + WARN("Failed to get stream volume control, hr %#x.\n", hr); + return hr; + } + if (FAILED(hr = IAudioClient_SetEventHandle(renderer->audio_client, renderer->buffer_ready_event))) { WARN("Failed to set event handle, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf: Implement IMFSimpleAudioVolume for SAR stream.
by Alexandre Julliard 22 Apr '20

22 Apr '20

Module: wine Branch: master Commit: f7bd81439e7a69f5af5864809a0779c7a633366d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7bd81439e7a69f5af586480… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 16:32:11 2020 +0300 mf: Implement IMFSimpleAudioVolume for SAR stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++------- dlls/mf/tests/mf.c | 25 +++++++++++++++++--- 2 files changed, 82 insertions(+), 11 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 83d50b7f0b..86a0c2f36e 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -59,6 +59,7 @@ struct audio_renderer IMMDevice *device; IAudioClient *audio_client; IAudioStreamVolume *stream_volume; + ISimpleAudioVolume *audio_volume; HANDLE buffer_ready_event; enum stream_state state; BOOL is_shut_down; @@ -170,6 +171,9 @@ static void audio_renderer_release_audio_client(struct audio_renderer *renderer) if (renderer->stream_volume) IAudioStreamVolume_Release(renderer->stream_volume); renderer->stream_volume = NULL; + if (renderer->audio_volume) + ISimpleAudioVolume_Release(renderer->audio_volume); + renderer->audio_volume = NULL; } static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) @@ -754,30 +758,72 @@ static ULONG WINAPI audio_renderer_simple_volume_Release(IMFSimpleAudioVolume *i static HRESULT WINAPI audio_renderer_simple_volume_SetMasterVolume(IMFSimpleAudioVolume *iface, float level) { - FIXME("%p, %f.\n", iface, level); + struct audio_renderer *renderer = impl_from_IMFSimpleAudioVolume(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, level); + + EnterCriticalSection(&renderer->cs); + if (renderer->audio_volume) + hr = ISimpleAudioVolume_SetMasterVolume(renderer->audio_volume, level, NULL); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_simple_volume_GetMasterVolume(IMFSimpleAudioVolume *iface, float *level) { - FIXME("%p, %p.\n", iface, level); + struct audio_renderer *renderer = impl_from_IMFSimpleAudioVolume(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, level); + + if (!level) + return E_POINTER; + + *level = 0.0f; + + EnterCriticalSection(&renderer->cs); + if (renderer->audio_volume) + hr = ISimpleAudioVolume_GetMasterVolume(renderer->audio_volume, level); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_simple_volume_SetMute(IMFSimpleAudioVolume *iface, BOOL mute) { - FIXME("%p, %d.\n", iface, mute); + struct audio_renderer *renderer = impl_from_IMFSimpleAudioVolume(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, mute); + + EnterCriticalSection(&renderer->cs); + if (renderer->audio_volume) + hr = ISimpleAudioVolume_SetMute(renderer->audio_volume, mute, NULL); + LeaveCriticalSection(&renderer->cs); + + return hr; } static HRESULT WINAPI audio_renderer_simple_volume_GetMute(IMFSimpleAudioVolume *iface, BOOL *mute) { - FIXME("%p, %p.\n", iface, mute); + struct audio_renderer *renderer = impl_from_IMFSimpleAudioVolume(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, mute); + + if (!mute) + return E_POINTER; + + *mute = FALSE; + + EnterCriticalSection(&renderer->cs); + if (renderer->audio_volume) + hr = ISimpleAudioVolume_GetMute(renderer->audio_volume, mute); + LeaveCriticalSection(&renderer->cs); + + return hr; } static const IMFSimpleAudioVolumeVtbl audio_renderer_simple_volume_vtbl = @@ -1330,6 +1376,12 @@ static HRESULT audio_renderer_create_audio_client(struct audio_renderer *rendere return hr; } + if (FAILED(hr = IAudioClient_GetService(renderer->audio_client, &IID_ISimpleAudioVolume, (void **)&renderer->audio_volume))) + { + WARN("Failed to get audio volume control, hr %#x.\n", hr); + return hr; + } + if (FAILED(hr = IAudioClient_SetEventHandle(renderer->audio_client, renderer->buffer_ready_event))) { WARN("Failed to set event handle, hr %#x.\n", hr); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 675bc0a443..62e70954f0 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2726,6 +2726,7 @@ static void test_sar(void) IMFMediaTypeHandler *handler, *handler2; IMFPresentationTimeSource *time_source; IMFSimpleAudioVolume *simple_volume; + IMFAudioStreamVolume *stream_volume; IMFClockStateSink *state_sink; IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; @@ -2817,6 +2818,15 @@ if (SUCCEEDED(hr)) hr = IMFClockStateSink_OnClockStart(state_sink, 0, 0); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + hr = IMFClockStateSink_OnClockPause(state_sink, 0); + ok(hr == MF_E_INVALID_STATE_TRANSITION, "Unexpected hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStop(state_sink, 0); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockRestart(state_sink, 0); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + IMFClockStateSink_Release(state_sink); hr = IMFMediaSink_SetPresentationClock(sink, NULL); @@ -2979,6 +2989,9 @@ todo_wine hr = IMFClockStateSink_OnClockRestart(state_sink, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFClockStateSink_OnClockStop(state_sink, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFClockStateSink_Release(state_sink); IMFStreamSink_Release(stream_sink); @@ -2988,14 +3001,20 @@ todo_wine ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); hr = IMFSimpleAudioVolume_GetMute(simple_volume, &mute); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFSimpleAudioVolume_Release(simple_volume); - hr = MFGetService((IUnknown *)sink, &MR_STREAM_VOLUME_SERVICE, &IID_IMFAudioStreamVolume, (void **)&unk); + hr = MFGetService((IUnknown *)sink, &MR_STREAM_VOLUME_SERVICE, &IID_IMFAudioStreamVolume, (void **)&stream_volume); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IUnknown_Release(unk); + + hr = IMFAudioStreamVolume_GetChannelCount(stream_volume, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFAudioStreamVolume_GetChannelCount(stream_volume, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + IMFAudioStreamVolume_Release(stream_volume); hr = MFGetService((IUnknown *)sink, &MR_AUDIO_POLICY_SERVICE, &IID_IMFAudioPolicy, (void **)&unk); todo_wine

1 0