January 2018 - Wine-commits

Józef Kucia : libs/vkd3d: Synchronize access to Vulkan queues.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: db2e1d402e611432b4891dd81bec825a67f8c36b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=db2e1d402e611432b4891dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:04 2018 +0100 libs/vkd3d: Synchronize access to Vulkan queues. Access to VkQueue must be externally synchronized. 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> --- libs/vkd3d/command.c | 155 +++++++++++++++++++++++++++++++-------------- libs/vkd3d/device.c | 73 +++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 27 +++++--- 3 files changed, 191 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=db2e1d402e611432b48…

1 0

Józef Kucia : libs/vkd3d: Make GPU VA allocator thread-safe.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: d18e986b276de989261579087969e4e9773f469e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d18e986b276de9892615790… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:05 2018 +0100 libs/vkd3d: Make GPU VA allocator thread-safe. 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> --- libs/vkd3d/device.c | 66 +++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 4 +-- 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 39ec966..1e40e5d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -920,19 +920,31 @@ static void d3d12_device_init_pipeline_cache(struct d3d12_device *device) } } -/* FIXME: Allocator should be thread-safe. */ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, size_t size, void *ptr) { D3D12_GPU_VIRTUAL_ADDRESS ceiling = ~(D3D12_GPU_VIRTUAL_ADDRESS)0; struct vkd3d_gpu_va_allocation *allocation; + int rc; + + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return 0; + } if (!vkd3d_array_reserve((void **)&allocator->allocations, &allocator->allocations_size, allocator->allocation_count + 1, sizeof(*allocator->allocations))) + { + pthread_mutex_unlock(&allocator->mutex); return 0; + } if (size > ceiling || ceiling - size < allocator->floor) + { + pthread_mutex_unlock(&allocator->mutex); return 0; + } allocation = &allocator->allocations[allocator->allocation_count++]; allocation->base = allocator->floor; @@ -941,6 +953,8 @@ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_al allocator->floor += size; + pthread_mutex_unlock(&allocator->mutex); + return allocation->base; } @@ -959,35 +973,69 @@ static int vkd3d_gpu_va_allocation_compare(const void *k, const void *e) void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) { struct vkd3d_gpu_va_allocation *allocation; + int rc; - if (!(allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, - sizeof(*allocation), vkd3d_gpu_va_allocation_compare))) + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); return NULL; + } + + allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, + sizeof(*allocation), vkd3d_gpu_va_allocation_compare); + + pthread_mutex_unlock(&allocator->mutex); - return allocation->ptr; + return allocation ? allocation->ptr : NULL; } void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) { struct vkd3d_gpu_va_allocation *allocation; + int rc; - if (!(allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, - sizeof(*allocation), vkd3d_gpu_va_allocation_compare))) + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); return; + } - if (allocation->base == address) + allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, + sizeof(*allocation), vkd3d_gpu_va_allocation_compare); + if (allocation && allocation->base == address) allocation->ptr = NULL; + + pthread_mutex_unlock(&allocator->mutex); } -void vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator) +static bool vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator) { + int rc; + memset(allocator, 0, sizeof(*allocator)); allocator->floor = 0x1000; + + if ((rc = pthread_mutex_init(&allocator->mutex, NULL))) + { + ERR("Failed to initialize mutex, error %d.\n", rc); + return false; + } + + return true; } -void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *allocator) +static void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *allocator) { + int rc; + + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return; + } vkd3d_free(allocator->allocations); + pthread_mutex_unlock(&allocator->mutex); + pthread_mutex_destroy(&allocator->mutex); } /* ID3D12Device */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 1b0924f..de5ed8e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -122,6 +122,8 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, struct vkd3d_gpu_va_allocator { + pthread_mutex_t mutex; + D3D12_GPU_VIRTUAL_ADDRESS floor; struct vkd3d_gpu_va_allocation @@ -136,12 +138,10 @@ struct vkd3d_gpu_va_allocator D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, size_t size, void *ptr) DECLSPEC_HIDDEN; -void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *allocator) DECLSPEC_HIDDEN; void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; -void vkd3d_gpu_va_allocator_init(struct vkd3d_gpu_va_allocator *allocator) DECLSPEC_HIDDEN; /* ID3D12Fence */ struct d3d12_fence

1 0

