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

[PATCH] ddraw/tests: Make test_depth_readback work on Nvidia GPUs on Windows (v2).
by Stefan Dösinger Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Version 2: Remove a redundant broken() around ddraw_is_nvidia(). I consider the behavior of these GPUs generally broken, but at least one format is working on all of them. We just don't know in advance which one, and on at least my Geforce 9 an actual game is broken too. This test accepts a few known failure conditions as broken, but expects at least one format to pass in ddraw2 - ddraw4. ddraw1 only has D16, which fails on GF9, so don't even attempt to run the test. I previously seemed to have results with "reversed" 32 bit formats (S8D24/X8D24 instead of D24S8/D24X8), but I could not reproduce this any more today. I suspect I did something wrong with adjusting the expected results for the shifted depth mask. --- dlls/ddraw/tests/ddraw1.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw2.c | 16 ++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw7.c | 33 ++++++++++++++++++++++++++++++--- 4 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb56980800..626b07bace 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10840,6 +10840,18 @@ static void test_depth_readback(void) ok(!!window, "Failed to create a window.\n"); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (ddraw_is_nvidia(ddraw)) + { + /* ddraw1 only has access to D16 Z buffers (and D24 ones, which are even more + * broken on Nvidia), so don't even attempt to run this test on Nvidia cards + * because some of them have broken D16 readback. See the ddraw7 version of + * this test for a more detailed comment. */ + skip("Some Nvidia GPUs have broken D16 readback, skipping.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a D3D device, skipping tests.\n"); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index faf7cefdc8..1ab1f9c591 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12211,7 +12211,7 @@ static void test_set_render_state(void) static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, passed_fmts = 0; IDirect3DMaterial2 *blue_background; IDirectDrawSurface *rt, *ds; IDirect3DViewport2 *viewport; @@ -12223,6 +12223,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; void *ptr; + BOOL all_pass; static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static D3DLVERTEX quad[] = @@ -12307,6 +12308,7 @@ static void test_depth_readback(void) hr = IDirectDrawSurface_Lock(ds, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -12317,20 +12319,30 @@ static void test_depth_readback(void) depth = *((DWORD *)ptr) & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; - ok(abs(expected_depth - depth) <= max_diff, + /* The ddraw2 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, + * except that we only have D16 (broken on geforce 9) and D24X8 (broken on geforce 7) available. + * Accept all nvidia GPUs as broken here, but still expect one of the formats to pass. */ + ok(abs(expected_depth - depth) <= max_diff || ddraw_is_nvidia(ddraw), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; } } hr = IDirectDrawSurface_Unlock(ds, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + if (all_pass) + passed_fmts++; + hr = IDirectDrawSurface_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + destroy_viewport(device, viewport); destroy_material(blue_background); IDirectDrawSurface_Release(rt); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1f0b01bdde..02b10b5ccb 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14313,7 +14313,7 @@ static void test_map_synchronisation(void) static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, passed_fmts = 0; IDirectDrawSurface4 *rt, *ds; IDirect3DViewport3 *viewport; DDSURFACEDESC2 surface_desc; @@ -14325,6 +14325,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; RECT r; + BOOL all_pass; static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static struct @@ -14421,6 +14422,7 @@ static void test_depth_readback(void) hr = IDirect3DDevice3_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -14434,21 +14436,32 @@ static void test_depth_readback(void) depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + /* The ddraw4 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, + * except that Geforce 7 also returns garbage data in D24S8, whereas the ddraw7 version + * returns 0 for that format. Give up on pre-filtering formats, accept Nvidia as generally + * broken here, but still expect at least one format (D16 or D24X8 in practise) to pass. */ todo_wine_if(tests[i].todo) - ok(abs(expected_depth - depth) <= max_diff, - "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", - i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + ok(abs(expected_depth - depth) <= max_diff || ddraw_is_nvidia(ddraw), + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; hr = IDirectDrawSurface4_Unlock(ds, &r); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); } } + if (all_pass) + passed_fmts++; + hr = IDirectDrawSurface4_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface4_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + destroy_viewport(device, viewport); IDirectDrawSurface4_Release(rt); IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2e41ff3715..43c52aa8b9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13689,7 +13689,7 @@ done: static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, raw_value, passed_fmts = 0; IDirectDrawSurface7 *rt, *ds; DDSURFACEDESC2 surface_desc; IDirect3DDevice7 *device; @@ -13700,6 +13700,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; RECT r; + BOOL all_zero, all_one, all_pass; static struct { @@ -13791,6 +13792,7 @@ static void test_depth_readback(void) hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + all_zero = all_one = all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -13801,24 +13803,49 @@ static void test_depth_readback(void) hr = IDirectDrawSurface7_Lock(ds, &r, &surface_desc, DDLOCK_READONLY, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); - depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; + raw_value = *((DWORD *)surface_desc.lpSurface); + if (raw_value) + all_zero = FALSE; + if (raw_value != 0x00ffffff) + all_one = FALSE; + + depth = raw_value & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + /* This test is very reliably on AMD, but fails in a number of interesting ways on Nvidia GPUs: + * + * Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data. + * + * Geforce 9 GPUs return return broken data for D16 that resembles the expected data in + * the lower 8 bits and has 0xff in the upper 8 bits. D24X8 works, D24 and D24S8 return + * 0x00ffffff. + * + * Geforce GTX 650 has working D16 and D24, but D24S8 returns 0. + * + * Arx Fatalis is broken on the Geforce 9 in the same way it was broken in Wine (bug 43654). + * The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7. */ todo_wine_if(tests[i].todo) - ok(abs(expected_depth - depth) <= max_diff, + ok(abs(expected_depth - depth) <= max_diff + || (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; hr = IDirectDrawSurface7_Unlock(ds, &r); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); } } + if (all_pass) + passed_fmts++; hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface7_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + IDirectDrawSurface7_Release(rt); IDirectDraw7_Release(ddraw); IDirect3D7_Release(d3d); -- 2.13.6

2 1

[PATCH 1/5] include: Add shellscalingapi.h
by Alex Henrie Jan. 23, 2018

Jan. 23, 2018

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Patch adapted from Wine Staging. include/Makefile.in | 1 + include/shellscalingapi.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 include/shellscalingapi.h diff --git a/include/Makefile.in b/include/Makefile.in index bb6f8d6fab..b975dd585e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -617,6 +617,7 @@ HEADER_SRCS = \ sfc.h \ shdispid.h \ shellapi.h \ + shellscalingapi.h \ shlguid.h \ shlobj.h \ shlwapi.h \ diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h new file mode 100644 index 0000000000..4999db741a --- /dev/null +++ b/include/shellscalingapi.h @@ -0,0 +1,37 @@ +/* + * Copyright 2016 Sebastian Lackner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SHELLSCALINGAPI_H +#define __WINE_SHELLSCALINGAPI_H + +typedef enum MONITOR_DPI_TYPE +{ + MDT_EFFECTIVE_DPI = 0, + MDT_ANGULAR_DPI = 1, + MDT_RAW_DPI = 2, + MDT_DEFAULT = MDT_EFFECTIVE_DPI, +} MONITOR_DPI_TYPE; + +typedef enum PROCESS_DPI_AWARENESS +{ + PROCESS_DPI_UNAWARE = 0, + PROCESS_SYSTEM_DPI_AWARE = 1, + PROCESS_PER_MONITOR_DPI_AWARE = 2, +} PROCESS_DPI_AWARENESS; + +#endif /* __WINE_SHELLSCALINGAPI_H */ -- 2.16.1

2 5

[PATCH]uxtheme: add stub for SetWindowThemeAttribute
by Louis Lenders Jan. 23, 2018

Jan. 23, 2018

this is for https://bugs.winehq.org/show_bug.cgi?id=42085 using >XP mode

1 0

[PATCH vkd3d 1/3] libs/vkd3d: Allow library user to enable additional instance extensions.
by Józef Kucia Jan. 23, 2018

Jan. 23, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 3 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 7 +-- libs/vkd3d/device.c | 92 ++++++++++++++++++++++++++++--------- 3 files changed, 76 insertions(+), 26 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index ac37c26f4a9a..0eb85ea27d2e 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -52,6 +52,9 @@ struct vkd3d_instance_create_info /* If set to NULL, libvkd3d loads libvulkan. */ PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr_pfn; + + const char * const *instance_extensions; + uint32_t instance_extension_count; }; struct vkd3d_device_create_info diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index f68c47badd5c..fb4344ebf086 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -37,16 +37,13 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, if (adapter) FIXME("Ignoring adapter %p.\n", adapter); + memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.signal_event_pfn = vkd3d_signal_event; - instance_create_info.create_thread_pfn = NULL; - instance_create_info.join_thread_pfn = NULL; instance_create_info.wchar_size = sizeof(WCHAR); - instance_create_info.vkGetInstanceProcAddr_pfn = NULL; + memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.minimum_feature_level = minimum_feature_level; - device_create_info.instance = NULL; device_create_info.instance_create_info = &instance_create_info; - device_create_info.vk_physical_device = VK_NULL_HANDLE; return vkd3d_create_device(&device_create_info, riid, device); } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7a9951122e4d..21e09f10fad8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -38,9 +38,6 @@ static const struct vkd3d_optional_extension_info optional_instance_extensions[] offsetof(struct vkd3d_vulkan_info, KHR_get_physical_device_properties2)}, }; -#define MAX_INSTANCE_EXTENSION_COUNT \ - (ARRAY_SIZE(required_instance_extensions) + ARRAY_SIZE(optional_instance_extensions)) - static const char * const required_device_extensions[] = { VK_KHR_MAINTENANCE1_EXTENSION_NAME, @@ -90,11 +87,13 @@ static bool has_extension(const VkExtensionProperties *extensions, return false; } -static void vkd3d_check_extensions(const VkExtensionProperties *extensions, unsigned int count, +static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensions, unsigned int count, const char * const *required_extensions, unsigned int required_extension_count, const struct vkd3d_optional_extension_info *optional_extensions, unsigned int optional_extension_count, + const char * const *user_extensions, unsigned int user_extension_count, struct vkd3d_vulkan_info *vulkan_info, const char *extension_type) { + unsigned int extension_count = 0; unsigned int i; for (i = 0; i < required_extension_count; ++i) @@ -102,6 +101,7 @@ static void vkd3d_check_extensions(const VkExtensionProperties *extensions, unsi if (!has_extension(extensions, count, required_extensions[i])) ERR("Required %s extension %s is not supported.\n", extension_type, debugstr_a(required_extensions[i])); + ++extension_count; } for (i = 0; i < optional_extension_count; ++i) @@ -111,34 +111,64 @@ static void vkd3d_check_extensions(const VkExtensionProperties *extensions, unsi bool *supported = (void *)((uintptr_t)vulkan_info + offset); if ((*supported = has_extension(extensions, count, extension_name))) + { TRACE("Found %s extension.\n", debugstr_a(extension_name)); + ++extension_count; + } + } + + for (i = 0; i < user_extension_count; ++i) + { + if (!has_extension(extensions, count, user_extensions[i])) + ERR("Required user %s extension %s is not supported.\n", + extension_type, debugstr_a(required_extensions[i])); + ++extension_count; } + + return extension_count; } static unsigned int vkd3d_enable_extensions(const char *extensions[], const char * const *required_extensions, unsigned int required_extension_count, const struct vkd3d_optional_extension_info *optional_extensions, unsigned int optional_extension_count, + const char * const *user_extensions, unsigned int user_extension_count, const struct vkd3d_vulkan_info *vulkan_info) { + unsigned int extension_count = 0; unsigned int i, j; for (i = 0; i < required_extension_count; ++i) { - extensions[i] = required_extensions[i]; + extensions[extension_count++] = required_extensions[i]; } - for (j = 0; j < optional_extension_count; ++j) + for (i = 0; i < optional_extension_count; ++i) { - ptrdiff_t offset = optional_extensions[j].vulkan_info_offset; + ptrdiff_t offset = optional_extensions[i].vulkan_info_offset; const bool *supported = (void *)((uintptr_t)vulkan_info + offset); if (*supported) - extensions[i++] = optional_extensions[j].extension_name; + extensions[extension_count++] = optional_extensions[i].extension_name; + } + for (i = 0; i < user_extension_count; ++i) + { + /* avoid duplicates */ + for (j = 0; j < extension_count; ++j) + { + if (!strcmp(extensions[j], user_extensions[i])) + break; + } + if (j != extension_count) + continue; + + extensions[extension_count++] = user_extensions[i]; } - return i; + return extension_count; } -static void vkd3d_init_instance_caps(struct vkd3d_instance *instance) +static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance, + const struct vkd3d_instance_create_info *create_info, + uint32_t *instance_extension_count) { const struct vkd3d_vk_global_procs *vk_procs = &instance->vk_global_procs; struct vkd3d_vulkan_info *vulkan_info = &instance->vk_info; @@ -146,31 +176,36 @@ static void vkd3d_init_instance_caps(struct vkd3d_instance *instance) uint32_t count; VkResult vr; + memset(vulkan_info, 0, sizeof(*vulkan_info)); + *instance_extension_count = 0; + if ((vr = vk_procs->vkEnumerateInstanceExtensionProperties(NULL, &count, NULL)) < 0) { ERR("Failed to enumerate instance extensions, vr %d.\n", vr); - return; + return hresult_from_vk_result(vr); } if (!count) - return; + return S_OK; if (!(vk_extensions = vkd3d_calloc(count, sizeof(*vk_extensions)))) - return; + return E_OUTOFMEMORY; TRACE("Enumerating %u instance extensions.\n", count); if ((vr = vk_procs->vkEnumerateInstanceExtensionProperties(NULL, &count, vk_extensions)) < 0) { ERR("Failed to enumerate instance extensions, vr %d.\n", vr); vkd3d_free(vk_extensions); - return; + return hresult_from_vk_result(vr); } - vkd3d_check_extensions(vk_extensions, count, + *instance_extension_count = vkd3d_check_extensions(vk_extensions, count, required_instance_extensions, ARRAY_SIZE(required_instance_extensions), optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), + create_info->instance_extensions, create_info->instance_extension_count, vulkan_info, "instance"); vkd3d_free(vk_extensions); + return S_OK; } static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, @@ -214,9 +249,10 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { const struct vkd3d_vk_global_procs *vk_global_procs = &instance->vk_global_procs; - const char *extensions[MAX_INSTANCE_EXTENSION_COUNT]; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; + uint32_t extension_count; + const char **extensions; VkInstance vk_instance; VkResult vr; HRESULT hr; @@ -248,8 +284,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, return hr; } - memset(&instance->vk_info, 0, sizeof(instance->vk_info)); - vkd3d_init_instance_caps(instance); + if (FAILED(hr = vkd3d_init_instance_caps(instance, create_info, &extension_count))) + { + if (instance->libvulkan) + dlclose(instance->libvulkan); + return hr; + } application_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; application_info.pNext = NULL; @@ -259,6 +299,13 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.engineVersion = 0; application_info.apiVersion = VK_API_VERSION_1_0; + if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) + { + if (instance->libvulkan) + dlclose(instance->libvulkan); + return E_OUTOFMEMORY; + } + instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instance_info.pNext = NULL; instance_info.flags = 0; @@ -268,10 +315,13 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, instance_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, required_instance_extensions, ARRAY_SIZE(required_instance_extensions), optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), + create_info->instance_extensions, create_info->instance_extension_count, &instance->vk_info); instance_info.ppEnabledExtensionNames = extensions; - if ((vr = vk_global_procs->vkCreateInstance(&instance_info, NULL, &vk_instance))) + vr = vk_global_procs->vkCreateInstance(&instance_info, NULL, &vk_instance); + vkd3d_free(extensions); + if (vr < 0) { ERR("Failed to create Vulkan instance, vr %d.\n", vr); if (instance->libvulkan) @@ -699,7 +749,7 @@ static void vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_check_extensions(vk_extensions, count, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - vulkan_info, "device"); + NULL, 0, vulkan_info, "device"); vkd3d_free(vk_extensions); } @@ -917,7 +967,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDev device_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - &device->vk_info); + NULL, 0, &device->vk_info); device_info.ppEnabledExtensionNames = extensions; device_info.pEnabledFeatures = &device_features; -- 2.13.6

2 5

[PATCH] schtasks: Ignore /tr and /ru options.
by Jacek Caban Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 81 +++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 24 deletions(-)

1 0

[PATCH 10/10 v2] msvcp100: Support exceptions while copying object in _Concurrent_queue_base_v4::_Internal_push
by Piotr Caban Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 49 +++++++++++++++++++++++++++++++++--------------- include/wine/exception.h | 2 +- 2 files changed, 35 insertions(+), 16 deletions(-)

1 0

[PATCH 09/10 v2] msvcp120: Add _Concurrent_queue_base_v4 multi-threaded tests
by Piotr Caban Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 211 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 198 insertions(+), 13 deletions(-)

1 0

[PATCH 08/10 v2] msvcp120: Add _Concurrent_queue_base_v4 tests
by Piotr Caban Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 261 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 261 insertions(+)

1 0

[PATCH 07/10 v2] msvcp100: Add _Concurrent_queue_base_v4 push/pop implementation
by Piotr Caban Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 157 insertions(+), 5 deletions(-)

1 0

[PATCH 06/10 v2] msvcp100: Add _Concurrent_queue_base_v4::_Internal_size implementation
by Piotr Caban Jan. 23, 2018

Jan. 23, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0