March 2020 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus/tests: Don't test the exact substitution of MS Shell Dlg.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 689e94c597471bb5779268bf21f093f9668c163e URL: https://source.winehq.org/git/wine.git/?a=commit;h=689e94c597471bb5779268bf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Mar 22 14:46:17 2020 -0500 gdiplus/tests: Don't test the exact substitution of MS Shell Dlg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47872 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index a4a96970af..10d1f3bd5a 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -828,8 +828,7 @@ static void test_font_substitution(void) memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); - ok(!lstrcmpA(lf.lfFaceName, "Microsoft Sans Serif") || - !lstrcmpA(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName); + ok(lstrcmpA(lf.lfFaceName, "MS Shell Dlg") != 0, "expected substitution of MS Shell Dlg\n"); GdipDeleteFont(font); status = GdipCreateFontFamilyFromName(L"MS Shell Dlg", NULL, &family); @@ -839,8 +838,7 @@ static void test_font_substitution(void) memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); - ok(!lstrcmpA(lf.lfFaceName, "Microsoft Sans Serif") || - !lstrcmpA(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName); + ok(lstrcmpA(lf.lfFaceName, "MS Shell Dlg") != 0, "expected substitution of MS Shell Dlg\n"); GdipDeleteFont(font); GdipDeleteFontFamily(family);

1 0

Vincent Povirk : gdiplus/tests: Don't test font face of DEFAULT_GUI_FONT.
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 861811254f52f278d9cf7eeab5fc4b167d65bd4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=861811254f52f278d9cf7eea… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Mar 22 14:46:16 2020 -0500 gdiplus/tests: Don't test font face of DEFAULT_GUI_FONT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47872 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 9abb80faaf..a4a96970af 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -808,29 +808,20 @@ static void test_font_metrics(void) static void test_font_substitution(void) { - WCHAR ms_shell_dlg[LF_FACESIZE]; char fallback_font[LF_FACESIZE]; HDC hdc; - HFONT hfont; LOGFONTA lf; GpStatus status; GpGraphics *graphics; GpFont *font; GpFontFamily *family; - int ret; hdc = CreateCompatibleDC(0); status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); - hfont = GetStockObject(DEFAULT_GUI_FONT); - ok(hfont != 0, "GetStockObject(DEFAULT_GUI_FONT) failed\n"); - - memset(&lf, 0xfe, sizeof(lf)); - ret = GetObjectA(hfont, sizeof(lf), &lf); - ok(ret == sizeof(lf), "GetObject failed\n"); - ok(!lstrcmpA(lf.lfFaceName, "MS Shell Dlg"), "wrong face name %s\n", lf.lfFaceName); - MultiByteToWideChar(CP_ACP, 0, lf.lfFaceName, -1, ms_shell_dlg, LF_FACESIZE); + memset(&lf, 0, sizeof(lf)); + lstrcpyA(lf.lfFaceName, "MS Shell Dlg"); status = GdipCreateFontFromLogfontA(hdc, &lf, &font); expect(Ok, status); @@ -841,7 +832,7 @@ static void test_font_substitution(void) !lstrcmpA(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName); GdipDeleteFont(font); - status = GdipCreateFontFamilyFromName(ms_shell_dlg, NULL, &family); + status = GdipCreateFontFamilyFromName(L"MS Shell Dlg", NULL, &family); expect(Ok, status); status = GdipCreateFont(family, 12, FontStyleRegular, UnitPoint, &font); expect(Ok, status);

1 0

Zebediah Figura : ntdll: Report Unix mount points as Win32 mount points in NtQueryInformationFile().
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 340757c62a1e1a02ef5ef0cd6626c48c02a764d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340757c62a1e1a02ef5ef0cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 20 12:15:26 2020 -0500 ntdll: Report Unix mount points as Win32 mount points in NtQueryInformationFile(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 31 ++++++++++++++++++++++--------- include/winternl.h | 2 +- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c2ec4a7dee..1a5f86d7c2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -136,8 +136,15 @@ static inline ULONG get_file_attributes( const struct stat *st ) return attr; } +static BOOL fd_is_mount_point( int fd, const struct stat *st ) +{ + struct stat parent; + return S_ISDIR( st->st_mode ) && !fstatat( fd, "..", &parent, 0 ) + && (parent.st_dev != st->st_dev || parent.st_ino == st->st_ino); +} + /* get the stat info and file attributes for a file (by file descriptor) */ -int fd_get_file_info( int fd, struct stat *st, ULONG *attr ) +int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULONG *attr ) { int ret; @@ -145,6 +152,9 @@ int fd_get_file_info( int fd, struct stat *st, ULONG *attr ) ret = fstat( fd, st ); if (ret == -1) return ret; *attr |= get_file_attributes( st ); + /* consider mount points to be reparse points (IO_REPARSE_TAG_MOUNT_POINT) */ + if ((options & FILE_OPEN_REPARSE_POINT) && fd_is_mount_point( fd, st )) + *attr |= FILE_ATTRIBUTE_REPARSE_POINT; return ret; } @@ -2319,6 +2329,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, struct stat st; int fd, needs_close = FALSE; ULONG attr; + unsigned int options; TRACE("(%p,%p,%p,0x%08x,0x%08x)\n", hFile, io, ptr, len, class); @@ -2331,7 +2342,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; - if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) + if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, &options ))) { if (io->u.Status != STATUS_BAD_DEVICE_TYPE) return io->u.Status; return server_get_file_info( hFile, io, ptr, len, class ); @@ -2340,7 +2351,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, switch (class) { case FileBasicInformation: - if (fd_get_file_info( fd, &st, &attr ) == -1) + if (fd_get_file_info( fd, options, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) io->u.Status = STATUS_INVALID_INFO_CLASS; @@ -2351,7 +2362,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, { FILE_STANDARD_INFORMATION *info = ptr; - if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); + if (fd_get_file_info( fd, options, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else { fill_file_info( &st, attr, info, class ); @@ -2368,7 +2379,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, } break; case FileInternalInformation: - if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); + if (fd_get_file_info( fd, options, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else fill_file_info( &st, attr, ptr, class ); break; case FileEaInformation: @@ -2378,7 +2389,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, } break; case FileEndOfFileInformation: - if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); + if (fd_get_file_info( fd, options, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else fill_file_info( &st, attr, ptr, class ); break; case FileAllInformation: @@ -2386,7 +2397,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, FILE_ALL_INFORMATION *info = ptr; ANSI_STRING unix_name; - if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); + if (fd_get_file_info( fd, options, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode)) io->u.Status = STATUS_INVALID_INFO_CLASS; else if (!(io->u.Status = server_get_unix_name( hFile, &unix_name ))) @@ -2494,7 +2505,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, } break; case FileIdInformation: - if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); + if (fd_get_file_info( fd, options, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else { FILE_ID_INFORMATION *info = ptr; @@ -2504,12 +2515,14 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, } break; case FileAttributeTagInformation: - if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); + if (fd_get_file_info( fd, options, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else { FILE_ATTRIBUTE_TAG_INFORMATION *info = ptr; info->FileAttributes = attr; info->ReparseTag = 0; /* FIXME */ + if ((options & FILE_OPEN_REPARSE_POINT) && fd_is_mount_point( fd, &st )) + info->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; } break; default: diff --git a/include/winternl.h b/include/winternl.h index d9809c7ad3..19e8965e99 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1795,7 +1795,7 @@ typedef struct _RTL_HANDLE_TABLE #define FILE_OPEN_FOR_BACKUP_INTENT 0x00004000 #define FILE_NO_COMPRESSION 0x00008000 #define FILE_RESERVE_OPFILTER 0x00100000 -#define FILE_TRANSACTED_MODE 0x00200000 +#define FILE_OPEN_REPARSE_POINT 0x00200000 #define FILE_OPEN_OFFLINE_FILE 0x00400000 #define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000

1 0

Liam Middlebrook : winevulkan: Generate alias enum values.
by Alexandre Julliard March 23, 2020

March 23, 2020

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 March 23, 2020

March 23, 2020

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 March 23, 2020

March 23, 2020

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

Liam Middlebrook : winevulkan: Update to VK spec version spec 1.2.134.
by Alexandre Julliard March 23, 2020

March 23, 2020

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

Zebediah Figura : kernel32/tests: Fix some test failures when run from a mounted folder.
by Alexandre Julliard March 23, 2020

March 23, 2020

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

Zebediah Figura : kernel32: Reimplement GetVolumePathName() using NtQueryInformationFile(FileAttributeTagInformation).
by Alexandre Julliard March 23, 2020

March 23, 2020

Module: wine Branch: master Commit: 9b80443a8ff67523f0c2d8ba11779523a5fa3cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b80443a8ff67523f0c2d8ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 20 12:15:27 2020 -0500 kernel32: Reimplement GetVolumePathName() using NtQueryInformationFile(FileAttributeTagInformation). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 4 +- dlls/kernel32/volume.c | 242 +++++++++++++++++++++++-------------------- 2 files changed, 134 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b80443a8ff67523f0c2…

1 0

Alexandre Julliard : loader: Remove a check for antediluvian glibc.
by Alexandre Julliard March 23, 2020

March 23, 2020

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