Józef Kucia : tests: Add test for executing command lists from multiple threads.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: 8357908bc23e66421bbb316de14ec3cfffa88ea5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8357908bc23e66421bbb316… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:06 2018 +0100 tests: Add test for executing command lists from multiple threads. 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> --- tests/d3d12.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5511620..b8b4d95 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16983,6 +16983,103 @@ static void test_face_culling(void) destroy_test_context(&context); } +static void draw_thread_main(void *thread_data) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct test_context *context = thread_data; + ID3D12GraphicsCommandList *command_list; + ID3D12CommandAllocator *allocator; + D3D12_CPU_DESCRIPTOR_HANDLE rtv; + ID3D12Resource *render_target; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + queue = context->queue; + device = context->device; + heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_RTV, 1); + rtv = get_cpu_descriptor_handle(context, heap, 0); + create_render_target(context, NULL, &render_target, &rtv); + + hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, + &IID_ID3D12CommandAllocator, (void **)&allocator); + ok(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr); + hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, + allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + for (i = 0; i < 100; ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context->pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(render_target, 0, queue, command_list, 0xff00ff00, 0); + reset_command_list(command_list, allocator); + transition_resource_state(command_list, render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12DescriptorHeap_Release(heap); + ID3D12Resource_Release(render_target); + ID3D12CommandAllocator_Release(allocator); + ID3D12GraphicsCommandList_Release(command_list); +} + +static void test_multithread_command_queue_exec(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + ID3D12GraphicsCommandList *command_list; + struct test_context context; + ID3D12CommandQueue *queue; + HANDLE threads[10]; + unsigned int i; + + if (!init_test_context(&context, NULL)) + return; + command_list = context.list; + queue = context.queue; + + for (i = 0; i < ARRAY_SIZE(threads); ++i) + { + threads[i] = create_thread(draw_thread_main, &context); + ok(threads[i], "Failed to create thread %u.\n", i); + } + + for (i = 0; i < 100; ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + for (i = 0; i < ARRAY_SIZE(threads); ++i) + ok(join_thread(threads[i]), "Failed to join thread %u.\n", i); + + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -17085,4 +17182,5 @@ START_TEST(d3d12) run_test(test_copy_texture_region); run_test(test_separate_bindings); run_test(test_face_culling); + run_test(test_multithread_command_queue_exec); }

1 0

Józef Kucia : libs/vkd3d: Add thread-safe API for accessing Vulkan command queues.
by Alexandre Julliard 15 Jan '18

15 Jan '18

Module: vkd3d Branch: master Commit: 12ca2bbcf62166f6ddda19419dc1cb8e9e094946 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=12ca2bbcf62166f6ddda194… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 15 13:49:07 2018 +0100 libs/vkd3d: Add thread-safe API for accessing Vulkan command queues. 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> --- demos/demo_xcb.h | 11 +++++--- include/vkd3d.h | 4 ++- libs/vkd3d/command.c | 14 ++++++++++ libs/vkd3d/vkd3d.map | 2 ++ tests/vkd3d_api.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 99 insertions(+), 8 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 3cc2c54..a683dca 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -61,7 +61,7 @@ struct demo_swapchain VkInstance vk_instance; VkDevice vk_device; - VkQueue vk_queue; + ID3D12CommandQueue *command_queue; uint32_t current_buffer; unsigned int buffer_count; @@ -451,7 +451,6 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c swapchain->vk_fence = vk_fence; swapchain->vk_instance = vk_instance; swapchain->vk_device = vk_device; - swapchain->vk_queue = vkd3d_get_vk_queue(command_queue); vkAcquireNextImageKHR(vk_device, vk_swapchain, UINT64_MAX, VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer); @@ -488,6 +487,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c free(vk_images); ID3D12Device_Release(d3d12_device); + ID3D12CommandQueue_AddRef(swapchain->command_queue = command_queue); + return swapchain; fail: @@ -518,6 +519,7 @@ static inline ID3D12Resource *demo_swapchain_get_back_buffer(struct demo_swapcha static inline void demo_swapchain_present(struct demo_swapchain *swapchain) { VkPresentInfoKHR present_desc; + VkQueue vk_queue; present_desc.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_desc.pNext = NULL; @@ -528,7 +530,9 @@ static inline void demo_swapchain_present(struct demo_swapchain *swapchain) present_desc.pImageIndices = &swapchain->current_buffer; present_desc.pResults = NULL; - vkQueuePresentKHR(swapchain->vk_queue, &present_desc); + vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue); + vkQueuePresentKHR(vk_queue, &present_desc); + vkd3d_release_vk_queue(swapchain->command_queue); vkAcquireNextImageKHR(swapchain->vk_device, swapchain->vk_swapchain, UINT64_MAX, VK_NULL_HANDLE, swapchain->vk_fence, &swapchain->current_buffer); @@ -540,6 +544,7 @@ static inline void demo_swapchain_destroy(struct demo_swapchain *swapchain) { unsigned int i; + ID3D12CommandQueue_Release(swapchain->command_queue); for (i = 0; i < swapchain->buffer_count; ++i) { ID3D12Resource_Release(swapchain->buffers[i]); diff --git a/include/vkd3d.h b/include/vkd3d.h index 8a04dbd..322675b 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -73,8 +73,10 @@ VkDevice vkd3d_get_vk_device(ID3D12Device *device); VkInstance vkd3d_get_vk_instance(ID3D12Device *device); VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); -VkQueue vkd3d_get_vk_queue(ID3D12CommandQueue *queue); uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); +VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); +VkQueue vkd3d_get_vk_queue(ID3D12CommandQueue *queue); +void vkd3d_release_vk_queue(ID3D12CommandQueue *queue); HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 85dcf6f..7aa1386 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4394,6 +4394,20 @@ uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue) return d3d12_queue->vkd3d_queue->vk_family_index; } +VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue) +{ + struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); + + return vkd3d_queue_acquire(d3d12_queue->vkd3d_queue); +} + +void vkd3d_release_vk_queue(ID3D12CommandQueue *queue) +{ + struct d3d12_command_queue *d3d12_queue = impl_from_ID3D12CommandQueue(queue); + + return vkd3d_queue_release(d3d12_queue->vkd3d_queue); +} + /* ID3D12CommandSignature */ static inline struct d3d12_command_signature *impl_from_ID3D12CommandSignature(ID3D12CommandSignature *iface) { diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index db638f6..57b8606 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -1,5 +1,6 @@ { global: + vkd3d_acquire_vk_queue; vkd3d_create_device; vkd3d_create_image_resource; vkd3d_create_instance; @@ -12,6 +13,7 @@ global: vkd3d_get_vk_queue_family_index; vkd3d_instance_decref; vkd3d_instance_incref; + vkd3d_release_vk_queue; vkd3d_serialize_root_signature; local: *; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 79d51cc..146467a 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -40,6 +40,33 @@ static const struct vkd3d_device_create_info device_default_create_info = .instance_create_info = &instance_default_create_info, }; +static ID3D12Device *create_device(void) +{ + ID3D12Device *device; + HRESULT hr; + + hr = vkd3d_create_device(&device_default_create_info, + &IID_ID3D12Device, (void **)&device); + return SUCCEEDED(hr) ? device : NULL; +} + +static ID3D12CommandQueue *create_command_queue(ID3D12Device *device, + D3D12_COMMAND_LIST_TYPE type) +{ + D3D12_COMMAND_QUEUE_DESC desc; + ID3D12CommandQueue *queue; + HRESULT hr; + + desc.Type = type; + desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &desc, + &IID_ID3D12CommandQueue, (void **)&queue); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + return queue; +} + static void test_create_instance(void) { struct vkd3d_instance_create_info create_info; @@ -110,15 +137,55 @@ static void test_create_device(void) ok(!refcount, "Instance has %u references left.\n", refcount); } +static void test_vkd3d_queue(void) +{ + ID3D12CommandQueue *direct_queue, *compute_queue, *copy_queue; + uint32_t vk_queue_family; + ID3D12Device *device; + VkQueue vk_queue; + ULONG refcount; + + device = create_device(); + ok(device, "Failed to create device.\n"); + + direct_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT); + ok(direct_queue, "Failed to create direct command queue.\n"); + compute_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COMPUTE); + ok(compute_queue, "Failed to create direct command queue.\n"); + copy_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COPY); + ok(copy_queue, "Failed to create direct command queue.\n"); + + vk_queue_family = vkd3d_get_vk_queue_family_index(direct_queue); + trace("Direct queue family index %u.\n", vk_queue_family); + vk_queue_family = vkd3d_get_vk_queue_family_index(compute_queue); + trace("Compute queue family index %u.\n", vk_queue_family); + vk_queue_family = vkd3d_get_vk_queue_family_index(copy_queue); + trace("Copy queue family index %u.\n", vk_queue_family); + + vk_queue = vkd3d_acquire_vk_queue(direct_queue); + ok(vk_queue != VK_NULL_HANDLE, "Failed to acquire Vulkan queue.\n"); + vkd3d_release_vk_queue(direct_queue); + vk_queue = vkd3d_acquire_vk_queue(compute_queue); + ok(vk_queue != VK_NULL_HANDLE, "Failed to acquire Vulkan queue.\n"); + vkd3d_release_vk_queue(compute_queue); + vk_queue = vkd3d_acquire_vk_queue(copy_queue); + ok(vk_queue != VK_NULL_HANDLE, "Failed to acquire Vulkan queue.\n"); + vkd3d_release_vk_queue(copy_queue); + + ID3D12CommandQueue_Release(direct_queue); + ID3D12CommandQueue_Release(compute_queue); + ID3D12CommandQueue_Release(copy_queue); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static bool have_d3d12_device(void) { ID3D12Device *device; - HRESULT hr; - if (SUCCEEDED(hr = vkd3d_create_device(&device_default_create_info, - &IID_ID3D12Device, (void **)&device))) + if ((device = create_device())) ID3D12Device_Release(device); - return hr == S_OK; + return device; } START_TEST(vkd3d_api) @@ -131,4 +198,5 @@ START_TEST(vkd3d_api) run_test(test_create_instance); run_test(test_create_device); + run_test(test_vkd3d_queue); }

