wine-commits February 2019

1 participants
672 discussions

Józef Kucia : dxgi: Set Vulkan swapchain size according to VkSurfaceCapabilitiesKHR.

by Alexandre Julliard

Module: wine Branch: master Commit: 6e052efbff27b9646bb7dfa51c2439fe1dbbbe97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e052efbff27b9646bb7dfa5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:04:57 2019 +0100 dxgi: Set Vulkan swapchain size according to VkSurfaceCapabilitiesKHR. 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 | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 268442f..ed7861c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -890,6 +890,8 @@ struct d3d12_swapchain VkSemaphore vk_semaphores[DXGI_MAX_SWAP_CHAIN_BUFFERS]; ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; unsigned int buffer_count; + unsigned int vk_swapchain_width; + unsigned int vk_swapchain_height; uint32_t current_buffer_index; struct dxgi_vk_funcs vk_funcs; @@ -1209,8 +1211,12 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s blit.srcOffsets[1].y = swapchain->desc.Height; blit.srcOffsets[1].z = 1; blit.dstSubresource = blit.srcSubresource; - blit.dstOffsets[0] = blit.srcOffsets[0]; - blit.dstOffsets[1] = blit.srcOffsets[1]; + blit.dstOffsets[0].x = 0; + blit.dstOffsets[0].y = 0; + blit.dstOffsets[0].z = 0; + blit.dstOffsets[1].x = swapchain->vk_swapchain_width; + blit.dstOffsets[1].y = swapchain->vk_swapchain_height; + blit.dstOffsets[1].z = 1; vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, swapchain->vk_images[i], VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, @@ -1439,6 +1445,7 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s VkFormat vk_format, vk_swapchain_format; VkSurfaceCapabilitiesKHR surface_caps; VkSwapchainKHR vk_swapchain; + unsigned int width, height; VkImageUsageFlags usage; VkResult vr; HRESULT hr; @@ -1468,17 +1475,23 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s return DXGI_ERROR_UNSUPPORTED; } - if (swapchain->desc.Width > surface_caps.maxImageExtent.width - || swapchain->desc.Width < surface_caps.minImageExtent.width - || swapchain->desc.Height > surface_caps.maxImageExtent.height - || swapchain->desc.Height < surface_caps.minImageExtent.height) + width = swapchain->desc.Width; + height = swapchain->desc.Height; + width = max(width, surface_caps.minImageExtent.width); + width = min(width, surface_caps.maxImageExtent.width); + height = max(height, surface_caps.minImageExtent.height); + height = min(height, surface_caps.maxImageExtent.height); + + if (width != swapchain->desc.Width || height != swapchain->desc.Height) { - FIXME("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", + WARN("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", swapchain->desc.Width, swapchain->desc.Height, surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height); } + TRACE("Vulkan swapchain extent %ux%u.\n", width, height); + if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) { FIXME("Unsupported alpha mode.\n"); @@ -1498,8 +1511,8 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s vk_swapchain_desc.minImageCount = swapchain->desc.BufferCount; vk_swapchain_desc.imageFormat = vk_swapchain_format; vk_swapchain_desc.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; - vk_swapchain_desc.imageExtent.width = swapchain->desc.Width; - vk_swapchain_desc.imageExtent.height = swapchain->desc.Height; + vk_swapchain_desc.imageExtent.width = width; + vk_swapchain_desc.imageExtent.height = height; vk_swapchain_desc.imageArrayLayers = 1; vk_swapchain_desc.imageUsage = usage; vk_swapchain_desc.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1520,6 +1533,8 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); swapchain->vk_swapchain = vk_swapchain; + 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;

5 years, 2 months

Józef Kucia : dxgi: Re-create swapchain on VK_ERROR_OUT_OF_DATE_KHR.

by Alexandre Julliard

