wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zebediah Figura : ntdll: Consider mount points to be reparse points in get_file_info().
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 6b498d98a86b5179a025afbaaeaa3d60a8bd74ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b498d98a86b5179a025afba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 20 12:15:25 2020 -0500 ntdll: Consider mount points to be reparse points in get_file_info(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5b60c887e2..c2ec4a7dee 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -151,6 +151,7 @@ int fd_get_file_info( int fd, struct stat *st, ULONG *attr ) /* get the stat info and file attributes for a file (by name) */ int get_file_info( const char *path, struct stat *st, ULONG *attr ) { + char *parent_path; int ret; *attr = 0; @@ -163,6 +164,19 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr ) /* is a symbolic link and a directory, consider these "reparse points" */ if (S_ISDIR( st->st_mode )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT; } + else if (S_ISDIR( st->st_mode ) && (parent_path = RtlAllocateHeap( GetProcessHeap(), 0, strlen(path) + 4 ))) + { + struct stat parent_st; + + /* consider mount points to be reparse points (IO_REPARSE_TAG_MOUNT_POINT) */ + strcpy( parent_path, path ); + strcat( parent_path, "/.." ); + if (!stat( parent_path, &parent_st ) + && (st->st_dev != parent_st.st_dev || st->st_ino == parent_st.st_ino)) + *attr |= FILE_ATTRIBUTE_REPARSE_POINT; + + RtlFreeHeap( GetProcessHeap(), 0, parent_path ); + } *attr |= get_file_attributes( st ); return ret; }

1 0

Zebediah Figura : server: Store the real Unix path.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: a20d8bda3732be74c4cce04530676a1ca3c0494c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a20d8bda3732be74c4cce045… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 20 12:15:24 2020 -0500 server: Store the real Unix path. So that we can query the Unix symlink target from a file handle. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 +- server/fd.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 814353e762..75a67e8095 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2097,7 +2097,7 @@ static void test_file_rename_information(void) res = pNtQueryInformationFile( handle, &io, fni, sizeof(FILE_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR), FileNameInformation ); ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); fni->FileName[ fni->FileNameLength / sizeof(WCHAR) ] = 0; - todo_wine ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", + ok( !lstrcmpiW(fni->FileName, newpath + 2), "FileName expected %s, got %s\n", wine_dbgstr_w(newpath + 2), wine_dbgstr_w(fni->FileName) ); HeapFree( GetProcessHeap(), 0, fni ); diff --git a/server/fd.c b/server/fd.c index e7f57966b2..5019ae2da0 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1756,6 +1756,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, struct fd *fd; int root_fd = -1; int rw_mode; + char *path; if (((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) || ((options & FILE_DIRECTORY_FILE) && (flags & O_TRUNC))) @@ -1805,8 +1806,6 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, } else rw_mode = O_RDONLY; - fd->unix_name = dup_fd_name( root, name ); - if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1) { /* if we tried to open a directory for write access, retry read-only */ @@ -1823,6 +1822,13 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, } } + fd->unix_name = NULL; + if ((path = dup_fd_name( root, name ))) + { + fd->unix_name = realpath( path, NULL ); + free( path ); + } + closed_fd->unix_fd = fd->unix_fd; closed_fd->unlink = 0; closed_fd->unix_name = fd->unix_name; @@ -2441,8 +2447,10 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, } free( fd->unix_name ); - fd->unix_name = name; - fd->closed->unix_name = name; + fd->closed->unix_name = fd->unix_name = realpath( name, NULL ); + free( name ); + if (!fd->unix_name) + set_error( STATUS_NO_MEMORY ); return; failed:

1 0

Zebediah Figura : kernel32/tests: Fix some test failures when run from a mounted folder.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 54bda2991e03e4da7554c5694f6986d69f308426 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54bda2991e03e4da7554c569… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 20 12:15:23 2020 -0500 kernel32/tests: Fix some test failures when run from a mounted folder. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 206 +++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54bda2991e03e4da7554…

