July 2018 - Wine-devel - list.winehq.org

[PATCH] ucrtbase: Don't fail if path ends with '\' character in stat functions family.
by Piotr Caban 13 Jul '18

13 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45292 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 11 +++++++++-- dlls/ucrtbase/tests/misc.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-)

2 1

[PATCH v3] kernel32/tests: Load GetSystemFirmwareTable() dynamically.
by Huw Davies 13 Jul '18

13 Jul '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/kernel32/tests/version.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 3bc04fd5b2..c1b7c9c59d 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -26,6 +26,7 @@ #include "winternl.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); +static UINT (WINAPI * pGetSystemFirmwareTable)(DWORD, DWORD, void *, DWORD); static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, void *, ULONG, ULONG *); static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); @@ -44,6 +45,7 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("kernel32.dll"); GET_PROC(GetProductInfo); + GET_PROC(GetSystemFirmwareTable); hmod = GetModuleHandleA("ntdll.dll"); @@ -709,9 +711,16 @@ static void test_GetSystemFirmwareTable(void) static const ULONG min_sfti_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); ULONG expected_len; UINT len; - SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti; UCHAR *smbios_table; + if (!pGetSystemFirmwareTable) + { + win_skip("GetSystemFirmwareTable not available\n"); + return; + } + + sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); ok(!!sfti, "Failed to allocate memory\n"); sfti->ProviderSignature = RSMB; sfti->Action = SystemFirmwareTable_Get; @@ -729,7 +738,7 @@ static void test_GetSystemFirmwareTable(void) expected_len -= min_sfti_len; smbios_table = HeapAlloc(GetProcessHeap(), 0, expected_len); - len = GetSystemFirmwareTable(RSMB, 0, smbios_table, expected_len); + len = pGetSystemFirmwareTable(RSMB, 0, smbios_table, expected_len); ok(len == expected_len, "Expected length %u, got %u\n", expected_len, len); ok(len == 0 || !memcmp(smbios_table, sfti->TableBuffer, 6), "Expected prologue %02x %02x %02x %02x %02x %02x, got %02x %02x %02x %02x %02x %02x\n", -- 2.16.2

2 1

[website] zh-cn: Update Simplified Chinese translation.
by Jactry Zeng 13 Jul '18

13 Jul '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- templates/zh-cn/home.template | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)

1 0

[PATCH] testbot/WineSendLog: Fix identifying and reporting timeouts to the mailing list.
by Francois Gouget 13 Jul '18

13 Jul '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Fixes the issue identified by Huw. testbot/bin/WineSendLog.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index f095bce8d..ac14e11dc 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -139,9 +139,9 @@ sub ReadLog($$$) while (! $Found && defined($Line = <LOG>)) { $Line =~ s/[\r\n]*$//; - if ($Line =~ m/${BaseName}:${TestSet} done/) + if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done/) { - if ($Line =~ m/${BaseName}:${TestSet} done $258$/) + if ($Line =~ m/${BaseName}:${TestSet}(?::[0-9a-f]+)? done $258$/) { push @Messages, "The test timed out"; } @@ -192,7 +192,7 @@ sub CompareLogs($$$$) { if ($Line =~ m/: Test failed: / || $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at / || - $Line =~ m/Timeout/i) + $Line =~ m/The test timed out/) { $Messages .= "$Line\n"; } @@ -301,7 +301,7 @@ EOF print SENDMAIL "\n$CurrentDll:\n"; $PrintedDll = $CurrentDll; } - if ($Line =~ m/^[^:]+:([^ ]+) done $258$/) + if ($Line =~ m/^[^:]+:([^ ]+)(?::[0-9a-f]+)? done $258$/) { print SENDMAIL "$1: The test timed out\n"; } -- 2.18.0

1 0

[PATCH] testbot: Remove the Patch::AffectsTests field.
by Francois Gouget 13 Jul '18

13 Jul '18

