March 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz/tests: Add a test WAVE file.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: dc8cb0c370ea24ca68b8ed8b27679250f628c7ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc8cb0c370ea24ca68b8ed8b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 3 20:11:48 2019 -0600 quartz/tests: Add a test WAVE file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 ++ dlls/quartz/tests/rsrc.rc | 4 ++++ dlls/quartz/tests/test.wav | Bin 0 -> 4488 bytes 3 files changed, 6 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 88d964c..f0e4b58 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -42,6 +42,7 @@ typedef struct TestFilterImpl static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; +static const WCHAR wavefile[] = {'t','e','s','t','.','w','a','v',0}; static WCHAR *load_resource(const WCHAR *name) { @@ -3215,6 +3216,7 @@ START_TEST(filtergraph) test_render_run(avifile, FALSE, TRUE); test_render_run(mpegfile, TRUE, TRUE); test_render_run(mp3file, TRUE, FALSE); + test_render_run(wavefile, TRUE, FALSE); test_enum_filters(); test_graph_builder_render(); test_graph_builder_connect(); diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index 282cb1f..660ad47 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -31,3 +31,7 @@ test.mpg RCDATA "test.mpg" /* ffmpeg -f lavfi -i "sine=frequency=500" -t 0.5 -ar 48000 -b:a 32k -f mp3 -acodec mp3 test.mp3 */ /* @makedep: test.mp3 */ test.mp3 RCDATA "test.mp3" + +/* ffmpeg -f lavfi -i "sine=frequency=600" -t 0.1 -ar 44100 -f wav -acodec pcm_u8 test.wav */ +/* @makedep: test.wav */ +test.wav RCDATA "test.wav" diff --git a/dlls/quartz/tests/test.wav b/dlls/quartz/tests/test.wav new file mode 100644 index 0000000..51d2393 Binary files /dev/null and b/dlls/quartz/tests/test.wav differ

1 0

Józef Kucia : d3d11: Add D3D11_FORMAT_SUPPORT_TEXTURE1D to d3d11_device_CheckFormatSupport().
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 03faca6b1f1f75ac572f09528bc5dd593c8dc8f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03faca6b1f1f75ac572f0952… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:24 2019 +0100 d3d11: Add D3D11_FORMAT_SUPPORT_TEXTURE1D to d3d11_device_CheckFormatSupport(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7ad3d9b..877775f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3302,6 +3302,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } flag_mapping[] = { + {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, D3D11_FORMAT_SUPPORT_TEXTURE3D}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, D3D11_FORMAT_SUPPORT_RENDER_TARGET},

1 0

Józef Kucia : dxgi: Introduce d3d12_swapchain_have_user_images().
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 17d577415243a740c4c1ca2a30a4e7e2c18696c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17d577415243a740c4c1ca2a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:27 2019 +0100 dxgi: Introduce d3d12_swapchain_have_user_images(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 68 ++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3c09516..f2f89b9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1067,6 +1067,11 @@ static BOOL d3d12_swapchain_is_present_mode_supported(struct d3d12_swapchain *sw return supported; } +static BOOL d3d12_swapchain_have_user_images(struct d3d12_swapchain *swapchain) +{ + return !!swapchain->vk_images[0]; +} + static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1081,7 +1086,7 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; - if (swapchain->vk_images[0]) + if (d3d12_swapchain_have_user_images(swapchain)) return S_OK; memset(&image_info, 0, sizeof(image_info)); @@ -1437,7 +1442,6 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - BOOL have_user_images; VkQueue vk_queue; unsigned int i; @@ -1455,11 +1459,9 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, B } } - have_user_images = swapchain->vk_images[0]; - for (i = 0; i < swapchain->buffer_count; ++i) { - if (swapchain->buffers[i] && (destroy_user_buffers || !have_user_images)) + if (swapchain->buffers[i] && (destroy_user_buffers || !d3d12_swapchain_have_user_images(swapchain))) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; @@ -1589,10 +1591,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s swapchain->vk_swapchain_width = width; swapchain->vk_swapchain_height = height; - if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format))) - return hr; - - return S_OK; + return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); } static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) @@ -1999,7 +1998,7 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return S_OK; } - if (!swapchain->vk_images[swapchain->current_buffer_index]) + if (!d3d12_swapchain_have_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return S_OK; @@ -2024,39 +2023,13 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha return d3d12_swapchain_acquire_next_image(swapchain); } -static VkResult d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) -{ - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkSubmitInfo submit_info; - VkResult vr; - - submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submit_info.pNext = NULL; - submit_info.waitSemaphoreCount = 0; - submit_info.pWaitSemaphores = NULL; - submit_info.pWaitDstStageMask = NULL; - submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; - submit_info.signalSemaphoreCount = 1; - submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; - - if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) - ERR("Failed to blit swapchain buffer, vr %d.\n", vr); - return vr; -} - static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkPresentInfoKHR present_info; + VkSubmitInfo submit_info; VkResult vr; - if (swapchain->vk_images[swapchain->current_buffer_index]) - { - if ((vr = d3d12_swapchain_blit_buffer(swapchain, vk_queue)) < 0) - return vr; - } - present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_info.pNext = NULL; present_info.waitSemaphoreCount = 0; @@ -2066,8 +2039,25 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pImageIndices = &swapchain->current_buffer_index; present_info.pResults = NULL; - if (swapchain->vk_semaphores[swapchain->current_buffer_index]) + if (d3d12_swapchain_have_user_images(swapchain)) { + /* blit */ + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; + submit_info.signalSemaphoreCount = 1; + submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + + if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) + { + ERR("Failed to blit swapchain buffer, vr %d.\n", vr); + return vr; + } + present_info.waitSemaphoreCount = 1; present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; } @@ -2117,7 +2107,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface { vkd3d_release_vk_queue(swapchain->command_queue); - if (!swapchain->vk_images[swapchain->current_buffer_index]) + if (!d3d12_swapchain_have_user_images(swapchain)) { FIXME("Cannot recreate swapchain without user images.\n"); return DXGI_STATUS_MODE_CHANGED;

1 0

Józef Kucia : dxgi: Factor out d3d12_swapchain_recreate_vulkan_swapchain().
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 09e7f1cba15949c6f2618a436bf46492ad09aaf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e7f1cba15949c6f2618a43… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:28 2019 +0100 dxgi: Factor out d3d12_swapchain_recreate_vulkan_swapchain(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 64 ++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f2f89b9..22feeae 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1411,7 +1411,7 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } -static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) +static VkResult d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDevice vk_device = swapchain->vk_device; @@ -1422,21 +1422,18 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vr; } if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { ERR("Failed to wait for fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vr; } if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) - { ERR("Failed to reset fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - return S_OK; + return vr; } static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain, BOOL destroy_user_buffers) @@ -1594,6 +1591,23 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format); } +static HRESULT d3d12_swapchain_recreate_vulkan_swapchain(struct d3d12_swapchain *swapchain) +{ + VkResult vr; + HRESULT hr; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + return hr; + } + + if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) + ERR("Failed to acquire Vulkan image after recreating swapchain, vr %d.\n", vr); + + return hresult_from_vk_result(vr); +} + static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) { return CONTAINING_RECORD(iface, struct d3d12_swapchain, IDXGISwapChain3_iface); @@ -1811,7 +1825,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * DXGI_SWAP_CHAIN_DESC1 *desc, new_desc; unsigned int i; ULONG refcount; - HRESULT hr; TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags); @@ -1864,13 +1877,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * d3d12_swapchain_destroy_buffers(swapchain, TRUE); swapchain->desc = new_desc; - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; - } - - return d3d12_swapchain_acquire_next_image(swapchain); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, @@ -1971,7 +1978,6 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha unsigned int sync_interval) { VkPresentModeKHR present_mode; - HRESULT hr; switch (sync_interval) { @@ -2011,16 +2017,8 @@ static HRESULT d3d12_swapchain_set_sync_interval(struct d3d12_swapchain *swapcha } d3d12_swapchain_destroy_buffers(swapchain, FALSE); - swapchain->present_mode = present_mode; - - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; - } - - return d3d12_swapchain_acquire_next_image(swapchain); + return d3d12_swapchain_recreate_vulkan_swapchain(swapchain); } static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) @@ -2116,13 +2114,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface TRACE("Recreating Vulkan swapchain.\n"); d3d12_swapchain_destroy_buffers(swapchain, FALSE); - if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) - { - ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); - return hr; - } - - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + if (FAILED(hr = d3d12_swapchain_recreate_vulkan_swapchain(swapchain))) return hr; if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) @@ -2143,7 +2135,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface return hresult_from_vk_result(vr); } - return d3d12_swapchain_acquire_next_image(swapchain); + vr = d3d12_swapchain_acquire_next_image(swapchain); + return hresult_from_vk_result(vr); } static BOOL STDMETHODCALLTYPE d3d12_swapchain_IsTemporaryMonoSupported(IDXGISwapChain3 *iface) @@ -2575,11 +2568,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->vk_fence = vk_fence; - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + if ((vr = d3d12_swapchain_acquire_next_image(swapchain)) < 0) { - WARN("Failed to acquire Vulkan image, hr %#x.\n", hr); d3d12_swapchain_destroy(swapchain); - return hr; + return hresult_from_vk_result(vr); } IWineDXGIFactory_AddRef(swapchain->factory = factory);