Module: wine Branch: master Commit: 13bcb4d9469f3d20d2f26475bedbe7c9aa7e1851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13bcb4d9469f3d20d2f26475… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:04:56 2019 +0100 dxgi: Re-create swapchain on VK_ERROR_OUT_OF_DATE_KHR. 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 | 88 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 89bcf5d..268442f 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1033,6 +1033,9 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc VkResult vr; HRESULT hr; + if (swapchain->vk_images[0]) + return S_OK; + memset(&image_info, 0, sizeof(image_info)); image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; @@ -1315,6 +1318,9 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return hr; } + if (swapchain->buffers[0]) + return S_OK; + for (i = 0; i < swapchain->buffer_count; ++i) { if (swapchain->vk_images[i]) @@ -1369,9 +1375,10 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch return S_OK; } -static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) +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; @@ -1389,9 +1396,11 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) } } + have_user_images = swapchain->vk_images[0]; + for (i = 0; i < swapchain->buffer_count; ++i) { - if (swapchain->buffers[i]) + if (swapchain->buffers[i] && (destroy_user_buffers || !have_user_images)) { vkd3d_resource_decref(swapchain->buffers[i]); swapchain->buffers[i] = NULL; @@ -1399,8 +1408,11 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) if (swapchain->vk_device) { - vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); - swapchain->vk_images[i] = VK_NULL_HANDLE; + if (destroy_user_buffers) + { + vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); + swapchain->vk_images[i] = VK_NULL_HANDLE; + } vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); swapchain->vk_semaphores[i] = VK_NULL_HANDLE; } @@ -1408,8 +1420,11 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) if (swapchain->vk_device) { - vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); - swapchain->vk_memory = VK_NULL_HANDLE; + if (destroy_user_buffers) + { + vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); + swapchain->vk_memory = VK_NULL_HANDLE; + } vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); swapchain->vk_cmd_pool = VK_NULL_HANDLE; } @@ -1556,7 +1571,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - d3d12_swapchain_destroy_buffers(swapchain); + d3d12_swapchain_destroy_buffers(swapchain, TRUE); if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); @@ -1780,7 +1795,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 * && desc->Format == new_desc.Format && desc->BufferCount == new_desc.BufferCount) return S_OK; - d3d12_swapchain_destroy_buffers(swapchain); + d3d12_swapchain_destroy_buffers(swapchain, TRUE); swapchain->desc = new_desc; if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) { @@ -1885,7 +1900,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetCoreWindow(IDXGISwapChain3 * return DXGI_ERROR_INVALID_CALL; } -static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) +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; @@ -1903,15 +1918,21 @@ static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, Vk 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 hresult_from_vk_result(vr); + return vr; } -static HRESULT d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) +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; 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; @@ -1927,9 +1948,7 @@ static HRESULT d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; } - if ((vr = vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info)) < 0) - ERR("Failed to queue present, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface, @@ -1937,6 +1956,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); VkQueue vk_queue; + VkResult vr; HRESULT hr; TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", @@ -1967,23 +1987,47 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface return E_FAIL; } - if (swapchain->vk_images[swapchain->current_buffer_index]) + vr = d3d12_swapchain_queue_present(swapchain, vk_queue); + if (vr == VK_ERROR_OUT_OF_DATE_KHR) { - if (FAILED(hr = d3d12_swapchain_blit_buffer(swapchain, vk_queue))) + vkd3d_release_vk_queue(swapchain->command_queue); + + if (!swapchain->vk_images[swapchain->current_buffer_index]) { - vkd3d_release_vk_queue(swapchain->command_queue); + FIXME("Cannot recreate swapchain without user images.\n"); + return DXGI_STATUS_MODE_CHANGED; + } + + 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_queue_present(swapchain, vk_queue))) - { - vkd3d_release_vk_queue(swapchain->command_queue); - return hr; + if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + return hr; + + if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + ERR("Failed to acquire Vulkan queue.\n"); + return E_FAIL; + } + + if ((vr = d3d12_swapchain_queue_present(swapchain, vk_queue)) < 0) + ERR("Failed to present after recreating swapchain, vr %d.\n", vr); } vkd3d_release_vk_queue(swapchain->command_queue); + if (vr < 0) + { + ERR("Failed to queue present, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + return d3d12_swapchain_acquire_next_image(swapchain); }

5 years, 2 months

Józef Kucia : dxgi: Always use user images instead of using Vulkan swapchain directly.

by Alexandre Julliard

Module: wine Branch: master Commit: 0da481856bd7e6b1dd877209c69bba6c5d107b4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da481856bd7e6b1dd877209… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:04:55 2019 +0100 dxgi: Always use user images instead of using Vulkan swapchain directly. Some Vulkan drivers require that swapchain dimensions and window dimensions match exactly. Additionally, we want to have ability to change the presentation mode, and the only way to change the presentation mode in Vulkan is to recreate the 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 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 07438f3..89bcf5d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1293,18 +1293,19 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; - if (vk_swapchain_format != vk_format) + queue_desc = ID3D12CommandQueue_GetDesc(queue); + if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) { - queue_desc = ID3D12CommandQueue_GetDesc(queue); - if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) - { - /* vkCmdBlitImage() is only supported for Graphics queues. */ - FIXME("Format conversion not implemented for command queue type %#x.\n", queue_desc.Type); + /* vkCmdBlitImage() is only supported for graphics queues. */ + FIXME("Swapchain blit not implemented for command queue type %#x.\n", queue_desc.Type); + if (vk_swapchain_format != vk_format) return E_NOTIMPL; - } - queue_family_index = vkd3d_get_vk_queue_family_index(queue); + } + queue_family_index = vkd3d_get_vk_queue_family_index(queue); - TRACE("Creating user swapchain buffers for format conversion.\n"); + if (queue_desc.Type == D3D12_COMMAND_LIST_TYPE_DIRECT) + { + TRACE("Creating user swapchain buffers.\n"); if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) return hr;

