June 2021 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Implement OpenGL image UAV clears using ARB_clear_texture.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 126f0e6ed3119fdeb71b87ac7e3ab22a589dbd0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=126f0e6ed3119fdeb71b87ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 7 16:55:09 2021 +0200 wined3d: Implement OpenGL image UAV clears using ARB_clear_texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 24 +++++------ dlls/wined3d/utils.c | 12 ++++++ dlls/wined3d/view.c | 95 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 110 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=126f0e6ed3119fdeb71b…

1 0

Henri Verbeet : d3d11: Implement d3d11_device_context_ClearUnorderedAccessViewFloat().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 81fc2e6ab63def4af022db161455c3f16c3b9e3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=81fc2e6ab63def4af022db16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 7 16:55:10 2021 +0200 d3d11: Implement d3d11_device_context_ClearUnorderedAccessViewFloat(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 11 ++++++++++- dlls/d3d11/tests/d3d11.c | 26 +++++++++++--------------- dlls/wined3d/adapter_gl.c | 6 +++--- dlls/wined3d/adapter_vk.c | 6 +++--- dlls/wined3d/cs.c | 8 +++++--- dlls/wined3d/device.c | 16 +++++++++++++++- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/view.c | 18 ++++++++++++------ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 14 +++++++------- include/wine/wined3d.h | 2 ++ 11 files changed, 71 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81fc2e6ab63def4af022…

1 0

Henri Verbeet : wined3d: Use the texture level count to calculate sub-resource indices for OpenGL mip-map generation.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 27845d2fbdcf54adc6362880e0e8fe316da34ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27845d2fbdcf54adc6362880… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 7 16:55:11 2021 +0200 wined3d: Use the texture level count to calculate sub-resource indices for OpenGL mip-map generation. Instead of the view's level count, which may be different. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cda16b690f8..f9ba8430d08 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1197,7 +1197,7 @@ static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resou void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) { - unsigned int i, j, layer_count, level_count, base_level, base_layer; + unsigned int i, j, layer_count, level_count, base_level, base_layer, sub_resource_idx; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_gl *texture_gl; struct gl_texture *gl_tex; @@ -1216,8 +1216,8 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) { - if (!wined3d_texture_load_location(&texture_gl->t, - (base_layer + i) * level_count + base_level, &context_gl->c, location)) + sub_resource_idx = (base_layer + i) * texture_gl->t.level_count + base_level; + if (!wined3d_texture_load_location(&texture_gl->t, sub_resource_idx, &context_gl->c, location)) ERR("Failed to load source layer %u.\n", base_layer + i); } @@ -1249,10 +1249,9 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou { for (j = 1; j < level_count; ++j) { - wined3d_texture_validate_location(&texture_gl->t, - (base_layer + i) * level_count + base_level + j, location); - wined3d_texture_invalidate_location(&texture_gl->t, - (base_layer + i) * level_count + base_level + j, ~location); + sub_resource_idx = (base_layer + i) * texture_gl->t.level_count + base_level + j; + wined3d_texture_validate_location(&texture_gl->t, sub_resource_idx, location); + wined3d_texture_invalidate_location(&texture_gl->t, sub_resource_idx, ~location); } }

1 0

Henri Verbeet : wined3d: Use the texture level count to calculate sub-resource indices for Vulkan mip-map generation.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: b6ca5e50a64eb853f3aa18ebdaf413f731dcc210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ca5e50a64eb853f3aa18eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 7 16:55:12 2021 +0200 wined3d: Use the texture level count to calculate sub-resource indices for Vulkan mip-map generation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f9ba8430d08..91d26c05fae 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1266,7 +1266,7 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resource_view_vk *srv_vk, struct wined3d_context_vk *context_vk) { - unsigned int i, j, layer_count, level_count, base_level, base_layer; + unsigned int i, j, layer_count, level_count, base_level, base_layer, sub_resource_idx; const struct wined3d_vk_info *vk_info = context_vk->vk_info; VkImageSubresourceRange vk_src_range, vk_dst_range; struct wined3d_texture_vk *texture_vk; @@ -1283,8 +1283,9 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou texture_vk = wined3d_texture_vk(texture_from_resource(srv_vk->v.resource)); for (i = 0; i < layer_count; ++i) { - if (!wined3d_texture_load_location(&texture_vk->t, - (base_layer + i) * level_count + base_level, &context_vk->c, WINED3D_LOCATION_TEXTURE_RGB)) + sub_resource_idx = (base_layer + i) * texture_vk->t.level_count + base_level; + if (!wined3d_texture_load_location(&texture_vk->t, sub_resource_idx, + &context_vk->c, WINED3D_LOCATION_TEXTURE_RGB)) ERR("Failed to load source layer %u.\n", base_layer + i); } @@ -1393,10 +1394,9 @@ void wined3d_shader_resource_view_vk_generate_mipmap(struct wined3d_shader_resou { for (j = 1; j < level_count; ++j) { - wined3d_texture_validate_location(&texture_vk->t, - (base_layer + i) * level_count + base_level + j, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(&texture_vk->t, - (base_layer + i) * level_count + base_level + j, ~WINED3D_LOCATION_TEXTURE_RGB); + sub_resource_idx = (base_layer + i) * texture_vk->t.level_count + base_level + j; + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(&texture_vk->t, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } }

1 0

Nikolay Sivov : dxva2: Accept AYUV as input format.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 0070a00cc1e6d5af0a65e8916ac0be36ea2c79c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0070a00cc1e6d5af0a65e891… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 7 19:34:15 2021 +0300 dxva2: Accept AYUV as input format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 12 +++++++++--- dlls/dxva2/tests/dxva2.c | 11 +++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 8952de17b1e..4eefffd6052 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -377,6 +377,14 @@ static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSof return E_NOTIMPL; } +static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) +{ + return video_desc->Format == D3DFMT_A8R8G8B8 || + video_desc->Format == D3DFMT_X8R8G8B8 || + video_desc->Format == D3DFMT_YUY2 || + video_desc->Format == MAKEFOURCC('A','Y','U','V'); +} + static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( IDirectXVideoProcessorService *iface, const DXVA2_VideoDesc *video_desc, UINT *count, GUID **guids) { @@ -399,9 +407,7 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) { - if (!(video_desc->Format == D3DFMT_A8R8G8B8 || - video_desc->Format == D3DFMT_X8R8G8B8 || - video_desc->Format == D3DFMT_YUY2)) + if (!dxva_is_supported_stream_format(video_desc)) { WARN("Unsupported content format %#x.\n", video_desc->Format); return E_FAIL; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 1de1712d163..f785b2ce147 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -111,6 +111,7 @@ static void test_device_manager(void) D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, + MAKEFOURCC('A','Y','U','V'), }; static const D3DFORMAT rt_unsupported_formats[] = { @@ -353,6 +354,12 @@ static void test_device_manager(void) { init_video_desc(&video_desc, rt_formats[i]); + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count > 0, "Unexpected device count.\n"); + CoTaskMemFree(guids); + count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); @@ -371,6 +378,10 @@ static void test_device_manager(void) hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); + + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + todo_wine + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); } IDirectXVideoProcessorService_Release(proc_service);