1 0

김건우 : Translate into Korean
by Jeremy Newman 15 Jan '18

15 Jan '18

Module: website Branch: master Commit: 9aef18cc0231de99425b5da25502f0b48df34d46 URL: https://source.winehq.org/git/website.git/?a=commit;h=9aef18cc0231de99425b5… Author: 김건우 <rlarjsdn122(a)naver.com> Date: Fri Jan 12 18:57:52 2018 +0900 Translate into Korean Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- website/templates/ko/about.template | 52 ++ website/templates/ko/announce.template | 8 + website/templates/ko/documentation.template | 59 ++ website/templates/ko/donate.template | 59 ++ website/templates/ko/download.template | 159 +++++ website/templates/ko/forums.template | 113 +++ website/templates/ko/getinvolved.template | 121 ++++ website/templates/ko/global/404.template | 18 + website/templates/ko/global/fatal_error.template | 26 + website/templates/ko/global/xml/trans/global.xml | 18 + website/templates/ko/help.template | 94 +++ website/templates/ko/home.template | 99 +++ website/templates/ko/interview.template | 8 + website/templates/ko/irc.template | 101 +++ website/templates/ko/lang.template | 12 + website/templates/ko/license.template | 834 +++++++++++++++++++++++ website/templates/ko/news.template | 16 + website/templates/ko/news_row.template | 5 + website/templates/ko/search.template | 18 + website/templates/ko/wineconf/media.template | 32 + website/templates/ko/wineconf/rsvp.template | 3 + website/templates/ko/wwn.template | 10 + website/templates/ko/wwn_content.template | 23 + website/templates/ko/wwn_interview.template | 13 + 24 files changed, 1901 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=9aef18cc0231de994…