1 0

Liam Middlebrook : winevulkan: Update to VK spec version spec 1.2.134.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 7b1622d1ab90f01fdb3a2bc24e12ab4990f07f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b1622d1ab90f01fdb3a2bc2… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Fri Mar 20 19:39:32 2020 -0700 winevulkan: Update to VK spec version spec 1.2.134. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 15 +- dlls/winevulkan/make_vulkan | 4 +- dlls/winevulkan/vulkan_thunks.c | 361 +++- dlls/winevulkan/vulkan_thunks.h | 94 +- dlls/winevulkan/winevulkan.spec | 15 +- include/wine/vulkan.h | 3874 +++++++++++++++++++++------------------ include/wine/vulkan_driver.h | 2 +- 7 files changed, 2496 insertions(+), 1869 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b1622d1ab90f01fdb3a…

1 0

Liam Middlebrook : winevulkan: Generate alias enum values.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: c32d1ad0cb488dd7f64ca82a985b71303749aeba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c32d1ad0cb488dd7f64ca82a… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Fri Mar 20 19:39:31 2020 -0700 winevulkan: Generate alias enum values. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 13 ++-- include/wine/vulkan.h | 180 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c32d1ad0cb488dd7f64c…

1 0

Liam Middlebrook : winevulkan: Add alias field to VkEnumValue.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: a5b633f3f6f497d80c55c4a2b32a88c169946eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5b633f3f6f497d80c55c4a2… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Fri Mar 20 19:39:30 2020 -0700 winevulkan: Add alias field to VkEnumValue. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 443b15b098..0a126bd422 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -356,24 +356,24 @@ class VkEnum(object): alias_name = v.attrib.get("alias") if alias_name: alias = next(x for x in values if x.name == alias_name) - values.append(VkEnumValue(v.attrib.get("name"), alias.value, alias.hex)) + values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex)) elif value: # Some values are in hex form. We want to preserve the hex representation # at least when we convert back to a string. Internally we want to use int. if "0x" in value: - values.append(VkEnumValue(v.attrib.get("name"), int(value, 0), hex=True)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True)) else: - values.append(VkEnumValue(v.attrib.get("name"), int(value, 0))) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0))) else: # bitmask value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value, hex=True)) + values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True)) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect # the size definition. max_name = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2', name).upper() + "_MAX_ENUM" - values.append(VkEnumValue(max_name, 0x7fffffff, hex=True)) + values.append(VkEnumValue(max_name, value=0x7fffffff, hex=True)) return VkEnum(name, values) @@ -415,16 +415,21 @@ class VkEnum(object): class VkEnumValue(object): - def __init__(self, name, value, hex=False): + def __init__(self, name, value=None, hex=False, alias=None): self.name = name self.value = value self.hex = hex + self.alias = alias def __repr__(self): + if self.is_alias(): + return "{0}={1}".format(self.name, self.alias) return "{0}={1}".format(self.name, self.value) def definition(self): """ Convert to text definition e.g. VK_FOO = 1 """ + if self.is_alias(): + return "{0} = {1}".format(self.name, self.alias) # Hex is commonly used for FlagBits and sometimes within # a non-FlagBits enum for a bitmask value as well. @@ -433,6 +438,9 @@ class VkEnumValue(object): else: return "{0} = {1}".format(self.name, self.value) + def is_alias(self): + return self.alias is not None + class VkFunction(object): def __init__(self, _type=None, name=None, params=[], extensions=[], alias=None): @@ -2708,7 +2716,7 @@ class VkRegistry(object): if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - enum.add(VkEnumValue(enum_elem.attrib["name"], 1 << int(enum_elem.attrib["bitpos"]), hex=True)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True)) elif "offset" in enum_elem.keys(): # Extensions promoted to Core, have the extension number as part

1 0