1 0

Nikolay Sivov : dxva2: Check input stream format in GetVideoProcessorDeviceGuids().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: b7c48c898cf732f8f22d288c535323cbc8aa1b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7c48c898cf732f8f22d288c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 7 19:34:16 2021 +0300 dxva2: Check input stream format in GetVideoProcessorDeviceGuids(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 5 +++++ dlls/dxva2/tests/dxva2.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 4eefffd6052..f91b033055c 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -390,6 +390,11 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGu { FIXME("%p, %p, %p, %p semi-stub.\n", iface, video_desc, count, guids); + *count = 0; + + if (!dxva_is_supported_stream_format(video_desc)) + return E_FAIL; + if (!(*guids = CoTaskMemAlloc(sizeof(**guids)))) return E_OUTOFMEMORY; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index f785b2ce147..80749b81f12 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -380,7 +380,6 @@ static void test_device_manager(void) ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); - todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); }

1 0

Akihiro Sagawa : quartz/tests: Introduce commit_allocator helper in vmr7.c.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: ae41ce2d9359a1c3051eb1e10ca3ddfbb534c3e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae41ce2d9359a1c3051eb1e1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 2 23:07:53 2021 +0900 quartz/tests: Introduce commit_allocator helper in vmr7.c. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 02b5a626d74..5a2c33f6145 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1021,6 +1021,18 @@ static HRESULT join_thread_(int line, HANDLE thread) } #define join_thread(a) join_thread_(__LINE__, a) +static void commit_allocator(IMemInputPin *input) +{ + IMemAllocator *allocator; + HRESULT hr; + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(allocator); +} + static void test_filter_state(IMemInputPin *input, IMediaControl *control) { IMemAllocator *allocator; @@ -1130,9 +1142,7 @@ static void test_filter_state(IMemInputPin *input, IMediaControl *control) hr = IMediaControl_GetState(control, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IMemAllocator_Commit(allocator); - ok(hr == S_OK, "Got hr %#x.\n", hr); - + commit_allocator(input); hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -1163,17 +1173,11 @@ static void test_filter_state(IMemInputPin *input, IMediaControl *control) static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control) { - IMemAllocator *allocator; OAFilterState state; HANDLE thread; HRESULT hr; - hr = IMemInputPin_GetAllocator(input, &allocator); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IMemAllocator_Commit(allocator); - ok(hr == S_OK, "Got hr %#x.\n", hr); - IMemAllocator_Release(allocator); - + commit_allocator(input); hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -1239,7 +1243,6 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, const BITMAPINFOHEADER *bih = (BITMAPINFOHEADER *)buffer; const DWORD *data = (DWORD *)((char *)buffer + sizeof(BITMAPINFOHEADER)); BITMAPINFOHEADER expect_bih = *req_bih; - IMemAllocator *allocator; OAFilterState state; IBasicVideo *video; unsigned int i; @@ -1272,12 +1275,7 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); /* The contents seem to reflect the last frame rendered. */ - hr = IMemInputPin_GetAllocator(input, &allocator); - ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IMemAllocator_Commit(allocator); - ok(hr == S_OK, "Got hr %#x.\n", hr); - IMemAllocator_Release(allocator); - + commit_allocator(input); hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr);