Patches which impact Wine must be tested too so this field is unused and no longer relevant. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/ddl/update40.sql | 4 ++++ testbot/ddl/winetestbot.sql | 1 - testbot/doc/winetestbot-schema.dia | 23 ----------------------- testbot/lib/WineTestBot/Patches.pm | 1 - 4 files changed, 4 insertions(+), 25 deletions(-) create mode 100644 testbot/ddl/update40.sql diff --git a/testbot/ddl/update40.sql b/testbot/ddl/update40.sql new file mode 100644 index 000000000..8fa460665 --- /dev/null +++ b/testbot/ddl/update40.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Patches + DROP AffectsTests; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 96fcdcb22..8862c6c9d 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -68,7 +68,6 @@ CREATE TABLE Patches WebPatchId INT(7) NULL, Received DATETIME NOT NULL, Disposition VARCHAR(40) NOT NULL, - AffectsTests ENUM('Y', 'N') NOT NULL, FromName VARCHAR(40) NULL, FromEMail VARCHAR(40) NULL, Subject VARCHAR(120) NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index d3efcb8d8..c54897a83 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1090,29 +1090,6 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> - <dia:composite type="table_attribute"> - <dia:attribute name="name"> - <dia:string>#AffectsTests#</dia:string> - </dia:attribute> - <dia:attribute name="type"> - <dia:string>#BOOL#</dia:string> - </dia:attribute> - <dia:attribute name="comment"> - <dia:string>##</dia:string> - </dia:attribute> - <dia:attribute name="primary_key"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="nullable"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="unique"> - <dia:boolean val="false"/> - </dia:attribute> - <dia:attribute name="default_value"> - <dia:string>##</dia:string> - </dia:attribute> - </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#FromName#</dia:string> diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 23b921740..f5ef431eb 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -346,7 +346,6 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Patch id", 1, 1, "S", 7), CreateBasicPropertyDescriptor("WebPatchId", "Wine Web Patch id", !1, !1, "N", 7), CreateBasicPropertyDescriptor("Received", "Received", !1, 1, "DT", 19), - CreateBasicPropertyDescriptor("AffectsTests", "Affects tests", !1, 1, "B", 1), CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120), -- 2.18.0

1 0

[PATCH] iphlpapi: Implement AllocateAndGetTcpExTableFromStack
by Marcus Meissner 13 Jul '18

13 Jul '18

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> Based on a patch by Ralf Habacker. https://bugs.winehq.org/show_bug.cgi?id=34372 Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/ipstats.c | 36 ++++++++++++++++++++++++++++++++++++ include/iphlpapi.h | 1 + 3 files changed, 38 insertions(+) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1686644de0..4769c3c673 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -5,6 +5,7 @@ @ stdcall AllocateAndGetIpAddrTableFromStack( ptr long long long ) @ stdcall AllocateAndGetIpForwardTableFromStack( ptr long long long ) @ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long ) +@ stdcall AllocateAndGetTcpExTableFromStack( ptr long long long long ) @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) @ stdcall CancelIPChangeNotify( ptr ) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 8f6720ea52..8163df2e47 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2323,6 +2323,42 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO return build_tcp_table( TCP_TABLE_BASIC_ALL, (void **)ppTcpTable, bOrder, heap, flags, NULL ); } +/****************************************************************** + * AllocateAndGetTcpExTableFromStack (IPHLPAPI.@) + * + * Get the TCP connection table. + * Like GetTcpTable(), but allocate the returned table from heap. + * + * PARAMS + * ppTcpTable [Out] pointer into which the MIB_TCPTABLE_EX is + * allocated and returned. + * bOrder [In] whether to sort the table + * heap [In] heap from which the table is allocated + * flags [In] flags to HeapAlloc + * family [In] address family [AF_INET|AF_INET6] + * + * RETURNS + * ERROR_INVALID_PARAMETER if ppTcpTable is NULL, whatever GetTcpTable() + * returns otherwise. + */ +DWORD WINAPI AllocateAndGetTcpExTableFromStack( VOID **ppTcpTable, BOOL bOrder, + HANDLE heap, DWORD flags, DWORD family ) +{ + TRACE("table %p, bOrder %d, heap %p, flags 0x%08x, family %u\n", + ppTcpTable, bOrder, heap, flags, family); + + if (!ppTcpTable) return ERROR_INVALID_PARAMETER; + if (!family) return ERROR_INVALID_PARAMETER; + + if (family != WS_AF_INET) + { + FIXME( "family = %u not supported\n", family ); + return ERROR_NOT_SUPPORTED; + } + + return build_tcp_table( TCP_TABLE_OWNER_PID_ALL, ppTcpTable, bOrder, heap, flags, NULL ); +} + static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) { DWORD table_size; diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 54d93d1c9c..8ed6c784b1 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -156,6 +156,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetTcpExTableFromStack(VOID **ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family); DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags); -- 2.18.0

