October 2018 - Wine-Devel - list.winehq.org

[PATCH vkd3d 3/6] tests: Annotate fall-through switch case (Coverity).
by Józef Kucia Oct. 24, 2018

Oct. 24, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a63e122f7232..15cd28241da7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14534,6 +14534,7 @@ static void test_typed_uav_store(void) { default: trace("Unhandled format %#x.\n", tests[i].format); + /* fall-through */ case DXGI_FORMAT_R32_FLOAT: check_sub_resource_float(resource, 0, queue, command_list, tests[i].result.f, 2); break; -- 2.18.1

2 1

[PATCH vkd3d 6/6] vkd3d: Store compiled Vulkan pipelines in d3d12_graphics_pipeline_state.
by Józef Kucia Oct. 24, 2018

Oct. 24, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 116 ----------------------------------- libs/vkd3d/state.c | 122 +++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 21 ------- 3 files changed, 105 insertions(+), 154 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 727259a92e56..419b9042b178 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1159,110 +1159,6 @@ static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device) return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_dummy_sampler); } -static void destroy_compiled_pipeline(struct vkd3d_compiled_pipeline *pipeline, - struct d3d12_device *device) -{ - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - - VK_CALL(vkDestroyPipeline(device->vk_device, pipeline->vk_pipeline, NULL)); - vkd3d_free(pipeline); -} - -static int compare_pipeline_cache_entry(const void *key, const struct rb_entry *entry) -{ - const struct vkd3d_compiled_pipeline *compiled_pipeline; - const struct vkd3d_pipeline_key *pipeline_key; - - pipeline_key = key; - compiled_pipeline = RB_ENTRY_VALUE(entry, const struct vkd3d_compiled_pipeline, entry); - return memcmp(&compiled_pipeline->key, pipeline_key, sizeof(*pipeline_key)); -} - -static void destroy_pipeline_cache_entry(struct rb_entry *entry, void *context) -{ - struct vkd3d_compiled_pipeline *pipeline; - struct d3d12_device *device = context; - - pipeline = RB_ENTRY_VALUE(entry, struct vkd3d_compiled_pipeline, entry); - destroy_compiled_pipeline(pipeline, device); -} - -VkPipeline d3d12_device_find_cached_pipeline(struct d3d12_device *device, - const struct vkd3d_pipeline_key *key) -{ - VkPipeline vk_pipeline = VK_NULL_HANDLE; - struct rb_entry *entry; - int rc; - - if (!(rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) - { - if ((entry = rb_get(&device->pipeline_cache, key))) - vk_pipeline = RB_ENTRY_VALUE(entry, struct vkd3d_compiled_pipeline, entry)->vk_pipeline; - pthread_mutex_unlock(&device->pipeline_cache_mutex); - } - else - { - ERR("Failed to lock mutex, error %d.\n", rc); - } - - return vk_pipeline; -} - -bool d3d12_device_put_pipeline_to_cache(struct d3d12_device *device, - const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline, struct list *list) -{ - struct vkd3d_compiled_pipeline *compiled_pipeline; - bool ret = true; - int rc; - - if (!(compiled_pipeline = vkd3d_malloc(sizeof(*compiled_pipeline)))) - return false; - - compiled_pipeline->key = *key; - compiled_pipeline->vk_pipeline = vk_pipeline; - - if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - vkd3d_free(compiled_pipeline); - return false; - } - - if (rb_put(&device->pipeline_cache, key, &compiled_pipeline->entry) >= 0) - { - list_add_tail(list, &compiled_pipeline->list); - } - else - { - WARN("Failed to put pipeline to cache.\n"); - vkd3d_free(compiled_pipeline); - ret = false; - } - - pthread_mutex_unlock(&device->pipeline_cache_mutex); - return ret; -} - -void d3d12_device_destroy_compiled_pipelines(struct d3d12_device *device, struct list *list) -{ - struct vkd3d_compiled_pipeline *pipeline, *cursor; - int rc; - - if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return; - } - - LIST_FOR_EACH_ENTRY_SAFE(pipeline, cursor, list, struct vkd3d_compiled_pipeline, list) - { - rb_remove(&device->pipeline_cache, &pipeline->entry); - destroy_compiled_pipeline(pipeline, device); - } - - pthread_mutex_unlock(&device->pipeline_cache_mutex); -} - static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1276,8 +1172,6 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) return E_FAIL; } - rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); - cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; cache_info.pNext = NULL; cache_info.flags = 0; @@ -1296,20 +1190,10 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - int rc; if (device->vk_pipeline_cache) VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); - if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return; - } - - rb_destroy(&device->pipeline_cache, destroy_pipeline_cache_entry, device); - - pthread_mutex_unlock(&device->pipeline_cache_mutex); pthread_mutex_destroy(&device->pipeline_cache_mutex); } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7ee5f4dc19c5..f6ccb247553c 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1042,6 +1042,19 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, return S_OK; } +struct vkd3d_pipeline_key +{ + VkPrimitiveTopology topology; + uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; +}; + +struct vkd3d_compiled_pipeline +{ + struct list entry; + struct vkd3d_pipeline_key key; + VkPipeline vk_pipeline; +}; + /* ID3D12PipelineState */ static inline struct d3d12_pipeline_state *impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) { @@ -1080,6 +1093,27 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_AddRef(ID3D12PipelineState * return refcount; } +static void d3d12_pipeline_state_destroy_graphics(struct d3d12_pipeline_state *state, + struct d3d12_device *device) +{ + struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct vkd3d_compiled_pipeline *current, *e; + unsigned int i; + + for (i = 0; i < graphics->stage_count; ++i) + { + VK_CALL(vkDestroyShaderModule(device->vk_device, graphics->stages[i].module, NULL)); + } + VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); + + LIST_FOR_EACH_ENTRY_SAFE(current, e, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry) + { + VK_CALL(vkDestroyPipeline(device->vk_device, current->vk_pipeline, NULL)); + vkd3d_free(current); + } +} + static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState *iface) { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); @@ -1091,24 +1125,11 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState { struct d3d12_device *device = state->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - unsigned int i; if (d3d12_pipeline_state_is_graphics(state)) - { - struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; - - for (i = 0; i < graphics->stage_count; ++i) - { - VK_CALL(vkDestroyShaderModule(device->vk_device, graphics->stages[i].module, NULL)); - } - VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); - - d3d12_device_destroy_compiled_pipelines(device, &graphics->compiled_pipelines); - } + d3d12_pipeline_state_destroy_graphics(state, device); else if (d3d12_pipeline_state_is_compute(state)) - { VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); - } if (state->vk_set_layout) VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); @@ -2235,6 +2256,73 @@ HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, return S_OK; } +static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12_pipeline_state *state, + const struct vkd3d_pipeline_key *key) +{ + const struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; + struct d3d12_device *device = state->device; + VkPipeline vk_pipeline = VK_NULL_HANDLE; + struct vkd3d_compiled_pipeline *current; + int rc; + + if (!(rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + LIST_FOR_EACH_ENTRY(current, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry) + { + if (!memcmp(&current->key, key, sizeof(*key))) + { + vk_pipeline = current->vk_pipeline; + break; + } + } + pthread_mutex_unlock(&device->pipeline_cache_mutex); + } + else + { + ERR("Failed to lock mutex, error %d.\n", rc); + } + + return vk_pipeline; +} + +static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_state *state, + const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline) +{ + struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; + struct vkd3d_compiled_pipeline *compiled_pipeline, *current; + struct d3d12_device *device = state->device; + int rc; + + if (!(compiled_pipeline = vkd3d_malloc(sizeof(*compiled_pipeline)))) + return false; + + compiled_pipeline->key = *key; + compiled_pipeline->vk_pipeline = vk_pipeline; + + if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + vkd3d_free(compiled_pipeline); + return false; + } + + LIST_FOR_EACH_ENTRY(current, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry) + { + if (!memcmp(&current->key, key, sizeof(*key))) + { + vkd3d_free(compiled_pipeline); + compiled_pipeline = NULL; + break; + } + } + + if (compiled_pipeline) + list_add_tail(&graphics->compiled_pipelines, &compiled_pipeline->entry); + + pthread_mutex_unlock(&device->pipeline_cache_mutex); + return compiled_pipeline; +} + VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, VkPrimitiveTopology topology, const uint32_t *strides) { @@ -2313,7 +2401,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ++binding_count; } - if ((vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key))) + if ((vk_pipeline = d3d12_pipeline_state_find_compiled_pipeline(state, &pipeline_key))) return vk_pipeline; input_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; @@ -2368,12 +2456,12 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta return VK_NULL_HANDLE; } - if (d3d12_device_put_pipeline_to_cache(device, &pipeline_key, vk_pipeline, &graphics->compiled_pipelines)) + if (d3d12_pipeline_state_put_pipeline_to_cache(state, &pipeline_key, vk_pipeline)) return vk_pipeline; /* Other thread compiled the pipeline before us. */ VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); - vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key); + vk_pipeline = d3d12_pipeline_state_find_compiled_pipeline(state, &pipeline_key); if (!vk_pipeline) ERR("Could not get the pipeline compiled by other thread from the cache.\n"); return vk_pipeline; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 99a59cb7d018..f60dc5f96676 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -573,21 +573,6 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; -struct vkd3d_pipeline_key -{ - const struct d3d12_graphics_pipeline_state *state; - VkPrimitiveTopology topology; - uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; -}; - -struct vkd3d_compiled_pipeline -{ - struct rb_entry entry; - struct vkd3d_pipeline_key key; - VkPipeline vk_pipeline; - struct list list; -}; - struct vkd3d_buffer { VkBuffer vk_buffer; @@ -810,12 +795,6 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; -void d3d12_device_destroy_compiled_pipelines(struct d3d12_device *device, struct list *list) DECLSPEC_HIDDEN; -VkPipeline d3d12_device_find_cached_pipeline(struct d3d12_device *device, - const struct vkd3d_pipeline_key *key) DECLSPEC_HIDDEN; -bool d3d12_device_put_pipeline_to_cache(struct d3d12_device *device, - const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline, struct list *list) DECLSPEC_HIDDEN; - /* utils */ struct vkd3d_format { -- 2.18.1

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Fix typo in vkd3d_dxbc_compiler_have_combined_sampler().
by Józef Kucia Oct. 24, 2018

Oct. 24, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0813f49516aa..f6e5746084e1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2043,7 +2043,7 @@ static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_co { combined_sampler = &shader_interface->combined_samplers[i]; - if (!(resource || combined_sampler->resource_index == resource->idx[0].offset) + if ((!resource || combined_sampler->resource_index == resource->idx[0].offset) && (!sampler || combined_sampler->sampler_index == sampler->idx[0].offset)) return true; } -- 2.18.1

2 1

[PATCH vkd3d 2/6] demos: Check return value of ID3D12Fence_SetEventOnCompletion() (Coverity).
by Józef Kucia Oct. 24, 2018

Oct. 24, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- demos/gears.c | 3 ++- demos/triangle.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/demos/gears.c b/demos/gears.c index f7b8cadaba74..72916dc77417 100644 --- a/demos/gears.c +++ b/demos/gears.c @@ -218,7 +218,8 @@ static void cxg_wait_for_previous_frame(struct cx_gears *cxg) if (ID3D12Fence_GetCompletedValue(fence->fence) < v) { - ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event); + hr = ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event); + assert(SUCCEEDED(hr)); demo_wait_event(fence->event, INFINITE); } diff --git a/demos/triangle.c b/demos/triangle.c index 15f348f64856..96ad83794d8d 100644 --- a/demos/triangle.c +++ b/demos/triangle.c @@ -142,7 +142,8 @@ static void cxt_wait_for_previous_frame(struct cx_triangle *cxt) if (ID3D12Fence_GetCompletedValue(fence->fence) < v) { - ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event); + hr = ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event); + assert(SUCCEEDED(hr)); demo_wait_event(fence->event, INFINITE); } -- 2.18.1