Liam Middlebrook : winevulkan: Generate typedefs for aliased enums.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: da71d390d4fbd9ce9de2a7dce244d44b7fc5e6bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=da71d390d4fbd9ce9de2a7dc… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Fri Mar 20 19:39:29 2020 -0700 winevulkan: Generate typedefs for aliased enums. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 19 +++++++++++++++++-- include/wine/vulkan.h | 16 ++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3593410041..443b15b098 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -335,11 +335,15 @@ class VkEnum(object): self.values = values self.required = False self.alias = alias + self.aliased_by = [] @staticmethod def from_alias(enum, alias): name = enum.attrib.get("name") - return VkEnum(name, alias.values, alias=alias) + aliasee = VkEnum(name, alias.values, alias=alias) + + alias.add_aliased_by(aliasee) + return aliasee @staticmethod def from_xml(enum): @@ -386,18 +390,29 @@ class VkEnum(object): self.values.append(value) def definition(self): + if self.is_alias(): + return "" + text = "typedef enum {0}\n{{\n".format(self.name) # Print values sorted, values can have been added in a random order. values = sorted(self.values, key=lambda value: value.value) for value in values: text += " {0},\n".format(value.definition()) - text += "}} {0};\n\n".format(self.name) + text += "}} {0};\n".format(self.name) + + for aliasee in self.aliased_by: + text += "typedef {0} {1};\n".format(self.name, aliasee.name) + + text += "\n" return text def is_alias(self): return bool(self.alias) + def add_aliased_by(self, aliasee): + self.aliased_by.append(aliasee) + class VkEnumValue(object): def __init__(self, name, value, hex=False): diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index fe804fd23e..fddb64fc9a 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -777,6 +777,7 @@ typedef enum VkChromaLocation VK_CHROMA_LOCATION_MIDPOINT = 1, VK_CHROMA_LOCATION_MAX_ENUM = 0x7fffffff, } VkChromaLocation; +typedef VkChromaLocation VkChromaLocationKHR; typedef enum VkCoarseSampleOrderTypeNV { @@ -994,6 +995,7 @@ typedef enum VkDescriptorUpdateTemplateType VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR = 1, VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_MAX_ENUM = 0x7fffffff, } VkDescriptorUpdateTemplateType; +typedef VkDescriptorUpdateTemplateType VkDescriptorUpdateTemplateTypeKHR; typedef enum VkDeviceGroupPresentModeFlagBitsKHR { @@ -1061,6 +1063,7 @@ typedef enum VkExternalFenceFeatureFlagBits VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT = 0x00000002, VK_EXTERNAL_FENCE_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalFenceFeatureFlagBits; +typedef VkExternalFenceFeatureFlagBits VkExternalFenceFeatureFlagBitsKHR; typedef enum VkExternalFenceHandleTypeFlagBits { @@ -1070,6 +1073,7 @@ typedef enum VkExternalFenceHandleTypeFlagBits VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT = 0x00000008, VK_EXTERNAL_FENCE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalFenceHandleTypeFlagBits; +typedef VkExternalFenceHandleTypeFlagBits VkExternalFenceHandleTypeFlagBitsKHR; typedef enum VkExternalMemoryFeatureFlagBits { @@ -1078,6 +1082,7 @@ typedef enum VkExternalMemoryFeatureFlagBits VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT = 0x00000004, VK_EXTERNAL_MEMORY_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalMemoryFeatureFlagBits; +typedef VkExternalMemoryFeatureFlagBits VkExternalMemoryFeatureFlagBitsKHR; typedef enum VkExternalMemoryHandleTypeFlagBits { @@ -1092,6 +1097,7 @@ typedef enum VkExternalMemoryHandleTypeFlagBits VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT = 0x00000100, VK_EXTERNAL_MEMORY_HANDLE_TYPE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalMemoryHandleTypeFlagBits; +typedef VkExternalMemoryHandleTypeFlagBits VkExternalMemoryHandleTypeFlagBitsKHR; typedef enum VkExternalSemaphoreFeatureFlagBits { @@ -1099,6 +1105,7 @@ typedef enum VkExternalSemaphoreFeatureFlagBits VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT = 0x00000002, VK_EXTERNAL_SEMAPHORE_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalSemaphoreFeatureFlagBits; +typedef VkExternalSemaphoreFeatureFlagBits VkExternalSemaphoreFeatureFlagBitsKHR; typedef enum VkExternalSemaphoreHandleTypeFlagBits { @@ -1109,6 +1116,7 @@ typedef enum VkExternalSemaphoreHandleTypeFlagBits VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT = 0x00000010, VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalSemaphoreHandleTypeFlagBits; +typedef VkExternalSemaphoreHandleTypeFlagBits VkExternalSemaphoreHandleTypeFlagBitsKHR; typedef enum VkFenceCreateFlagBits { @@ -1121,6 +1129,7 @@ typedef enum VkFenceImportFlagBits VK_FENCE_IMPORT_TEMPORARY_BIT = 0x00000001, VK_FENCE_IMPORT_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkFenceImportFlagBits; +typedef VkFenceImportFlagBits VkFenceImportFlagBitsKHR; typedef enum VkFilter { @@ -1597,6 +1606,7 @@ typedef enum VkMemoryAllocateFlagBits VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR = 0x00000004, VK_MEMORY_ALLOCATE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkMemoryAllocateFlagBits; +typedef VkMemoryAllocateFlagBits VkMemoryAllocateFlagBitsKHR; typedef enum VkMemoryHeapFlagBits { @@ -1672,6 +1682,7 @@ typedef enum VkPeerMemoryFeatureFlagBits VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT = 0x00000008, VK_PEER_MEMORY_FEATURE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkPeerMemoryFeatureFlagBits; +typedef VkPeerMemoryFeatureFlagBits VkPeerMemoryFeatureFlagBitsKHR; typedef enum VkPerformanceConfigurationTypeINTEL { @@ -1839,6 +1850,7 @@ typedef enum VkPointClippingBehavior VK_POINT_CLIPPING_BEHAVIOR_USER_CLIP_PLANES_ONLY = 1, VK_POINT_CLIPPING_BEHAVIOR_MAX_ENUM = 0x7fffffff, } VkPointClippingBehavior; +typedef VkPointClippingBehavior VkPointClippingBehaviorKHR; typedef enum VkPolygonMode { @@ -2058,6 +2070,7 @@ typedef enum VkSamplerYcbcrModelConversion VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020 = 4, VK_SAMPLER_YCBCR_MODEL_CONVERSION_MAX_ENUM = 0x7fffffff, } VkSamplerYcbcrModelConversion; +typedef VkSamplerYcbcrModelConversion VkSamplerYcbcrModelConversionKHR; typedef enum VkSamplerYcbcrRange { @@ -2065,6 +2078,7 @@ typedef enum VkSamplerYcbcrRange VK_SAMPLER_YCBCR_RANGE_ITU_NARROW = 1, VK_SAMPLER_YCBCR_RANGE_MAX_ENUM = 0x7fffffff, } VkSamplerYcbcrRange; +typedef VkSamplerYcbcrRange VkSamplerYcbcrRangeKHR; typedef enum VkScopeNV { @@ -2080,6 +2094,7 @@ typedef enum VkSemaphoreImportFlagBits VK_SEMAPHORE_IMPORT_TEMPORARY_BIT = 0x00000001, VK_SEMAPHORE_IMPORT_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkSemaphoreImportFlagBits; +typedef VkSemaphoreImportFlagBits VkSemaphoreImportFlagBitsKHR; typedef enum VkSemaphoreTypeKHR { @@ -2573,6 +2588,7 @@ typedef enum VkTessellationDomainOrigin VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT = 1, VK_TESSELLATION_DOMAIN_ORIGIN_MAX_ENUM = 0x7fffffff, } VkTessellationDomainOrigin; +typedef VkTessellationDomainOrigin VkTessellationDomainOriginKHR; typedef enum VkToolPurposeFlagBitsEXT {