2 2

[PATCH 8/8] vulkan-1: Forward all functions directly to winevulkan.
by Józef Kucia 13 Jul '18

13 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/vulkan-1.spec | 8 ++++---- dlls/vulkan-1/vulkan.c | 50 --------------------------------------------- dlls/winevulkan/make_vulkan | 7 +------ 3 files changed, 5 insertions(+), 60 deletions(-) diff --git a/dlls/vulkan-1/vulkan-1.spec b/dlls/vulkan-1/vulkan-1.spec index c518343a17c4..2e0597930da2 100644 --- a/dlls/vulkan-1/vulkan-1.spec +++ b/dlls/vulkan-1/vulkan-1.spec @@ -146,9 +146,9 @@ @ stdcall vkEndCommandBuffer(ptr) winevulkan.wine_vkEndCommandBuffer @ stdcall vkEnumerateDeviceExtensionProperties(ptr str ptr ptr) winevulkan.wine_vkEnumerateDeviceExtensionProperties @ stdcall vkEnumerateDeviceLayerProperties(ptr ptr ptr) winevulkan.wine_vkEnumerateDeviceLayerProperties -@ stdcall vkEnumerateInstanceExtensionProperties(str ptr ptr) -@ stdcall vkEnumerateInstanceLayerProperties(ptr ptr) -@ stdcall vkEnumerateInstanceVersion(ptr) +@ stdcall vkEnumerateInstanceExtensionProperties(str ptr ptr) winevulkan.wine_vkEnumerateInstanceExtensionProperties +@ stdcall vkEnumerateInstanceLayerProperties(ptr ptr) winevulkan.wine_vkEnumerateInstanceLayerProperties +@ stdcall vkEnumerateInstanceVersion(ptr) winevulkan.wine_vkEnumerateInstanceVersion @ stdcall vkEnumeratePhysicalDeviceGroups(ptr ptr ptr) winevulkan.wine_vkEnumeratePhysicalDeviceGroups @ stdcall vkEnumeratePhysicalDevices(ptr ptr ptr) winevulkan.wine_vkEnumeratePhysicalDevices @ stdcall vkFlushMappedMemoryRanges(ptr long ptr) winevulkan.wine_vkFlushMappedMemoryRanges @@ -175,7 +175,7 @@ @ stdcall vkGetImageSparseMemoryRequirements(ptr int64 ptr ptr) winevulkan.wine_vkGetImageSparseMemoryRequirements @ stdcall vkGetImageSparseMemoryRequirements2(ptr ptr ptr ptr) winevulkan.wine_vkGetImageSparseMemoryRequirements2 @ stdcall vkGetImageSubresourceLayout(ptr int64 ptr ptr) winevulkan.wine_vkGetImageSubresourceLayout -@ stdcall vkGetInstanceProcAddr(ptr str) +@ stdcall vkGetInstanceProcAddr(ptr str) winevulkan.wine_vkGetInstanceProcAddr @ stub vkGetPhysicalDeviceDisplayPlanePropertiesKHR @ stub vkGetPhysicalDeviceDisplayPropertiesKHR @ stub vkGetPhysicalDeviceExternalBufferProperties diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c index abac9e14f26f..d3b35603a172 100644 --- a/dlls/vulkan-1/vulkan.c +++ b/dlls/vulkan-1/vulkan.c @@ -23,59 +23,9 @@ #include "winbase.h" #include "wine/debug.h" -#define VK_NO_PROTOTYPES -#include "wine/vulkan.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); -VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *, uint32_t *, VkExtensionProperties *); -VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *); -PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance, const char *); - -VkResult WINAPI vkEnumerateInstanceExtensionProperties(const char *layer_name, - uint32_t *count, VkExtensionProperties *properties) -{ - TRACE("%p, %p, %p\n", layer_name, count, properties); - - if (layer_name) - return VK_ERROR_LAYER_NOT_PRESENT; - - return wine_vkEnumerateInstanceExtensionProperties(NULL, count, properties); -} - -VkResult WINAPI vkEnumerateInstanceVersion(uint32_t *version) -{ - TRACE("%p\n", version); - - return wine_vkEnumerateInstanceVersion(version); -} - -VkResult WINAPI vkEnumerateInstanceLayerProperties(uint32_t *count, - VkLayerProperties *properties) -{ - TRACE("%p, %p\n", count, properties); - - /* We don't support any layers. */ - *count = 0; - return VK_SUCCESS; -} - -PFN_vkVoidFunction WINAPI vkGetInstanceProcAddr(VkInstance instance, const char *name) -{ - TRACE("%p, %s\n", instance, debugstr_a(name)); - - if (!strcmp(name, "vkEnumerateInstanceExtensionProperties")) - return (PFN_vkVoidFunction)vkEnumerateInstanceExtensionProperties; - - if (!strcmp(name, "vkEnumerateInstanceLayerProperties")) - return (PFN_vkVoidFunction)vkEnumerateInstanceLayerProperties; - - if (!strcmp(name, "vkGetInstanceProcAddr")) - return (PFN_vkVoidFunction)vkGetInstanceProcAddr; - - return wine_vkGetInstanceProcAddr(instance, name); -} - BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { TRACE("%p, %u, %p\n", hinst, reason, reserved); diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 83c9507917c7..7773f34c8a37 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2276,12 +2276,7 @@ class VkGenerator(object): # We support all Core functions except for VK_KHR_display* APIs. # Create stubs for unsupported Core functions. if func.is_required(): - # Global functions need a custom implementation, except for - # vkCreateInstance, which we can just forward. - if func.is_global_func() and func.name != "vkCreateInstance": - f.write(func.spec()) - else: - f.write(func.spec(symbol="winevulkan.wine_" + func.name)) + f.write(func.spec(symbol="winevulkan.wine_" + func.name)) else: f.write("@ stub {0}\n".format(func.name)) -- 2.16.4