2 1

[PATCH vkd3d 4/6] tests: Add option to select adapter.
by Józef Kucia Oct. 24, 2018

Oct. 24, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 15cd28241da7..f5104a5e1cd7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -826,47 +826,68 @@ static void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture, got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); } +static bool use_warp_device; +static unsigned int use_adapter_idx; + #ifdef _WIN32 -static IUnknown *create_warp_adapter(void) +static IUnknown *create_warp_adapter(IDXGIFactory4 *factory) { - IDXGIFactory4 *factory; IUnknown *adapter; HRESULT hr; - hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to create IDXGIFactory4, hr %#x.\n", hr); - adapter = NULL; hr = IDXGIFactory4_EnumWarpAdapter(factory, &IID_IUnknown, (void **)&adapter); - IDXGIFactory4_Release(factory); if (FAILED(hr)) trace("Failed to get WARP adapter, hr %#x.\n", hr); return adapter; } + +static IUnknown *create_adapter(void) +{ + IUnknown *adapter = NULL; + IDXGIFactory4 *factory; + HRESULT hr; + + hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); + + if (use_warp_device && !(adapter = create_warp_adapter(factory))) + { + IDXGIFactory4_Release(factory); + return adapter; + } + + if (use_adapter_idx) + hr = IDXGIFactory4_EnumAdapters(factory, use_adapter_idx, (IDXGIAdapter **)&adapter); + IDXGIFactory4_Release(factory); + if (FAILED(hr)) + trace("Failed to get adapter, hr %#x.\n", hr); + return adapter; +} #else -static IUnknown *create_warp_adapter(void) +static IUnknown *create_adapter(void) { return NULL; } #endif -static bool use_warp_device; - static ID3D12Device *create_device(void) { IUnknown *adapter = NULL; ID3D12Device *device; + HRESULT hr; - if (use_warp_device && !(adapter = create_warp_adapter())) + if ((use_warp_device || use_adapter_idx) && !(adapter = create_adapter())) { - trace("Failed to create WARP device.\n"); + trace("Failed to create adapter.\n"); return NULL; } - if (FAILED(D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) - return NULL; + hr = D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + if (adapter) + IUnknown_Release(adapter); - return device; + return SUCCEEDED(hr) ? device : NULL; } static bool broken_on_warp(bool condition) @@ -20596,6 +20617,8 @@ START_TEST(d3d12) enable_debug_layer = true; else if (!strcmp(argv[i], "--warp")) use_warp_device = true; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); } if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) -- 2.18.1