1 0

Akihiro Sagawa : quartz/tests: Test the close button of the video window.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: b0458a318f20eb9fa2b187e28451a9579170d746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0458a318f20eb9fa2b187e2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 2 23:07:56 2021 +0900 quartz/tests: Test the close button of the video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 98 +++++++++++++++++++++++++++++++++-- dlls/quartz/tests/vmr7.c | 105 ++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 100 ++++++++++++++++++++++++++++++++++-- 3 files changed, 295 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0458a318f20eb9fa2b1…

1 0

Akihiro Sagawa : quartz: Hide video window on WM_CLOSE.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 567f930583db7e6fba8eb03faa94dea615c73a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=567f930583db7e6fba8eb03f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 2 23:07:58 2021 +0900 quartz: Hide video window on WM_CLOSE. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/window.c | 10 +++++++++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 0df8c9fa738..c1a2e882dc9 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1346,7 +1346,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con ret = check_ec_userabort(eventsrc, 0); todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); - todo_wine ok(IsWindow(hwnd), "Window should exist.\n"); + ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); thread = send_frame(input); @@ -1385,7 +1385,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con ret = check_ec_userabort(eventsrc, 0); todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); - todo_wine ok(IsWindow(hwnd), "Window should exist.\n"); + ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); hr = IMediaControl_Stop(control); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 4673601a40b..b8af2163099 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1377,7 +1377,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con ret = check_ec_userabort(eventsrc, 0); todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); - todo_wine ok(IsWindow(hwnd), "Window should exist.\n"); + ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); thread = send_frame(input); @@ -1417,7 +1417,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con ret = check_ec_userabort(eventsrc, 0); todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); - todo_wine ok(IsWindow(hwnd), "Window should exist.\n"); + ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); hr = IMediaControl_Stop(control); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 6c863a15a29..3f6982dfb5a 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1582,7 +1582,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con ret = check_ec_userabort(eventsrc, 0); todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); - todo_wine ok(IsWindow(hwnd), "Window should exist.\n"); + ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); thread = send_frame(input); @@ -1622,7 +1622,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con ret = check_ec_userabort(eventsrc, 0); todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); - todo_wine ok(IsWindow(hwnd), "Window should exist.\n"); + ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); hr = IMediaControl_Stop(control); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 3983d43b08f..94210e043c7 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -20,6 +20,8 @@ #include "quartz_private.h" +#define WM_QUARTZ_DESTROY (WM_USER + WM_DESTROY) + WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR class_name[] = L"wine_quartz_window"; @@ -71,6 +73,12 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM if (window->default_dst) GetClientRect(window->hwnd, &window->dst); break; + case WM_QUARTZ_DESTROY: + DestroyWindow(hwnd); + return 0; + case WM_CLOSE: + IVideoWindow_put_Visible(&window->IVideoWindow_iface, OAFALSE); + return 0; } return DefWindowProcW(hwnd, message, wparam, lparam); @@ -1251,7 +1259,7 @@ void video_window_cleanup(struct video_window *window) * it would become top-level for a brief period before being destroyed. */ SetWindowLongW(window->hwnd, GWL_STYLE, GetWindowLongW(window->hwnd, GWL_STYLE) & ~WS_CHILD); - SendMessageW(window->hwnd, WM_CLOSE, 0, 0); + SendMessageW(window->hwnd, WM_QUARTZ_DESTROY, 0, 0); window->hwnd = NULL; } }