5 years, 2 months

Józef Kucia : dxgi/tests: Run test_swapchain_present( ) on D3D12.

by Alexandre Julliard

Module: wine Branch: master Commit: d7fd50b0afb38c4a4b59093da3288444d6140277 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7fd50b0afb38c4a4b59093d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 16:04:54 2019 +0100 dxgi/tests: Run test_swapchain_present() on D3D12. 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/tests/dxgi.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 02cf744..e630a49 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3910,28 +3910,16 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } -static void test_swapchain_present(void) +static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; - IDXGIAdapter *adapter; IDXGIFactory *factory; - IDXGIDevice *device; unsigned int i; ULONG refcount; HRESULT hr; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to get parent, hr %#x.\n", hr); - IDXGIAdapter_Release(adapter); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -3943,14 +3931,14 @@ static void test_swapchain_present(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); for (i = 0; i < 10; ++i) { @@ -3962,11 +3950,9 @@ static void test_swapchain_present(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); IDXGISwapChain_Release(swapchain); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) @@ -5028,7 +5014,6 @@ START_TEST(dxgi) queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); - queue_test(test_swapchain_present); queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); @@ -5046,6 +5031,7 @@ START_TEST(dxgi) test_swapchain_window_messages(); test_swapchain_window_styles(); run_on_d3d10(test_swapchain_resize); + run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats); @@ -5065,6 +5051,7 @@ START_TEST(dxgi) } run_on_d3d12(test_swapchain_resize); + run_on_d3d12(test_swapchain_present); run_on_d3d12(test_swapchain_backbuffer_index); run_on_d3d12(test_swapchain_formats);

5 years, 2 months

Michael Stefaniuc : windowscodecs: Remove redundant not-NULL check ( coccinellery).

by Alexandre Julliard

Module: wine Branch: master Commit: f34f621291da81fd855e5cb2a404b73ab780d7cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f34f621291da81fd855e5cb2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:33 2019 +0100 windowscodecs: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/metadataquery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index c4c188d..0a44c1e 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -925,7 +925,7 @@ HRESULT WINAPI WICMapSchemaToName(REFGUID format, LPWSTR schema, UINT len, WCHAR return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); } - if (ret_len) *ret_len = lstrlenW(name2schema[i].name) + 1; + *ret_len = lstrlenW(name2schema[i].name) + 1; return S_OK; } }

5 years, 2 months

Michael Stefaniuc : gdiplus: Remove useless casts to self.

by Alexandre Julliard