1 0

Brendan Shanks : vulkan-1: Set FILEVERSION to fix official Vulkan loader installer.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 1e41a38c3b45332f2202caecc04f1c93bdeeb020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e41a38c3b45332f2202caec… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Mar 20 17:28:31 2020 -0700 vulkan-1: Set FILEVERSION to fix official Vulkan loader installer. Red Dead Redemption 2 requires and installs the official Vulkan loader, but the installer requires vulkan-1.dll's FILEVERSION to be lower than what it's installing. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/version.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/vulkan-1/version.rc b/dlls/vulkan-1/version.rc index ec75462ddf..93cf661525 100644 --- a/dlls/vulkan-1/version.rc +++ b/dlls/vulkan-1/version.rc @@ -20,6 +20,7 @@ #define WINE_FILEDESCRIPTION_STR "Wine Vulkan Loader" #define WINE_FILENAME_STR "vulkan-1.dll" +#define WINE_FILEVERSION 1,0,0,0 /* Set to 1.0.0 so the official Vulkan runtime installer will replace this file */ #define WINE_FILEVERSION_STR PACKAGE_VERSION #define WINE_PRODUCTVERSION_STR PACKAGE_VERSION #define WINE_PRODUCTNAME_STR "Wine Vulkan"

1 0

Alexandre Julliard : loader: Remove a check for antediluvian glibc.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: a449385150139627be9c00bc0022950ec1b42a31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a449385150139627be9c00bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 22 11:22:48 2020 +0100 loader: Remove a check for antediluvian glibc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/main.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/loader/main.c b/loader/main.c index f197cf802e..407c897892 100644 --- a/loader/main.c +++ b/loader/main.c @@ -36,7 +36,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#include <pthread.h> #include "wine/library.h" #include "main.h" @@ -87,42 +86,6 @@ static int pre_exec(void) #elif defined(__linux__) && (defined(__i386__) || defined(__arm__)) -#ifdef __i386__ -/* separate thread to check for NPTL and TLS features */ -static void *needs_pthread( void *arg ) -{ - pid_t tid = syscall( 224 /* SYS_gettid */ ); - /* check for NPTL */ - if (tid != -1 && tid != getpid()) return (void *)1; - /* check for TLS glibc */ - if (wine_get_gs() != 0) return (void *)1; - /* check for exported epoll_create to detect new glibc versions without TLS */ - if (wine_dlsym( RTLD_DEFAULT, "epoll_create", NULL, 0 )) - fprintf( stderr, - "wine: glibc >= 2.3 without NPTL or TLS is not a supported combination.\n" - " Please upgrade to a glibc with NPTL support.\n" ); - else - fprintf( stderr, - "wine: Your C library is too old. You need at least glibc 2.3 with NPTL support.\n" ); - return 0; -} - -/* check if we support the glibc threading model */ -static void check_threading(void) -{ - pthread_t id; - void *ret; - - pthread_create( &id, NULL, needs_pthread, NULL ); - pthread_join( id, &ret ); - if (!ret) exit(1); -} -#else -static void check_threading(void) -{ -} -#endif - static void check_vmsplit( void *stack ) { if (stack < (void *)0x80000000) @@ -150,7 +113,6 @@ static int pre_exec(void) { int temp; - check_threading(); check_vmsplit( &temp ); set_max_limit( RLIMIT_AS ); #ifdef __i386__

1 0

Alexandre Julliard : comctl32: Forward string functions to kernelbase.
by Alexandre Julliard 23 Mar '20

23 Mar '20

Module: wine Branch: master Commit: 077fc97a289e69f0ffb1c2e17bcb429f51074603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=077fc97a289e69f0ffb1c2e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 21 19:46:04 2020 +0100 comctl32: Forward string functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 48 ++-- dlls/comctl32/string.c | 673 -------------------------------------------- 2 files changed, 24 insertions(+), 697 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=077fc97a289e69f0ffb1…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020