1 0

Akihiro Sagawa : quartz: Notify EC_USERABORT event when closing video window.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 1b107ec03ea423f430d2eeb6eecc1f08b0d7ac56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b107ec03ea423f430d2eeb6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 2 23:08:00 2021 +0900 quartz: Notify EC_USERABORT event when closing video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/window.c | 11 +++++++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c1a2e882dc9..8d0003cf12e 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1344,7 +1344,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con hr = IMediaControl_GetState(control, 1000, &state); ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); @@ -1383,7 +1383,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con SendMessageW(hwnd, WM_CLOSE, 0, 0); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index b8af2163099..688770a8501 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1375,7 +1375,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con hr = IMediaControl_GetState(control, 1000, &state); ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); @@ -1415,7 +1415,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con SendMessageW(hwnd, WM_CLOSE, 0, 0); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 3f6982dfb5a..154b6a6b99e 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1580,7 +1580,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con hr = IMediaControl_GetState(control, 1000, &state); ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); @@ -1620,7 +1620,7 @@ static void test_window_close(IPin *pin, IMemInputPin *input, IMediaControl *con SendMessageW(hwnd, WM_CLOSE, 0, 0); ret = check_ec_userabort(eventsrc, 0); - todo_wine ok(ret == 1, "Expected EC_USERABORT.\n"); + ok(ret == 1, "Expected EC_USERABORT.\n"); ok(IsWindow(hwnd), "Window should exist.\n"); ok(!IsWindowVisible(hwnd), "Window should be visible.\n"); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 94210e043c7..5b172d5f108 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -77,9 +77,20 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM DestroyWindow(hwnd); return 0; case WM_CLOSE: + { + IFilterGraph *graph = window->pFilter->graph; + IMediaEventSink *event_sink; IVideoWindow_put_Visible(&window->IVideoWindow_iface, OAFALSE); + if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, + &IID_IMediaEventSink, + (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_USERABORT, 0, 0); + IMediaEventSink_Release(event_sink); + } return 0; } + } return DefWindowProcW(hwnd, message, wparam, lparam); }

1 0