2 1

[PATCH vkd3d 5/6] vkd3d: Make pipeline state responsible for creating Vulkan pipelines.
by Józef Kucia Oct. 24, 2018

Oct. 24, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 149 +------------------------------------ libs/vkd3d/state.c | 148 +++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 7 ++ 3 files changed, 157 insertions(+), 147 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d8a65622507d..7e7b3ee5d9c7 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1818,148 +1818,6 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l return true; } -static VkPipeline d3d12_command_list_get_or_create_pipeline(struct d3d12_command_list *list, - struct d3d12_graphics_pipeline_state *state) -{ - struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - struct VkPipelineVertexInputStateCreateInfo input_desc; - struct VkPipelineInputAssemblyStateCreateInfo ia_desc; - struct VkPipelineColorBlendStateCreateInfo blend_desc; - struct VkGraphicsPipelineCreateInfo pipeline_desc; - struct d3d12_device *device = list->device; - struct vkd3d_pipeline_key pipeline_key; - size_t binding_count = 0; - VkPipeline vk_pipeline; - unsigned int i; - uint32_t mask; - VkResult vr; - - static const struct VkPipelineViewportStateCreateInfo vp_desc = - { - .sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO, - .pNext = NULL, - .flags = 0, - .viewportCount = 1, - .pViewports = NULL, - .scissorCount = 1, - .pScissors = NULL, - }; - static const enum VkDynamicState dynamic_states[] = - { - VK_DYNAMIC_STATE_VIEWPORT, - VK_DYNAMIC_STATE_SCISSOR, - VK_DYNAMIC_STATE_BLEND_CONSTANTS, - VK_DYNAMIC_STATE_STENCIL_REFERENCE, - }; - static const struct VkPipelineDynamicStateCreateInfo dynamic_desc = - { - .sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO, - .pNext = NULL, - .flags = 0, - .dynamicStateCount = ARRAY_SIZE(dynamic_states), - .pDynamicStates = dynamic_states, - }; - - memset(&pipeline_key, 0, sizeof(pipeline_key)); - pipeline_key.state = state; - pipeline_key.topology = list->primitive_topology; - - for (i = 0, mask = 0; i < state->attribute_count; ++i) - { - struct VkVertexInputBindingDescription *b; - uint32_t binding; - - binding = state->attributes[i].binding; - if (mask & (1u << binding)) - continue; - - if (binding_count == ARRAY_SIZE(bindings)) - { - FIXME("Maximum binding count exceeded.\n"); - break; - } - - mask |= 1u << binding; - b = &bindings[binding_count]; - b->binding = binding; - b->stride = list->strides[binding]; - b->inputRate = state->input_rates[binding]; - - if (!b->stride) - FIXME("Invalid stride for input slot %u.\n", binding); - - pipeline_key.strides[binding_count] = list->strides[binding]; - - ++binding_count; - } - - if ((vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key))) - return vk_pipeline; - - input_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; - input_desc.pNext = NULL; - input_desc.flags = 0; - input_desc.vertexBindingDescriptionCount = binding_count; - input_desc.pVertexBindingDescriptions = bindings; - input_desc.vertexAttributeDescriptionCount = state->attribute_count; - input_desc.pVertexAttributeDescriptions = state->attributes; - - ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; - ia_desc.pNext = NULL; - ia_desc.flags = 0; - ia_desc.topology = list->primitive_topology; - ia_desc.primitiveRestartEnable = VK_FALSE; - - blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; - blend_desc.pNext = NULL; - blend_desc.flags = 0; - blend_desc.logicOpEnable = VK_FALSE; - blend_desc.logicOp = VK_LOGIC_OP_COPY; - blend_desc.attachmentCount = state->attachment_count - state->rt_idx; - blend_desc.pAttachments = state->blend_attachments; - blend_desc.blendConstants[0] = D3D12_DEFAULT_BLEND_FACTOR_RED; - blend_desc.blendConstants[1] = D3D12_DEFAULT_BLEND_FACTOR_GREEN; - blend_desc.blendConstants[2] = D3D12_DEFAULT_BLEND_FACTOR_BLUE; - blend_desc.blendConstants[3] = D3D12_DEFAULT_BLEND_FACTOR_ALPHA; - - pipeline_desc.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; - pipeline_desc.pNext = NULL; - pipeline_desc.flags = 0; - pipeline_desc.stageCount = state->stage_count; - pipeline_desc.pStages = state->stages; - pipeline_desc.pVertexInputState = &input_desc; - pipeline_desc.pInputAssemblyState = &ia_desc; - pipeline_desc.pTessellationState = NULL; - pipeline_desc.pViewportState = &vp_desc; - pipeline_desc.pRasterizationState = &state->rs_desc; - pipeline_desc.pMultisampleState = &state->ms_desc; - pipeline_desc.pDepthStencilState = &state->ds_desc; - pipeline_desc.pColorBlendState = &blend_desc; - pipeline_desc.pDynamicState = &dynamic_desc; - pipeline_desc.layout = state->root_signature->vk_pipeline_layout; - pipeline_desc.renderPass = state->render_pass; - pipeline_desc.subpass = 0; - pipeline_desc.basePipelineHandle = VK_NULL_HANDLE; - pipeline_desc.basePipelineIndex = -1; - if ((vr = VK_CALL(vkCreateGraphicsPipelines(device->vk_device, device->vk_pipeline_cache, - 1, &pipeline_desc, NULL, &vk_pipeline))) < 0) - { - WARN("Failed to create Vulkan graphics pipeline, vr %d.\n", vr); - return VK_NULL_HANDLE; - } - - if (d3d12_device_put_pipeline_to_cache(device, &pipeline_key, vk_pipeline, &state->compiled_pipelines)) - return vk_pipeline; - - /* Other thread compiled the pipeline before us. */ - VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); - vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key); - if (!vk_pipeline) - ERR("Could not get the pipeline compiled by other thread from the cache.\n"); - return vk_pipeline; -} - static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list *list) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; @@ -1968,13 +1826,14 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list if (list->current_pipeline != VK_NULL_HANDLE) return true; - if (list->state->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) + if (!d3d12_pipeline_state_is_graphics(list->state)) { - WARN("Pipeline state %p has bind point %#x.\n", list->state, list->state->vk_bind_point); + WARN("Pipeline state %p is not a graphics pipeline.\n", list->state); return false; } - if (!(vk_pipeline = d3d12_command_list_get_or_create_pipeline(list, &list->state->u.graphics))) + if (!(vk_pipeline = d3d12_pipeline_state_get_or_create_pipeline(list->state, + list->primitive_topology, list->strides))) return false; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index db761d884756..7ee5f4dc19c5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1093,7 +1093,7 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; unsigned int i; - if (state->vk_bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS) + if (d3d12_pipeline_state_is_graphics(state)) { struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; @@ -1105,7 +1105,7 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState d3d12_device_destroy_compiled_pipelines(device, &graphics->compiled_pipelines); } - else if (state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE) + else if (d3d12_pipeline_state_is_compute(state)) { VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); } @@ -2234,3 +2234,147 @@ HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, return S_OK; } + +VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, + VkPrimitiveTopology topology, const uint32_t *strides) +{ + struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; + const struct vkd3d_vk_device_procs *vk_procs = &state->device->vk_procs; + struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; + struct VkPipelineVertexInputStateCreateInfo input_desc; + struct VkPipelineInputAssemblyStateCreateInfo ia_desc; + struct VkPipelineColorBlendStateCreateInfo blend_desc; + struct VkGraphicsPipelineCreateInfo pipeline_desc; + struct d3d12_device *device = state->device; + struct vkd3d_pipeline_key pipeline_key; + size_t binding_count = 0; + VkPipeline vk_pipeline; + unsigned int i; + uint32_t mask; + VkResult vr; + + static const struct VkPipelineViewportStateCreateInfo vp_desc = + { + .sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO, + .pNext = NULL, + .flags = 0, + .viewportCount = 1, + .pViewports = NULL, + .scissorCount = 1, + .pScissors = NULL, + }; + static const enum VkDynamicState dynamic_states[] = + { + VK_DYNAMIC_STATE_VIEWPORT, + VK_DYNAMIC_STATE_SCISSOR, + VK_DYNAMIC_STATE_BLEND_CONSTANTS, + VK_DYNAMIC_STATE_STENCIL_REFERENCE, + }; + static const struct VkPipelineDynamicStateCreateInfo dynamic_desc = + { + .sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO, + .pNext = NULL, + .flags = 0, + .dynamicStateCount = ARRAY_SIZE(dynamic_states), + .pDynamicStates = dynamic_states, + }; + + assert(d3d12_pipeline_state_is_graphics(state)); + + memset(&pipeline_key, 0, sizeof(pipeline_key)); + pipeline_key.topology = topology; + + for (i = 0, mask = 0; i < graphics->attribute_count; ++i) + { + struct VkVertexInputBindingDescription *b; + uint32_t binding; + + binding = graphics->attributes[i].binding; + if (mask & (1u << binding)) + continue; + + if (binding_count == ARRAY_SIZE(bindings)) + { + FIXME("Maximum binding count exceeded.\n"); + break; + } + + mask |= 1u << binding; + b = &bindings[binding_count]; + b->binding = binding; + b->stride = strides[binding]; + b->inputRate = graphics->input_rates[binding]; + + if (!b->stride) + FIXME("Invalid stride for input slot %u.\n", binding); + + pipeline_key.strides[binding_count] = strides[binding]; + + ++binding_count; + } + + if ((vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key))) + return vk_pipeline; + + input_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; + input_desc.pNext = NULL; + input_desc.flags = 0; + input_desc.vertexBindingDescriptionCount = binding_count; + input_desc.pVertexBindingDescriptions = bindings; + input_desc.vertexAttributeDescriptionCount = graphics->attribute_count; + input_desc.pVertexAttributeDescriptions = graphics->attributes; + + ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; + ia_desc.pNext = NULL; + ia_desc.flags = 0; + ia_desc.topology = topology; + ia_desc.primitiveRestartEnable = VK_FALSE; + + blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; + blend_desc.pNext = NULL; + blend_desc.flags = 0; + blend_desc.logicOpEnable = VK_FALSE; + blend_desc.logicOp = VK_LOGIC_OP_COPY; + blend_desc.attachmentCount = graphics->attachment_count - graphics->rt_idx; + blend_desc.pAttachments = graphics->blend_attachments; + blend_desc.blendConstants[0] = D3D12_DEFAULT_BLEND_FACTOR_RED; + blend_desc.blendConstants[1] = D3D12_DEFAULT_BLEND_FACTOR_GREEN; + blend_desc.blendConstants[2] = D3D12_DEFAULT_BLEND_FACTOR_BLUE; + blend_desc.blendConstants[3] = D3D12_DEFAULT_BLEND_FACTOR_ALPHA; + + pipeline_desc.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; + pipeline_desc.pNext = NULL; + pipeline_desc.flags = 0; + pipeline_desc.stageCount = graphics->stage_count; + pipeline_desc.pStages = graphics->stages; + pipeline_desc.pVertexInputState = &input_desc; + pipeline_desc.pInputAssemblyState = &ia_desc; + pipeline_desc.pTessellationState = NULL; + pipeline_desc.pViewportState = &vp_desc; + pipeline_desc.pRasterizationState = &graphics->rs_desc; + pipeline_desc.pMultisampleState = &graphics->ms_desc; + pipeline_desc.pDepthStencilState = &graphics->ds_desc; + pipeline_desc.pColorBlendState = &blend_desc; + pipeline_desc.pDynamicState = &dynamic_desc; + pipeline_desc.layout = graphics->root_signature->vk_pipeline_layout; + pipeline_desc.renderPass = graphics->render_pass; + pipeline_desc.subpass = 0; + pipeline_desc.basePipelineHandle = VK_NULL_HANDLE; + pipeline_desc.basePipelineIndex = -1; + if ((vr = VK_CALL(vkCreateGraphicsPipelines(device->vk_device, device->vk_pipeline_cache, + 1, &pipeline_desc, NULL, &vk_pipeline))) < 0) + { + WARN("Failed to create Vulkan graphics pipeline, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + + if (d3d12_device_put_pipeline_to_cache(device, &pipeline_key, vk_pipeline, &graphics->compiled_pipelines)) + return vk_pipeline; + + /* Other thread compiled the pipeline before us. */ + VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); + vk_pipeline = d3d12_device_find_cached_pipeline(device, &pipeline_key); + if (!vk_pipeline) + ERR("Could not get the pipeline compiled by other thread from the cache.\n"); + return vk_pipeline; +} diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index cb3d597a18a1..99a59cb7d018 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -558,10 +558,17 @@ static inline bool d3d12_pipeline_state_is_compute(const struct d3d12_pipeline_s return state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE; } +static inline bool d3d12_pipeline_state_is_graphics(const struct d3d12_pipeline_state *state) +{ + return state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS; +} + HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; +VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, + VkPrimitiveTopology topology, const uint32_t *strides) DECLSPEC_HIDDEN; bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; -- 2.18.1

2 1

[PATCH] ntdll/tests: Add a test for qsort() stability.
by Nikolay Sivov Oct. 24, 2018

Oct. 24, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/string.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 708d6e7b65..0ab28ff1c6 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1189,6 +1189,16 @@ static int __cdecl strcomparefunc(const void *a, const void *b) return lstrcmpA(*p, *q); } +static int __cdecl istrcomparefunc(const void *a, const void *b) +{ + const char * const *p = a; + const char * const *q = b; + + ok (a != b, "must never get the same pointer\n"); + + return lstrcmpiA(*p, *q); +} + static void test_qsort(void) { int arr[5] = { 23, 42, 8, 4, 16 }; @@ -1202,6 +1212,15 @@ static void test_qsort(void) "Sorted", "." }; + const char *strarr2[7] = { + "Hello", + "Wine", + "World", + "!", + "wine", + "Sorted", + "WINE" + }; p_qsort ((void*)arr, 0, sizeof(int), intcomparefunc); ok(arr[0] == 23, "badly sorted, nmemb=0, arr[0] is %d\n", arr[0]); @@ -1246,6 +1265,17 @@ static void test_qsort(void) ok(!strcmp(strarr[4],"Sorted"), "badly sorted, strarr[4] is %s\n", strarr[4]); ok(!strcmp(strarr[5],"Wine"), "badly sorted, strarr[5] is %s\n", strarr[5]); ok(!strcmp(strarr[6],"World"), "badly sorted, strarr[6] is %s\n", strarr[6]); + + p_qsort ((void*)strarr2, 7, sizeof(char*), istrcomparefunc); + ok(!strcmp(strarr2[0], "!"), "badly sorted, strar2r[0] is %s\n", strarr2[0]); + ok(!strcmp(strarr2[1], "Hello"), "badly sorted, strarr2[1] is %s\n", strarr2[1]); + ok(!strcmp(strarr2[2], "Sorted"), "badly sorted, strarr2[2] is %s\n", strarr2[2]); +todo_wine { + ok(!strcmp(strarr2[3], "wine"), "badly sorted, strarr2[3] is %s\n", strarr2[3]); + ok(!strcmp(strarr2[4], "WINE"), "badly sorted, strarr2[4] is %s\n", strarr2[4]); + ok(!strcmp(strarr2[5], "Wine"), "badly sorted, strarr2[5] is %s\n", strarr2[5]); +} + ok(!strcmp(strarr2[6], "World"), "badly sorted, strarr2[6] is %s\n", strarr2[6]); } static void test_bsearch(void) -- 2.19.1