Module: wine Branch: master Commit: 50032f4e14a6cf98e68048980eea8eae15675dc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50032f4e14a6cf98e6804898… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 28 00:50:28 2019 +0100 gdiplus: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1e48d07..b65e456 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3103,7 +3103,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(fill->data.Color, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->data.Color, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3151,7 +3151,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) /* S */ { - stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->BrushId, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3216,7 +3216,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->BrushId, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill; @@ -3255,7 +3255,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) /* S */ { - stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + stat = GdipCreateSolidFill(fill->BrushId, &solidfill); if (stat != Ok) return stat; brush = (GpBrush *)solidfill;

5 years, 2 months

Andrew Eikum : xaudio2: IXAPO::Process out parameter should not be const.

by Alexandre Julliard

Module: wine Branch: master Commit: 53cd694e6a6b577635a3f524c7fc2bd0c1feaff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cd694e6a6b577635a3f524… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Feb 28 09:20:03 2019 -0600 xaudio2: IXAPO::Process out parameter should not be const. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapo.c | 2 +- include/xapo.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index ccad417..3ccb3f1 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -175,7 +175,7 @@ static void WINAPI XAPOFX_UnlockForProcess(IXAPO *iface) static void WINAPI XAPOFX_Process(IXAPO *iface, UINT32 in_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, UINT32 out_params_count, - const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) + XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled) { XA2XAPOFXImpl *This = impl_from_IXAPO(iface); TRACE("%p, %u, %p, %u, %p, %u\n", This, in_params_count, in_params, diff --git a/include/xapo.idl b/include/xapo.idl index 9c3ad15..7b28ac9 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -118,7 +118,7 @@ interface IXAPO : IUnknown void UnlockForProcess(void); void Process(UINT32 in_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *in_params, - UINT32 out_params_count, const XAPO_PROCESS_BUFFER_PARAMETERS *out_params, + UINT32 out_params_count, XAPO_PROCESS_BUFFER_PARAMETERS *out_params, BOOL enabled); UINT32 CalcInputFrames(UINT32 output_frames);

5 years, 2 months

Brendan McGrath : vbscript: Add todo test for 'rem' as 'dot' identifier.

by Alexandre Julliard

Module: wine Branch: master Commit: dac7441b4e83a2ca3d0ab4a1f41903a9e7c8de20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac7441b4e83a2ca3d0ab4a1… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Thu Feb 28 13:27:18 2019 +1100 vbscript: Add todo test for 'rem' as 'dot' identifier. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46318 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 103082f..49066ce 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2334,6 +2334,10 @@ static void run_tests(void) parse_script_a("Option Explicit\nset test.setobj = testObj"); CHECK_CALLED(global_setobj_i); + hres = parse_script_ar("dim x\nx = testObj.rem"); + todo_wine + ok(hres == S_OK, "use of 'rem' as dot identifier failed: %x08\n", hres); + SET_EXPECT(testobj_propget_d); SET_EXPECT(testobj_propget_i); parse_script_a("dim x\nx = testObj.propget");

5 years, 2 months

Brendan McGrath : vbscript: Allow most keywords to be used as 'dot' identifiers.

by Alexandre Julliard

Module: wine Branch: master Commit: 78078b65b27177fecbd2f45bb5c14b3a21aa1c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78078b65b27177fecbd2f45b… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Thu Feb 28 13:27:17 2019 +1100 vbscript: Allow most keywords to be used as 'dot' identifiers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46318 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 86 +++++++++++++++++++++++++++++------- dlls/vbscript/tests/lang.vbs | 55 +++++++++++++++++++++++ dlls/vbscript/tests/run.c | 101 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 215 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78078b65b27177fecbd2…

5 years, 2 months

Ethan Lee : xaudio2: IXAudio23 needs its own interface, for XAUDIO23_VOICE_SENDS parameters.

by Alexandre Julliard

Module: wine Branch: master Commit: b49b78db49d79bdd1358f2244a87d74db6350b73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b49b78db49d79bdd1358f224… Author: Ethan Lee <elee(a)codeweavers.com> Date: Wed Feb 27 11:36:56 2019 -0500 xaudio2: IXAudio23 needs its own interface, for XAUDIO23_VOICE_SENDS parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46727 Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 222 +++++++++++++++++++++++++++++++++++++++- dlls/xaudio2_7/xaudio_dll.c | 4 + dlls/xaudio2_7/xaudio_private.h | 4 + include/xaudio2.idl | 61 +++++++++++ 4 files changed, 286 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b49b78db49d79bdd1358…

5 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2019