March 2018 - Wine-commits - list.winehq.org

Francois Gouget : testbot: Fix Collection::IsEmpty() on perl 5.20.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: tools Branch: master Commit: f6720d15fec1fe6d565241a03e607be089854a6b URL: https://source.winehq.org/git/tools.git/?a=commit;h=f6720d15fec1fe6d565241a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 30 12:11:51 2018 +0200 testbot: Fix Collection::IsEmpty() on perl 5.20. Although scalar(%hash) is 0 when the hash is empty, the rest of the time it is not a number. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a57a329..032c738 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -420,8 +420,9 @@ sub IsEmpty($) } # Even though scalar(hash) does not return the number of items in Perl 5.20 - # it returns 0 for an empty hash. - return !$self->{Items} || scalar(%{$self->{Items}}) == 0; + # (and cannot generally be compared to numbers), it evaluates to true for + # all hashes except empty ones. + return !$self->{Items} || !%{$self->{Items}}; } sub CombineKey($@)

1 0

Francois Gouget : testbot/web: Grab the last 12 hours of activity by default.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: tools Branch: master Commit: 5ac76e180a0e4ec0ca3963a7d9273d646239a736 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5ac76e180a0e4ec0ca3963a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 30 12:13:05 2018 +0200 testbot/web: Grab the last 12 hours of activity by default. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 96a1ef0..08e0291 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -33,7 +33,7 @@ use WineTestBot::VMs; @ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); -my $HOURS_DEFAULT = 24; +my $HOURS_DEFAULT = 12; sub _initialize($$$) {

1 0

Józef Kucia : tests: Add test for custom PRESENT state transitions.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: vkd3d Branch: master Commit: c7d7c5845159f5bf5fc45abddaaa76f433cec5b7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c7d7c5845159f5bf5fc45ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 18:21:48 2018 +0200 tests: Add test for custom PRESENT state transitions. 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/vkd3d_api.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 198 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c7d7c5845159f5bf5fc…

1 0

Józef Kucia : libs/vkd3d: Add support for custom PRESENT state transitions.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: vkd3d Branch: master Commit: bfd20ef1c8d80b0514197209c6f2d516fc78c9f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bfd20ef1c8d80b051419720… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 18:21:46 2018 +0200 libs/vkd3d: Add support for custom PRESENT state transitions. 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 | 31 ++++++++++++++++--------------- include/vkd3d.h | 20 ++++++++++++++------ libs/vkd3d/command.c | 28 +++++++++++++++++++--------- libs/vkd3d/resource.c | 16 +++++++++++----- libs/vkd3d/vkd3d_private.h | 3 ++- 5 files changed, 62 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=bfd20ef1c8d80b05141…

1 0

Józef Kucia : tests: Allow sharing common code between D3D12 tests.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: vkd3d Branch: master Commit: aafbaddb2ccf686108a4ed9db64d33e49a194770 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aafbaddb2ccf686108a4ed9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 18:21:47 2018 +0200 tests: Allow sharing common code between D3D12 tests. 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> --- Makefile.am | 5 +- tests/d3d12.c | 695 +-------------------------------------------- tests/vkd3d_d3d12_test.h | 720 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 725 insertions(+), 695 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=aafbaddb2ccf686108a…

1 0

Józef Kucia : winevulkan: Use %#x to trace enums.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 063f6baaaf36bb547ea363ba535a7311de18f291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=063f6baaaf36bb547ea363ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:52 2018 +0200 winevulkan: Use %#x to trace enums. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 +--- dlls/winevulkan/vulkan.c | 2 +- dlls/winevulkan/vulkan_thunks.c | 46 ++++++++++++++++++++--------------------- 3 files changed, 25 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=063f6baaaf36bb547ea3…

1 0

Józef Kucia : winevulkan: Move some autogenerated code to vulkan_private.h.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: fc1b15f9b02841db3aac58ae4250ae97c8fb0ecc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1b15f9b02841db3aac58ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:53 2018 +0200 winevulkan: Move some autogenerated code to vulkan_private.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 ------------ dlls/winevulkan/vulkan_private.h | 11 +++++++++++ dlls/winevulkan/vulkan_thunks.h | 12 ------------ 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 66a7525..8cd0b49 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1913,18 +1913,6 @@ class VkGenerator(object): f.write("#ifndef __WINE_VULKAN_THUNKS_H\n") f.write("#define __WINE_VULKAN_THUNKS_H\n\n") - f.write("/* Perform vulkan struct conversion on 32-bit x86 platforms. */\n") - f.write("#if defined(__i386__)\n") - f.write("#define USE_STRUCT_CONVERSION\n") - f.write("#endif\n\n") - - f.write("/* For use by vk_icdGetInstanceProcAddr / vkGetInstanceProcAddr */\n") - f.write("void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN;\n") - f.write("void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;\n\n") - - f.write("BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN;\n") - f.write("BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN;\n\n") - # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 7f2f242..a7239e7 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -20,6 +20,11 @@ #ifndef __WINE_VULKAN_PRIVATE_H #define __WINE_VULKAN_PRIVATE_H +/* Perform vulkan struct conversion on 32-bit x86 platforms. */ +#if defined(__i386__) +#define USE_STRUCT_CONVERSION +#endif + #include "vulkan_thunks.h" /* Magic value defined by Vulkan ICD / Loader spec */ @@ -99,4 +104,10 @@ struct VkQueue_T VkQueue queue; /* native queue */ }; +void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; +void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; + +BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; +BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; + #endif /* __WINE_VULKAN_PRIVATE_H */ diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 30a53ac..67df71d 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -3,18 +3,6 @@ #ifndef __WINE_VULKAN_THUNKS_H #define __WINE_VULKAN_THUNKS_H -/* Perform vulkan struct conversion on 32-bit x86 platforms. */ -#if defined(__i386__) -#define USE_STRUCT_CONVERSION -#endif - -/* For use by vk_icdGetInstanceProcAddr / vkGetInstanceProcAddr */ -void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; -void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; - -BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; -BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; - /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers); void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers);

1 0

Józef Kucia : winevulkan: Simplify wine_vk_init().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 46bc42e7a7c9bb6bfdee701c9f5c1742041cfc36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46bc42e7a7c9bb6bfdee701c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:54 2018 +0200 winevulkan: Simplify wine_vk_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 5f67444..9fa1d39 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -47,7 +47,7 @@ struct wine_vk_structure_header static void *wine_vk_get_global_proc_addr(const char *name); -static const struct vulkan_funcs *vk_funcs = NULL; +static const struct vulkan_funcs *vk_funcs; static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { @@ -261,17 +261,17 @@ static void wine_vk_device_free(struct VkDevice_T *device) static BOOL wine_vk_init(void) { - HDC hdc = GetDC(0); + HDC hdc; - vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + hdc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, hdc); if (!vk_funcs) { ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - ReleaseDC(0, hdc); return FALSE; } - ReleaseDC(0, hdc); return TRUE; }

1 0

Józef Kucia : winevulkan: Avoid goto in wine_vk_instance_load_physical_devices().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: a8c06b639e3fc42307a066a907f936ab3c2ca647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8c06b639e3fc42307a066a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:55 2018 +0200 winevulkan: Avoid goto in wine_vk_instance_load_physical_devices(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9fa1d39..4c9874c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -341,7 +341,7 @@ static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *instance) { VkResult res; - struct VkPhysicalDevice_T **tmp_phys_devs = NULL; + struct VkPhysicalDevice_T **tmp_phys_devs; uint32_t num_phys_devs = 0; unsigned int i; @@ -362,13 +362,16 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst res = instance->funcs.p_vkEnumeratePhysicalDevices(instance->instance, &num_phys_devs, tmp_phys_devs); if (res != VK_SUCCESS) - goto err; + { + heap_free(tmp_phys_devs); + return res; + } instance->phys_devs = heap_calloc(num_phys_devs, sizeof(*instance->phys_devs)); if (!instance->phys_devs) { - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + heap_free(tmp_phys_devs); + return VK_ERROR_OUT_OF_HOST_MEMORY; } /* Wrap each native physical device handle into a dispatchable object for the ICD loader. */ @@ -378,8 +381,8 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst if (!phys_dev) { ERR("Unable to allocate memory for physical device!\n"); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + heap_free(tmp_phys_devs); + return VK_ERROR_OUT_OF_HOST_MEMORY; } instance->phys_devs[i] = phys_dev; @@ -389,10 +392,6 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst heap_free(tmp_phys_devs); return VK_SUCCESS; - -err: - heap_free(tmp_phys_devs); - return res; } /* Helper function used for freeing an instance structure. This function supports full

1 0

Józef Kucia : winevulkan: Avoid goto in wine_vkCreateDevice().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 8fd39cc2cea864f47d307bab839b65e0f2b2ae34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd39cc2cea864f47d307bab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:56 2018 +0200 winevulkan: Avoid goto in wine_vkCreateDevice(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4c9874c..7a7a334 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -531,8 +531,9 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, &create_info_host, NULL /* allocator */, &object->device); if (res != VK_SUCCESS) { - ERR("Failed to create device\n"); - goto err; + ERR("Failed to create device.\n"); + wine_vk_device_free(object); + return res; } object->phys_dev = phys_dev; @@ -559,8 +560,8 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->queues = heap_calloc(max_queue_families, sizeof(*object->queues)); if (!object->queues) { - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + wine_vk_device_free(object); + return VK_ERROR_OUT_OF_HOST_MEMORY; } for (i = 0; i < create_info_host.queueCreateInfoCount; i++) @@ -573,18 +574,14 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, queue_count); if (!object->queues[family_index]) { - res = VK_ERROR_OUT_OF_HOST_MEMORY; ERR("Failed to allocate memory for queues\n"); - goto err; + wine_vk_device_free(object); + return VK_ERROR_OUT_OF_HOST_MEMORY; } } *device = object; return VK_SUCCESS; - -err: - wine_vk_device_free(object); - return res; } VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,

1 0