1 0

Józef Kucia : d3d12/tests: Use multiple command lists in test_swapchain_backbuffer_index().
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: ac676388cab860e3e5e469b823343f3b11d62d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac676388cab860e3e5e469b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:30 2019 +0100 d3d12/tests: Use multiple command lists in test_swapchain_backbuffer_index(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 271 ++++++++++++++++++++++++++++------------------- 1 file changed, 161 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac676388cab860e3e5e4…

1 0

Józef Kucia : d3d12/tests: Use multiple command lists in test_swapchain_size_mismatch().
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: a6b572008800b8ea10804fd6524550590e512bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b572008800b8ea10804fd6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 1 13:31:31 2019 +0100 d3d12/tests: Use multiple command lists in test_swapchain_size_mismatch(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 5cb9a29..16e5c4b 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -954,6 +954,7 @@ static void test_swapchain_draw(void) static void test_swapchain_size_mismatch(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + UINT64 frame_fence_value[MAX_FRAME_COUNT] = {0}; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv; struct test_context_desc desc; @@ -963,6 +964,8 @@ static void test_swapchain_size_mismatch(void) ID3D12CommandQueue *queue; unsigned int index, i; ID3D12Device *device; + ID3D12Fence *fence; + UINT64 fence_value; ULONG refcount; HWND window; HRESULT hr; @@ -1010,12 +1013,28 @@ static void test_swapchain_size_mismatch(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - swapchain = create_swapchain(&context, window, 2, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + swapchain = create_swapchain(&context, window, 4, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(context.list); ++i) + { + hr = ID3D12GraphicsCommandList_Close(context.list[i]); + ok(hr == S_OK, "Failed to close command list %u, hr %#x.\n", i, hr); + } + fence_value = 1; for (i = 0; i < 20; ++i) { index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + + hr = wait_for_fence(fence, frame_fence_value[index]); + ok(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + reset_command_list(&context, index); backbuffer = context.render_target[index]; + command_list = context.list[index]; rtv = context.rtv[index]; transition_sub_resource_state(command_list, backbuffer, 0, @@ -1030,13 +1049,21 @@ static void test_swapchain_size_mismatch(void) hr = IDXGISwapChain3_Present(swapchain, 1, 0); ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); - wait_queue_idle(device, queue); - reset_command_list(&context, 0); - if (i == 6) + { + wait_queue_idle(device, queue); MoveWindow(window, 0, 0, 100, 100, TRUE); + } + + frame_fence_value[index] = fence_value; + hr = ID3D12CommandQueue_Signal(queue, fence, fence_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ++fence_value; } + wait_queue_idle(device, queue); + + ID3D12Fence_Release(fence); destroy_render_targets(&context); refcount = IDXGISwapChain3_Release(swapchain); ok(!refcount, "Swapchain has %u references left.\n", refcount);

1 0

Michael Stefaniuc : winedump: Remove useless casts to self.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 22e74da91442cf209c793bf429aa9658e10fe41d URL: https://source.winehq.org/git/wine.git/?a=commit;h=22e74da91442cf209c793bf4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:20 2019 +0100 winedump: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/debug.c | 4 ++-- tools/winedump/msc.c | 4 ++-- tools/winedump/msmangle.c | 10 +++++----- tools/winedump/pdb.c | 4 ++-- tools/winedump/search.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 221c079..7fa5f4e 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -413,7 +413,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) if (memcmp(signature, "NB10", 4) == 0) { const CODEVIEW_PDB_DATA* pdb_data; - pdb_data = (const void *)cv_base; + pdb_data = cv_base; printf(" Filepos: 0x%08lX\n", pdb_data->filepos); printf(" TimeStamp: %08X (%s)\n", @@ -426,7 +426,7 @@ static void dump_codeview_headers(unsigned long base, unsigned long len) { const OMFSignatureRSDS* rsds_data; - rsds_data = (const void *)cv_base; + rsds_data = cv_base; printf(" Guid: %s\n", get_guid_str(&rsds_data->guid)); printf(" Age: %08X\n", rsds_data->age); printf(" Filename: %s\n", rsds_data->name); diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5890b29..5f7765f 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -91,7 +91,7 @@ static int full_numeric_leaf(struct full_value* fv, const unsigned short int* le case LF_USHORT: length += 2; - fv->v.i = *(const unsigned short*)leaf; + fv->v.i = *leaf; break; case LF_LONG: @@ -1490,7 +1490,7 @@ void codeview_dump_linetab2(const char* linetab, DWORD size, const char* strimag break; default: printf("%sblock end %x\n", pfx, lt2->header); - lt2 = (const struct codeview_linetab2*)((const char*)linetab + size); + lt2 = (const struct codeview_linetab2*)(linetab + size); continue; } lt2 = codeview_linetab2_next_block(lt2); diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 39e4f3a..f9fe75b 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -590,7 +590,7 @@ static char *demangle_datatype (char **str, compound_type *ct, if (!ct->expression) return NULL; - return (char *)(*str = iter); + return *str = iter; } @@ -629,7 +629,7 @@ static char *get_constraints_convention_1 (char **str, compound_type *ct) char *iter = *str, **retval = str; if (ct->have_qualifiers) - return (char *)*str; /* Previously got constraints for this type */ + return *str; /* Previously got constraints for this type */ if (*iter == '?' || *iter == 'A') { @@ -651,7 +651,7 @@ static char *get_constraints_convention_1 (char **str, compound_type *ct) } } - return (char *)(*retval = iter); + return *retval = iter; } @@ -666,7 +666,7 @@ static char *get_constraints_convention_2 (char **str, compound_type *ct) /* FIXME: Why do arrays have both convention 1 & 2 constraints? */ if (ct->have_qualifiers && ct->dest_type != 'Q') - return (char *)*str; /* Previously got constraints for this type */ + return *str; /* Previously got constraints for this type */ ct->have_qualifiers = TRUE; /* Even if none, we've got all we're getting */ @@ -687,7 +687,7 @@ static char *get_constraints_convention_2 (char **str, compound_type *ct) break; } - return (char *)(*retval = iter); + return *retval = iter; } diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 6fd70ce..dcfbea8 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -336,7 +336,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx for (j = cfile; j < src->nSrcFiles && j < cfile + indx[i]; j++) { /* FIXME: in some cases, it's a p_string but WHEN ? */ - if (cstr + offset[j] >= (const char*)start_cstr /* wrap around */ && + if (cstr + offset[j] >= start_cstr /* wrap around */ && cstr + offset[j] < (const char*)src + symbols->srcmodule_size) printf("\t\t\tSource file: %s\n", cstr + offset[j]); else @@ -367,7 +367,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tAge: %08u\n" "\t\tfile1: %s\n" "\t\tfile2: %s\n", - (ULONG_PTR)((const char*)imp - (const char*)first), + (ULONG_PTR)((const char*)imp - first), imp->unknown1, imp->unknown2, imp->TimeDateStamp, diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 08aa8e1..49f83ca 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -311,7 +311,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) if (arg < 0) { - sym->return_text = (char*)type_str; + sym->return_text = type_str; sym->return_type = dest_type; } else @@ -332,7 +332,7 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) sym->arg_name [arg] = str_substring (proto_str, iter); proto_str = iter; } - sym->arg_text [arg] = (char*)type_str; + sym->arg_text [arg] = type_str; } return proto_str;

1 0

Zebediah Figura : quartz/tests: Add some tests for media types.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: b01bbd847316d9bdb160c7a5216052a002427fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=b01bbd847316d9bdb160c7a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 3 20:11:46 2019 -0600 quartz/tests: Add some tests for media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/mpegsplit.c | 294 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 294 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b01bbd847316d9bdb160…

1 0

Zebediah Figura : quartz/tests: Add some tests for filter interfaces.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: 395f5271cc71f53ca8244ee76ddada7b1cbd0dc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=395f5271cc71f53ca8244ee7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 3 20:11:47 2019 -0600 quartz/tests: Add some tests for filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 3 +- dlls/quartz/tests/waveparser.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 03f1389..34a1114 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -11,7 +11,8 @@ C_SRCS = \ misc.c \ mpegsplit.c \ referenceclock.c \ - videorenderer.c + videorenderer.c \ + waveparser.c RC_SRCS = \ diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c new file mode 100644 index 0000000..3923c5d --- /dev/null +++ b/dlls/quartz/tests/waveparser.c @@ -0,0 +1,81 @@ +/* + * WAVE parser filter unit tests + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +static IBaseFilter *create_wave_parser(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_WAVEParser, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_wave_parser(); + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_Release(filter); +} + +START_TEST(waveparser) +{ + CoInitialize(NULL); + + test_interfaces(); + + CoUninitialize(); +}

1 0

Jacek Caban : jscript: Use jsstr_t as string argument type in OP_obj_prop.
by Alexandre Julliard March 4, 2019

March 4, 2019

Module: wine Branch: master Commit: e70825b0141488292b275304600b602d4e5aa8be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e70825b0141488292b275304… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 1 17:43:52 2019 +0100 jscript: Use jsstr_t as string argument type in OP_obj_prop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 39 ++++++++++++++++++++------------------- dlls/jscript/engine.c | 8 ++++++-- dlls/jscript/engine.h | 2 +- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 006386a..5c60ab0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -262,6 +262,19 @@ static HRESULT push_instr_str(compiler_ctx_t *ctx, jsop_t op, const WCHAR *arg) return S_OK; } +static HRESULT push_instr_str_uint(compiler_ctx_t *ctx, jsop_t op, jsstr_t *str, unsigned arg2) +{ + unsigned instr; + + instr = push_instr(ctx, op); + if(!instr) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->u.arg[0].str = str; + instr_ptr(ctx, instr)->u.arg[1].uint = arg2; + return S_OK; +} + static HRESULT push_instr_bstr(compiler_ctx_t *ctx, jsop_t op, const WCHAR *arg) { unsigned instr; @@ -833,26 +846,14 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) return E_FAIL; } -static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *str) +static HRESULT literal_as_string(compiler_ctx_t *ctx, literal_t *literal, jsstr_t **str) { switch(literal->type) { case LT_STRING: - *str = compiler_alloc_bstr(ctx, literal->u.wstr); + *str = compiler_alloc_string(ctx, literal->u.wstr); break; - case LT_DOUBLE: { - jsstr_t *jsstr; - HRESULT hres; - - hres = double_to_string(literal->u.dval, &jsstr); - if(FAILED(hres)) - return hres; - - *str = compiler_alloc_bstr_len(ctx, NULL, jsstr_length(jsstr)); - if(*str) - jsstr_flush(jsstr, *str); - jsstr_release(jsstr); - break; - } + case LT_DOUBLE: + return double_to_string(literal->u.dval, str); DEFAULT_UNREACHABLE; } @@ -889,14 +890,14 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expression_t *expr) { property_definition_t *iter; - BSTR name; + jsstr_t *name; HRESULT hres; if(!push_instr(ctx, OP_new_obj)) return E_OUTOFMEMORY; for(iter = expr->property_list; iter; iter = iter->next) { - hres = literal_as_bstr(ctx, iter->name, &name); + hres = literal_as_string(ctx, iter->name, &name); if(FAILED(hres)) return hres; @@ -904,7 +905,7 @@ static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expres if(FAILED(hres)) return hres; - hres = push_instr_bstr_uint(ctx, OP_obj_prop, name, iter->type); + hres = push_instr_str_uint(ctx, OP_obj_prop, name, iter->type); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0f9e3a5..c71ac07 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1444,16 +1444,20 @@ static HRESULT interp_new_obj(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.1.5 */ static HRESULT interp_obj_prop(script_ctx_t *ctx) { - const BSTR name = get_op_bstr(ctx, 0); + jsstr_t *name_arg = get_op_str(ctx, 0); unsigned type = get_op_uint(ctx, 1); + const WCHAR *name; jsdisp_t *obj; jsval_t val; HRESULT hres; - TRACE("%s\n", debugstr_w(name)); + TRACE("%s\n", debugstr_jsstr(name_arg)); val = stack_pop(ctx); + /* FIXME: we should pass it as jsstr_t */ + name = jsstr_flatten(name_arg); + assert(is_object_instance(stack_top(ctx))); obj = as_jsdisp(get_object(stack_top(ctx))); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index eb287d5..a3b598e 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -66,7 +66,7 @@ X(new, 1, ARG_UINT, 0) \ X(new_obj, 1, 0,0) \ X(null, 1, 0,0) \ - X(obj_prop, 1, ARG_BSTR, ARG_UINT) \ + X(obj_prop, 1, ARG_STR, ARG_UINT) \ X(or, 1, 0,0) \ X(pop, 1, ARG_UINT, 0) \ X(pop_except, 0, ARG_ADDR, 0) \

1 0