1 0

[PATCH] shell32: Add bitmap resources for ids 133 and 134. (v3)
by Dmitry Timoshkov Oct. 24, 2018

Oct. 24, 2018

I decided to copy different user32 bitmaps and rotate them by 90 degrees, this version looks much better IMO. This patch makes an application that uses these bitmaps in its own dialogs work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/shell32/resources/idb_sort_decr.bmp | Bin 0 -> 838 bytes dlls/shell32/resources/idb_sort_incr.bmp | Bin 0 -> 838 bytes dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 3 +++ 4 files changed, 9 insertions(+) create mode 100644 dlls/shell32/resources/idb_sort_decr.bmp create mode 100644 dlls/shell32/resources/idb_sort_incr.bmp diff --git a/dlls/shell32/resources/idb_sort_decr.bmp b/dlls/shell32/resources/idb_sort_decr.bmp new file mode 100644 index 0000000000000000000000000000000000000000..69565521015f3440c10196221bfda29a9cc531b4 GIT binary patch literal 838 zcmZ?rbz^1#12Z700mOVz%*dbsWHB%Z0Of_bAs8$GBu-tq(a)_!`Ylb0_O^d~WDfI;>j pgh>fAm>w8Sj9!>pbQ+&tbhYSwY<fX{CI(~EI~c@>i8E5%2>|bvb5;NV literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/idb_sort_incr.bmp b/dlls/shell32/resources/idb_sort_incr.bmp new file mode 100644 index 0000000000000000000000000000000000000000..0d9b6a20646e5da62e5474f8e4cee61b4437406d GIT binary patch literal 838 zcmZ?rbz^1#12Z700mOVz%*dbsWHB%Z0Of_bAs8$GBu-tq@}FAx<mJm$GmBbof|&zy w8!;HB9+?IP(|>#zSuHvnmp*iL*!bvrv8ll&2Gfg69wtsqoDri2X5LVz0UD!oRsaA1 literal 0 HcmV?d00001 diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5c11590d7c..46f0b6f12d 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1064,6 +1064,12 @@ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_BROWSER ICON resources/internet.ico +/* @makedep: resources/idb_sort_incr.bmp */ +IDB_SORT_INCR BITMAP resources/idb_sort_incr.bmp + +/* @makedep: resources/idb_sort_decr.bmp */ +IDB_SORT_DECR BITMAP resources/idb_sort_decr.bmp + /* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 16c92936ab..92185d637e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -424,6 +424,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi #define IDC_FPROP_ARCHIVE 13021 /* bitmaps */ +#define IDB_SORT_INCR 133 +#define IDB_SORT_DECR 134 + /* explorer toolbar icons * FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now */ -- 2.17.1