1 0

Jeremy Newman : move Korean translation to proper location in the tree
by Jeremy Newman 15 Jan '18

15 Jan '18

Module: website Branch: master Commit: a3c1b7c80f30b92245d591fb068171b5e585d845 URL: https://source.winehq.org/git/website.git/?a=commit;h=a3c1b7c80f30b92245d59… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jan 15 09:34:16 2018 -0600 move Korean translation to proper location in the tree Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- {website/templates => templates}/ko/about.template | 0 {website/templates => templates}/ko/announce.template | 0 {website/templates => templates}/ko/documentation.template | 0 {website/templates => templates}/ko/donate.template | 0 {website/templates => templates}/ko/download.template | 0 {website/templates => templates}/ko/forums.template | 0 {website/templates => templates}/ko/getinvolved.template | 0 {website/templates => templates}/ko/global/404.template | 0 {website/templates => templates}/ko/global/fatal_error.template | 0 {website/templates => templates}/ko/global/xml/trans/global.xml | 0 {website/templates => templates}/ko/help.template | 0 {website/templates => templates}/ko/home.template | 0 {website/templates => templates}/ko/interview.template | 0 {website/templates => templates}/ko/irc.template | 0 {website/templates => templates}/ko/lang.template | 0 {website/templates => templates}/ko/license.template | 0 {website/templates => templates}/ko/news.template | 0 {website/templates => templates}/ko/news_row.template | 0 {website/templates => templates}/ko/search.template | 0 {website/templates => templates}/ko/wineconf/media.template | 0 {website/templates => templates}/ko/wineconf/rsvp.template | 0 {website/templates => templates}/ko/wwn.template | 0 {website/templates => templates}/ko/wwn_content.template | 0 {website/templates => templates}/ko/wwn_interview.template | 0 24 files changed, 0 insertions(+), 0 deletions(-) diff --git a/website/templates/ko/about.template b/templates/ko/about.template similarity index 100% rename from website/templates/ko/about.template rename to templates/ko/about.template diff --git a/website/templates/ko/announce.template b/templates/ko/announce.template similarity index 100% rename from website/templates/ko/announce.template rename to templates/ko/announce.template diff --git a/website/templates/ko/documentation.template b/templates/ko/documentation.template similarity index 100% rename from website/templates/ko/documentation.template rename to templates/ko/documentation.template diff --git a/website/templates/ko/donate.template b/templates/ko/donate.template similarity index 100% rename from website/templates/ko/donate.template rename to templates/ko/donate.template diff --git a/website/templates/ko/download.template b/templates/ko/download.template similarity index 100% rename from website/templates/ko/download.template rename to templates/ko/download.template diff --git a/website/templates/ko/forums.template b/templates/ko/forums.template similarity index 100% rename from website/templates/ko/forums.template rename to templates/ko/forums.template diff --git a/website/templates/ko/getinvolved.template b/templates/ko/getinvolved.template similarity index 100% rename from website/templates/ko/getinvolved.template rename to templates/ko/getinvolved.template diff --git a/website/templates/ko/global/404.template b/templates/ko/global/404.template similarity index 100% rename from website/templates/ko/global/404.template rename to templates/ko/global/404.template diff --git a/website/templates/ko/global/fatal_error.template b/templates/ko/global/fatal_error.template similarity index 100% rename from website/templates/ko/global/fatal_error.template rename to templates/ko/global/fatal_error.template diff --git a/website/templates/ko/global/xml/trans/global.xml b/templates/ko/global/xml/trans/global.xml similarity index 100% rename from website/templates/ko/global/xml/trans/global.xml rename to templates/ko/global/xml/trans/global.xml diff --git a/website/templates/ko/help.template b/templates/ko/help.template similarity index 100% rename from website/templates/ko/help.template rename to templates/ko/help.template diff --git a/website/templates/ko/home.template b/templates/ko/home.template similarity index 100% rename from website/templates/ko/home.template rename to templates/ko/home.template diff --git a/website/templates/ko/interview.template b/templates/ko/interview.template similarity index 100% rename from website/templates/ko/interview.template rename to templates/ko/interview.template diff --git a/website/templates/ko/irc.template b/templates/ko/irc.template similarity index 100% rename from website/templates/ko/irc.template rename to templates/ko/irc.template diff --git a/website/templates/ko/lang.template b/templates/ko/lang.template similarity index 100% rename from website/templates/ko/lang.template rename to templates/ko/lang.template diff --git a/website/templates/ko/license.template b/templates/ko/license.template similarity index 100% rename from website/templates/ko/license.template rename to templates/ko/license.template diff --git a/website/templates/ko/news.template b/templates/ko/news.template similarity index 100% rename from website/templates/ko/news.template rename to templates/ko/news.template diff --git a/website/templates/ko/news_row.template b/templates/ko/news_row.template similarity index 100% rename from website/templates/ko/news_row.template rename to templates/ko/news_row.template diff --git a/website/templates/ko/search.template b/templates/ko/search.template similarity index 100% rename from website/templates/ko/search.template rename to templates/ko/search.template diff --git a/website/templates/ko/wineconf/media.template b/templates/ko/wineconf/media.template similarity index 100% rename from website/templates/ko/wineconf/media.template rename to templates/ko/wineconf/media.template diff --git a/website/templates/ko/wineconf/rsvp.template b/templates/ko/wineconf/rsvp.template similarity index 100% rename from website/templates/ko/wineconf/rsvp.template rename to templates/ko/wineconf/rsvp.template diff --git a/website/templates/ko/wwn.template b/templates/ko/wwn.template similarity index 100% rename from website/templates/ko/wwn.template rename to templates/ko/wwn.template diff --git a/website/templates/ko/wwn_content.template b/templates/ko/wwn_content.template similarity index 100% rename from website/templates/ko/wwn_content.template rename to templates/ko/wwn_content.template diff --git a/website/templates/ko/wwn_interview.template b/templates/ko/wwn_interview.template similarity index 100% rename from website/templates/ko/wwn_interview.template rename to templates/ko/wwn_interview.template