1 0

[PATCH 7/8] winevulkan: Implement vkEnumerateInstanceLayerProperties() in ICD.
by Józef Kucia 13 Jul '18

13 Jul '18

Other Vulkan ICDs implement this function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 4 ---- dlls/winevulkan/vulkan.c | 14 ++++++++++++++ dlls/winevulkan/winevulkan.spec | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 76ea95f719e4..83c9507917c7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2258,10 +2258,6 @@ class VkGenerator(object): if not func.is_core_func(): continue - # Not an ICD level function. - if func.name == "vkEnumerateInstanceLayerProperties": - continue - # We support all Core functions except for VK_KHR_display* APIs. # Create stubs for unsupported Core functions. if func.is_required(): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4e11c72b26e5..a06cfa185f56 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -828,6 +828,19 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return *count < num_properties ? VK_INCOMPLETE : VK_SUCCESS; } +VkResult WINAPI wine_vkEnumerateInstanceLayerProperties(uint32_t *count, VkLayerProperties *properties) +{ + TRACE("%p, %p\n", count, properties); + + if (!properties) + { + *count = 0; + return VK_SUCCESS; + } + + return VK_ERROR_LAYER_NOT_PRESENT; +} + VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) { VkResult res; @@ -1096,6 +1109,7 @@ static const struct vulkan_func vk_global_dispatch_table[] = { {"vkCreateInstance", &wine_vkCreateInstance}, {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, + {"vkEnumerateInstanceLayerProperties", &wine_vkEnumerateInstanceLayerProperties}, {"vkEnumerateInstanceVersion", &wine_vkEnumerateInstanceVersion}, {"vkGetInstanceProcAddr", &wine_vkGetInstanceProcAddr}, }; diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index ee34a99acf46..91f7333fe365 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -149,6 +149,7 @@ @ stdcall wine_vkEnumerateDeviceExtensionProperties(ptr str ptr ptr) @ stdcall wine_vkEnumerateDeviceLayerProperties(ptr ptr ptr) @ stdcall wine_vkEnumerateInstanceExtensionProperties(str ptr ptr) +@ stdcall wine_vkEnumerateInstanceLayerProperties(ptr ptr) @ stdcall wine_vkEnumerateInstanceVersion(ptr) @ stdcall wine_vkEnumeratePhysicalDeviceGroups(ptr ptr ptr) @ stdcall wine_vkEnumeratePhysicalDevices(ptr ptr ptr) -- 2.16.4