1 0

[PATCH] start: Try cycling through extensions if original path failed to execute.
by Nikolay Sivov Oct. 24, 2018

Oct. 24, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/start/start.c | 50 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/programs/start/start.c b/programs/start/start.c index 32372ecc34..ccec9bc1f9 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -403,7 +403,55 @@ int wmain (int argc, WCHAR *argv[]) } if (!ShellExecuteExW(&sei)) - fatal_string_error(STRING_EXECFAIL, GetLastError(), sei.lpFile); + { + static const WCHAR pathextW[] = {'P','A','T','H','E','X','T',0}; + const WCHAR *filename = sei.lpFile; + DWORD size, filename_len; + WCHAR *name, *env; + + size = GetEnvironmentVariableW(pathextW, NULL, 0); + if (size) + { + WCHAR *start, *ptr; + + env = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!env) + fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); + GetEnvironmentVariableW(pathextW, env, size); + + filename_len = strlenW(filename); + name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); + if (!name) + fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); + + sei.lpFile = name; + start = env; + while ((ptr = strchrW(start, ';'))) + { + if (start == ptr) + { + start = ptr + 1; + continue; + } + + strcpyW(name, filename); + memcpy(&name[filename_len], start, (ptr - start) * sizeof(WCHAR)); + name[filename_len + (ptr - start)] = 0; + + if (ShellExecuteExW(&sei)) + { + HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, env); + goto done; + } + + start = ptr + 1; + } + + } + + fatal_string_error(STRING_EXECFAIL, GetLastError(), filename); + } done: HeapFree( GetProcessHeap(), 0, args ); -- 2.19.1

1 0

[PATCH] msi/tests: Add a trailing '\n' to an ok() call.
by Francois Gouget Oct. 24, 2018

Oct. 24, 2018

--- dlls/msi/tests/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 22698d8a5e0..76566004d7d 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -14210,7 +14210,7 @@ static void test_setpropertyfolder(void) ok(delete_pf("msitest\\maximus", TRUE), "file not installed\n"); ok(delete_pf("msitest", FALSE), "directory not created\n"); - ok(DeleteFileA("c:\\parent\\child\\Shortcut.lnk"), "file not installed"); + ok(DeleteFileA("c:\\parent\\child\\Shortcut.lnk"), "file not installed\n"); ok(RemoveDirectoryA("c:\\parent\\child"), "directory not created\n"); ok(RemoveDirectoryA("c:\\parent"), "directory not created\n"); -- 2.19.1

3 2