1 0

Jeremy Newman : add Korean as a selectable language
by Jeremy Newman 15 Jan '18

15 Jan '18

Module: website Branch: master Commit: f41f497776d8f1f6940856feb2cab805ce9395fe URL: https://source.winehq.org/git/website.git/?a=commit;h=f41f497776d8f1f694085… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jan 15 09:36:06 2018 -0600 add Korean as a selectable language Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- images/lang/ko.png | Bin 0 -> 792 bytes include/winehq.conf.sample | 2 +- templates/en/global/xml/trans/lang.xml | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/images/lang/ko.png b/images/lang/ko.png new file mode 100644 index 0000000..7d78a5e Binary files /dev/null and b/images/lang/ko.png differ diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 82db033..4d3376a 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -20,7 +20,7 @@ site_name: WineHQ lang: en # available languages -(a)languages: en, de, es, fr, pl, pt, tr, uk, zh-cn +(a)languages: en, de, es, fr, ko, pl, pt, tr, uk, zh-cn # pages that use PATH_INFO @stop_pages: announce, interview, lang, news, wwn diff --git a/templates/en/global/xml/trans/lang.xml b/templates/en/global/xml/trans/lang.xml index 8b22df7..dddc2ad 100644 --- a/templates/en/global/xml/trans/lang.xml +++ b/templates/en/global/xml/trans/lang.xml @@ -13,6 +13,7 @@ <str name="de">Deutsch</str> <str name="es">Español</str> <str name="fr">Français</str> + <str name="ko">한국어</str> <str name="he">עברית</str> <str name="pl">Polski</str> <str name="pt">Português</str> @@ -27,6 +28,7 @@ <str name="de">Sprache ändern</str> <str name="es">Cambiar Idioma</str> <str name="fr">Changez la langue</str> + <str name="ko">언어 변경</str> <str name="he">החלפת השפה</str> <str name="pl">Zmień język</str> <str name="pt">Mudar a língua</str>