1 0

[PATCH 6/8] winevulkan: Downgrade ERR() to WARN() in wine_vkEnumerateInstanceExtensionProperties().
by Józef Kucia 13 Jul '18

13 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index f2ec38a0f7c1..4e11c72b26e5 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -766,17 +766,16 @@ VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice phys_ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_name, uint32_t *count, VkExtensionProperties *properties) { - VkResult res; - uint32_t num_properties = 0, num_host_properties = 0; - VkExtensionProperties *host_properties = NULL; + uint32_t num_properties = 0, num_host_properties; + VkExtensionProperties *host_properties; unsigned int i, j; + VkResult res; - TRACE("%p %p %p\n", layer_name, count, properties); + TRACE("%p, %p, %p\n", layer_name, count, properties); - /* This shouldn't get called with layer_name set, the ICD loader prevents it. */ if (layer_name) { - ERR("Layer enumeration not supported from ICD.\n"); + WARN("Layer enumeration not supported from ICD.\n"); return VK_ERROR_LAYER_NOT_PRESENT; } @@ -784,14 +783,13 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na if (res != VK_SUCCESS) return res; - host_properties = heap_calloc(num_host_properties, sizeof(*host_properties)); - if (!host_properties) + if (!(host_properties = heap_calloc(num_host_properties, sizeof(*host_properties)))) return VK_ERROR_OUT_OF_HOST_MEMORY; res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, host_properties); if (res != VK_SUCCESS) { - ERR("Failed to retrieve host properties, res=%d\n", res); + ERR("Failed to retrieve host properties, res=%d.\n", res); heap_free(host_properties); return res; } @@ -810,7 +808,7 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na if (!properties) { - TRACE("Returning %u extensions\n", num_properties); + TRACE("Returning %u extensions.\n", num_properties); *count = num_properties; heap_free(host_properties); return VK_SUCCESS; @@ -820,9 +818,8 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na { if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) { - TRACE("Enabling extension '%s'\n", host_properties[i].extensionName); - properties[j] = host_properties[i]; - j++; + TRACE("Enabling extension '%s'.\n", host_properties[i].extensionName); + properties[j++] = host_properties[i]; } } *count = min(*count, num_properties); -- 2.16.4

1 0

[PATCH 5/8] winevulkan: Use WINE_VK_VERSION to limit supported features.
by Józef Kucia 13 Jul '18

13 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index fbb8528f5601..76ea95f719e4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2306,6 +2306,15 @@ class VkRegistry(object): self.funcs = {} self.types = {} + self.version_regex = re.compile( + r'^' + r'VK_VERSION_' + r'(?P<major>[0-9])' + r'_' + r'(?P<minor>[0-9])' + r'$' + ) + # Overall strategy for parsing the registry is to first # parse all type / function definitions. Then parse # features and extensions to decide which types / functions @@ -2323,6 +2332,14 @@ class VkRegistry(object): self.copyright = root.find('./comment').text + def _is_feature_supported(self, feature): + version = self.version_regex.match(feature) + if not version: + return True + + version = tuple(map(int, version.group('major', 'minor'))) + return version <= WINE_VK_VERSION + def _mark_command_required(self, command): """ Helper function to mark a certain command and the datatypes it needs as required.""" def mark_bitmask_dependencies(bitmask, types): @@ -2542,7 +2559,7 @@ class VkRegistry(object): type_info.required = True feature = require.attrib.get("feature") - if feature == "VK_VERSION_1_1": + if feature and not self._is_feature_supported(feature): continue # Pull in any commands we need. We infer types to pull in from the command @@ -2569,8 +2586,7 @@ class VkRegistry(object): if tag.tag == "comment": continue elif tag.tag == "command": - # For now limit to 1.0 features as various 1.1 features need more work. - if feature_name == "VK_VERSION_1_1": + if not self._is_feature_supported(feature_name): continue name = tag.attrib["name"] self._mark_command_required(name) -- 2.16.4

1 0