1 0

Alexandre Julliard : Wine release 3.0-rc6
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: website Branch: master Commit: 243a1ed98a2168cdf178ce7ceea94be54ea803fe URL: https://source.winehq.org/git/website.git/?a=commit;h=243a1ed98a2168cdf178c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 20:34:46 2018 +0100 Wine release 3.0-rc6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018011201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018011201.xml b/news/en/2018011201.xml new file mode 100644 index 0000000..78e8de4 --- /dev/null +++ b/news/en/2018011201.xml @@ -0,0 +1,12 @@ +<news> +<date>January 12, 2018</date> +<title>Wine 3.0-rc6 Released</title> +<body> + The Wine development release 3.0-rc6 is now available. + <a href="{$root}/announce/3.0-rc6">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.0/wine-3.0-rc6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : msxml3/tests: Use temporary user directory for test files.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: wine Branch: master Commit: cefe6e8de50e7287776a302133e4ca4aeaf58ead URL: https://source.winehq.org/git/wine.git/?a=commit;h=cefe6e8de50e7287776a3021… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 12 14:24:42 2018 +0300 msxml3/tests: Use temporary user directory for test files. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1306590..7c56015 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10155,16 +10155,20 @@ static void write_to_file(const char *name, const char *data) static void test_load(void) { IXMLDOMDocument *doc, *doc2; + BSTR pathW, bstr1, bstr2; IXMLDOMNodeList *list; IXMLDOMElement *elem; + char path[MAX_PATH]; VARIANT_BOOL b; VARIANT src; HRESULT hr; - BSTR path, bstr1, bstr2; void* ptr; + GetTempPathA(MAX_PATH, path); + strcat(path, "winetest.xml"); + /* prepare a file */ - write_to_file("test.xml", win1252xml); + write_to_file(path, win1252xml); doc = create_document(&IID_IXMLDOMDocument); @@ -10175,11 +10179,11 @@ static void test_load(void) EXPECT_HR(hr, E_INVALIDARG); ok(b == VARIANT_FALSE, "got %d\n", b); - path = _bstr_("test.xml"); + pathW = _bstr_(path); /* load from path: VT_BSTR */ V_VT(&src) = VT_BSTR; - V_BSTR(&src) = path; + V_BSTR(&src) = pathW; hr = IXMLDOMDocument_load(doc, src, &b); EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); @@ -10191,7 +10195,7 @@ static void test_load(void) /* load from a path: VT_BSTR|VT_BYREF */ V_VT(&src) = VT_BSTR | VT_BYREF; - V_BSTRREF(&src) = &path; + V_BSTRREF(&src) = &pathW; hr = IXMLDOMDocument_load(doc, src, &b); EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); @@ -10229,13 +10233,13 @@ static void test_load(void) ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(bstr1); - DeleteFileA("test.xml"); + DeleteFileA(path); /* load from existing path, no xml content */ - write_to_file("test.xml", nocontent); + write_to_file(path, nocontent); V_VT(&src) = VT_BSTR; - V_BSTR(&src) = path; + V_BSTR(&src) = pathW; b = VARIANT_TRUE; hr = IXMLDOMDocument_load(doc, src, &b); ok(hr == S_FALSE, "got 0x%08x\n", hr); @@ -10246,7 +10250,7 @@ static void test_load(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(bstr1 == NULL, "got %p\n", bstr1); - DeleteFileA("test.xml"); + DeleteFileA(path); IXMLDOMDocument_Release(doc); doc = create_document(&IID_IXMLDOMDocument);

1 0

Nikolay Sivov : user32/tests: Add EM_GETLINE test.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: wine Branch: master Commit: 8d8c94d7930217e7642ded3ee68ddc5bb5cc97e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d8c94d7930217e7642ded3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 12 14:26:51 2018 +0300 user32/tests: Add EM_GETLINE test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index e334be1..de8a349 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -557,6 +557,18 @@ static HWND create_editcontrol (DWORD style, DWORD exstyle) return handle; } +static HWND create_editcontrolW(DWORD style, DWORD exstyle) +{ + static const WCHAR testtextW[] = {'T','e','s','t',' ','t','e','x','t',0}; + static const WCHAR editW[] = {'E','d','i','t',0}; + HWND handle; + + handle = CreateWindowExW(exstyle, editW, testtextW, style, 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok(handle != NULL, "Failed to create Edit control.\n"); + return handle; +} + static HWND create_child_editcontrol (DWORD style, DWORD exstyle) { HWND parentWnd; @@ -2936,6 +2948,57 @@ static void test_paste(void) DestroyWindow(hMultilineEdit); } +static void test_EM_GETLINE(void) +{ + HWND hwnd[2]; + int i; + + hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + for (i = 0; i < sizeof(hwnd)/sizeof(hwnd[0]); i++) + { + static const WCHAR strW[] = {'t','e','x','t',0}; + static const char *str = "text"; + WCHAR buffW[16]; + char buff[16]; + int r; + + if (i == 0) + ok(!IsWindowUnicode(hwnd[i]), "Expected ansi window.\n"); + else + ok(IsWindowUnicode(hwnd[i]), "Expected unicode window.\n"); + + SendMessageA(hwnd[i], WM_SETTEXT, 0, (LPARAM)str); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 0, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 1, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 0, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 1, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + DestroyWindow(hwnd[i]); + } +} + START_TEST(edit) { BOOL b; @@ -2970,6 +3033,7 @@ START_TEST(edit) test_contextmenu(); test_EM_GETHANDLE(); test_paste(); + test_EM_GETLINE(); UnregisterWindowClasses(); }

1 0