November 2022 - Wine-commits

Jacek Caban : winevulkan: Don't try to convert ignored VkWriteDescriptorSet members.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 1e3d0c863c4dda57122a3e5ceecc705209e91d69 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e3d0c863c4dda57122a3e5ceecc70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 22:54:22 2022 +0100 winevulkan: Don't try to convert ignored VkWriteDescriptorSet members. Fixes crash in wined3d_unordered_access_view_vk_clear(). --- dlls/winevulkan/make_vulkan | 41 ++++++++++++++++++++++++++++++++--------- dlls/winevulkan/vulkan_thunks.c | 4 ++-- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 75121c8eef6..45948088fec 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -267,6 +267,25 @@ STRUCT_CHAIN_CONVERSIONS = { "VkInstanceCreateInfo": ["VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO"], } +# Some struct members are conditionally ignored and callers are free to leave them uninitialized. +# We can't deduce that from XML, so we allow expressing it here. +MEMBER_LENGTH_EXPRESSIONS = { + "VkWriteDescriptorSet": { + "pImageInfo": + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_SAMPLER || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM ? {len} : 0", + "pBufferInfo": + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC || " + + "{struct}descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC ? {len} : 0", + } +} class Direction(Enum): """ Parameter direction: input, output, input_output. """ @@ -1129,12 +1148,16 @@ class VkVariable(object): parent = var.struct.members len += len_str - if not len_str in parent: - return len + if len_str in parent: + var = parent[parent.index(len_str)] + if var.is_pointer(): + len = "*" + len + + if isinstance(self.parent, VkStruct) and self.parent.name in MEMBER_LENGTH_EXPRESSIONS: + exprs = MEMBER_LENGTH_EXPRESSIONS[self.parent.name] + if self.name in exprs: + len = exprs[self.name].format(struct=prefix, len=len) - var = parent[parent.index(len_str)] - if var.is_pointer(): - len = "*" + len return len def is_const(self): @@ -1786,12 +1809,12 @@ class VkStruct(Sequence): structextends = struct.attrib.get("structextends") structextends = structextends.split(",") if structextends else [] - members = [] + s = VkStruct(name, [], returnedonly, structextends, union=union) for member in struct.findall("member"): - vk_member = VkMember.from_xml(member, returnedonly, members) - members.append(vk_member) + vk_member = VkMember.from_xml(member, returnedonly, s) + s.members.append(vk_member) - return VkStruct(name, members, returnedonly, structextends, union=union) + return s @staticmethod def decouple_structs(structs): diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 6b45146fb88..d853986c9d5 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3327,8 +3327,8 @@ static inline void convert_VkWriteDescriptorSet_win32_to_host(struct conversion_ out->dstArrayElement = in->dstArrayElement; out->descriptorCount = in->descriptorCount; out->descriptorType = in->descriptorType; - out->pImageInfo = convert_VkDescriptorImageInfo_array_win32_to_host(ctx, in->pImageInfo, in->descriptorCount); - out->pBufferInfo = convert_VkDescriptorBufferInfo_array_win32_to_host(ctx, in->pBufferInfo, in->descriptorCount); + out->pImageInfo = convert_VkDescriptorImageInfo_array_win32_to_host(ctx, in->pImageInfo, in->descriptorType == VK_DESCRIPTOR_TYPE_SAMPLER || in->descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER || in->descriptorType == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE || in->descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE || in->descriptorType == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT || in->descriptorType == VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM || in->descriptorType == VK_DESCRIPTOR_TYPE_BLOCK_MATCH_IMAGE_QCOM ? in->descriptorCount : 0); + out->pBufferInfo = convert_VkDescriptorBufferInfo_array_win32_to_host(ctx, in->pBufferInfo, in->descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER || in->descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER || in->descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC || in->descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC ? in->descriptorCount : 0); out->pTexelBufferView = in->pTexelBufferView; } #endif /* USE_STRUCT_CONVERSION */

1 0

Jacek Caban : winevulkan: Move need for output member copy check to needs_conversion.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 85f9960147e97362f5c5be9561aef17d84f5ebde URL: https://gitlab.winehq.org/wine/wine/-/commit/85f9960147e97362f5c5be9561aef1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 11 19:51:36 2022 +0100 winevulkan: Move need for output member copy check to needs_conversion. --- dlls/winevulkan/make_vulkan | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 45948088fec..3257481b746 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1956,19 +1956,7 @@ class VkStruct(Sequence): # so that we have a chance to allocate buffers if e.needs_conversion(conv, True, Direction.OUTPUT, is_const, check_extensions=False): return True - elif not needs_output_copy and not is_const: - for m in e: - if m.name in ["sType", "pNext"]: - continue - # pointers will be handled by needs_conversion, but if we have any other non-const - # member, we may need to copy output - if not m.is_pointer() and not m.is_const(): - needs_output_copy = True - break - # if output needs any copy and we need input conversion, then we also need output conversion - if needs_output_copy and self.needs_extensions_conversion(conv, Direction.INPUT): - return True return False def needs_conversion(self, conv, unwrap, direction, is_const, check_extensions=True): @@ -1982,6 +1970,8 @@ class VkStruct(Sequence): if direction == Direction.OUTPUT and self.name == "VkImageCompressionControlEXT": return False + needs_output_copy = False + for m in self.members: if self.name == m.type: continue @@ -2011,6 +2001,15 @@ class VkStruct(Sequence): if m.needs_conversion(conv, unwrap, direction, is_const): return True + # pointers will be handled by needs_conversion, but if we have any other non-const + # member, we may need to copy output + if direction == Direction.OUTPUT and not m.is_pointer() and not is_const and not m.is_const(): + needs_output_copy = True + + # if output needs any copy and we need input conversion, then we also need output conversion + if needs_output_copy and self.needs_conversion(conv, unwrap, Direction.INPUT, check_extensions): + return True + return check_extensions and self.needs_extensions_conversion(conv, direction) def needs_alloc(self, conv, unwrap):

1 0

Alex Henrie : user32: Use standard C functions for memory allocation in combo.c.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 6d58a94857dd7c3513be7426dc75053f79b4955e URL: https://gitlab.winehq.org/wine/wine/-/commit/6d58a94857dd7c3513be7426dc7505… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 21:31:18 2022 -0700 user32: Use standard C functions for memory allocation in combo.c. The big win here is getting rid of the reimplementation of strdup. --- dlls/user32/combo.c | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 5ea61c607be..e03a168b237 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -23,6 +23,7 @@ #define OEMRESOURCE +#include <stdlib.h> #include "user_private.h" #include "controls.h" #include "wine/debug.h" @@ -112,7 +113,7 @@ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style) { LPHEADCOMBO lphc; - if (COMBO_Init() && (lphc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEADCOMBO))) ) + if( COMBO_Init() && (lphc = calloc( 1, sizeof(HEADCOMBO) )) ) { lphc->self = hwnd; SetWindowLongPtrW( hwnd, 0, (LONG_PTR)lphc ); @@ -154,7 +155,7 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) NtUserDestroyWindow( lphc->hWndLBox ); SetWindowLongPtrW( lphc->self, 0, 0 ); - HeapFree( GetProcessHeap(), 0, lphc ); + free( lphc ); } return 0; } @@ -641,7 +642,7 @@ static void CBPaintText( size = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, id, 0); if (size == LB_ERR) FIXME("LB_ERR probably not handled yet\n"); - if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) ) + if( (pText = malloc((size + 1) * sizeof(WCHAR))) ) { /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */ size=SendMessageW(lphc->hWndLBox, LB_GETTEXT, id, (LPARAM)pText); @@ -736,7 +737,7 @@ static void CBPaintText( if (!hdc_paint) NtUserReleaseDC( lphc->self, hdc ); } - HeapFree( GetProcessHeap(), 0, pText ); + free(pText); } /*********************************************************************** @@ -830,7 +831,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) length = SendMessageW( lphc->hWndEdit, WM_GETTEXTLENGTH, 0, 0 ); if( length > 0 ) - pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + pText = malloc((length + 1) * sizeof(WCHAR)); TRACE("\t edit text length %i\n", length ); @@ -838,7 +839,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) { GetWindowTextW( lphc->hWndEdit, pText, length + 1); idx = SendMessageW(lphc->hWndLBox, LB_FINDSTRING, -1, (LPARAM)pText); - HeapFree( GetProcessHeap(), 0, pText ); + free(pText); } SendMessageW(lphc->hWndLBox, LB_SETCURSEL, bSelect ? idx : -1, 0); @@ -867,7 +868,7 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) length = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, index, 0); if( length != LB_ERR) { - if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) ) + if( (pText = malloc((length + 1) * sizeof(WCHAR))) ) { SendMessageW(lphc->hWndLBox, LB_GETTEXT, index, (LPARAM)pText); } @@ -884,7 +885,7 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); - HeapFree( GetProcessHeap(), 0, pText ); + free(pText); } /*********************************************************************** @@ -1295,7 +1296,7 @@ static LRESULT COMBO_GetTextW( LPHEADCOMBO lphc, INT count, LPWSTR buf ) /* 'length' is without the terminating character */ if (length >= count) { - LPWSTR lpBuffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); + WCHAR *lpBuffer = malloc((length + 1) * sizeof(WCHAR)); if (!lpBuffer) goto error; length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)lpBuffer); @@ -1305,7 +1306,7 @@ static LRESULT COMBO_GetTextW( LPHEADCOMBO lphc, INT count, LPWSTR buf ) lstrcpynW( buf, lpBuffer, count ); length = count; } - HeapFree( GetProcessHeap(), 0, lpBuffer ); + free(lpBuffer); } else length = SendMessageW(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)buf); @@ -1345,7 +1346,7 @@ static LRESULT COMBO_GetTextA( LPHEADCOMBO lphc, INT count, LPSTR buf ) /* 'length' is without the terminating character */ if (length >= count) { - LPSTR lpBuffer = HeapAlloc(GetProcessHeap(), 0, (length + 1) ); + char *lpBuffer = malloc(length + 1); if (!lpBuffer) goto error; length = SendMessageA(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)lpBuffer); @@ -1355,7 +1356,7 @@ static LRESULT COMBO_GetTextA( LPHEADCOMBO lphc, INT count, LPSTR buf ) lstrcpynA( buf, lpBuffer, count ); length = count; } - HeapFree( GetProcessHeap(), 0, lpBuffer ); + free(lpBuffer); } else length = SendMessageA(lphc->hWndLBox, LB_GETTEXT, idx, (LPARAM)buf); @@ -1678,19 +1679,6 @@ static LRESULT COMBO_GetComboBoxInfo(const HEADCOMBO *lphc, COMBOBOXINFO *pcbi) return TRUE; } -static char *strdupA(LPCSTR str) -{ - char *ret; - DWORD len; - - if(!str) return NULL; - - len = strlen(str); - ret = HeapAlloc(GetProcessHeap(), 0, len + 1); - memcpy(ret, str, len + 1); - return ret; -} - /*********************************************************************** * ComboWndProc_common */ @@ -1927,18 +1915,18 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar LRESULT ret; if( lphc->dwStyle & CBS_LOWERCASE ) { - string = strdupA((LPSTR)lParam); + string = strdup((char *)lParam); CharLowerA(string); } else if( lphc->dwStyle & CBS_UPPERCASE ) { - string = strdupA((LPSTR)lParam); + string = strdup((char *)lParam); CharUpperA(string); } ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); - HeapFree(GetProcessHeap(), 0, string); + free(string); return ret; } case CB_INSERTSTRING:

1 0

Alex Henrie : include: Include limits.h in stdlib.h.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 7c2af26a620bfeafc6d7fcffc3cda8db2129a570 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c2af26a620bfeafc6d7fcffc3cda8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 13 22:41:10 2022 -0700 include: Include limits.h in stdlib.h. Needed to compile Tera Term. --- include/msvcrt/stdlib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 7c2d7d7f9ad..c52423523f7 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -9,6 +9,7 @@ #define __WINE_STDLIB_H #include <corecrt_wstdlib.h> +#include <limits.h> #include <pshpack8.h>

1 0

Jinoh Kang : ntdll: Use an acquire/release pair on the IOSB status.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 282120a9c510bdb9aa3976e203437ebc2e28c08b URL: https://gitlab.winehq.org/wine/wine/-/commit/282120a9c510bdb9aa3976e203437e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 12 19:33:58 2022 -0600 ntdll: Use an acquire/release pair on the IOSB status. --- dlls/kernelbase/file.c | 6 +++++- dlls/ntdll/unix/unix_private.h | 26 ++++++++++++++++++++++---- dlls/ws2_32/socket.c | 6 +++++- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 661bc0c2778..ac04388acde 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3156,7 +3156,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *ov TRACE( "(%p %p %p %lu %d)\n", file, overlapped, result, timeout, alertable ); - status = overlapped->Internal; + /* Paired with the write-release in set_async_iosb() in ntdll; see the + * latter for details. */ + status = ReadAcquire( (LONG *)&overlapped->Internal ); if (status == STATUS_PENDING) { if (!timeout) @@ -3173,6 +3175,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetOverlappedResultEx( HANDLE file, OVERLAPPED *ov return FALSE; } + /* We don't need to give this load acquire semantics; the wait above + * already guarantees that the IOSB and output buffer are filled. */ status = overlapped->Internal; if (status == STATUS_PENDING) status = STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index b94a27aca68..9cf8989fb0d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -367,6 +367,24 @@ static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR { if (!iosb) return; + /* GetOverlappedResult() and WSAGetOverlappedResult() expect that if the + * status is written, that the information (and buffer, which was written + * earlier from the async callback) will be available. Hence we need to + * store the status last, with release semantics to ensure that those + * writes are visible. This release is paired with a read-acquire in + * GetOverlappedResult() and WSAGetOverlappedResult(): + * + * CPU 0 (set_async_iosb) CPU 1 (GetOverlappedResultEx) + * =========================== =========================== + * write buffer + * write Information + * WriteRelease(Status) <--------. + * | + * | + * (paired with) `-> ReadAcquire(Status) + * read Information + */ + if (in_wow64_call()) { struct iosb32 @@ -374,18 +392,18 @@ static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR NTSTATUS Status; ULONG Information; } *io = wine_server_get_ptr( iosb ); - io->Status = status; io->Information = info; + WriteRelease( &io->Status, status ); } else { IO_STATUS_BLOCK *io = wine_server_get_ptr( iosb ); + io->Information = info; #ifdef NONAMELESSUNION - io->u.Status = status; + WriteRelease( &io->u.Status, status ); #else - io->Status = status; + WriteRelease( &io->Status, status ); #endif - io->Information = info; } } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9e447f29d8c..09684f25b25 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3710,7 +3710,9 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, return FALSE; } - status = lpOverlapped->Internal; + /* Paired with the write-release in set_async_iosb() in ntdll; see the + * latter for details. */ + status = ReadAcquire( (LONG *)&lpOverlapped->Internal ); if (status == STATUS_PENDING) { if (!fWait) @@ -3722,6 +3724,8 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, if (WaitForSingleObject( lpOverlapped->hEvent ? lpOverlapped->hEvent : SOCKET2HANDLE(s), INFINITE ) == WAIT_FAILED) return FALSE; + /* We don't need to give this load acquire semantics; the wait above + * already guarantees that the IOSB and output buffer are filled. */ status = lpOverlapped->Internal; }

1 0

Erich E. Hoover : ntdll: Add support for FreeBSD style extended attributes.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 71afae901f3c627331bf544e52a5b0e825391b66 URL: https://gitlab.winehq.org/wine/wine/-/commit/71afae901f3c627331bf544e52a5b0… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon Oct 6 14:21:11 2014 -0600 ntdll: Add support for FreeBSD style extended attributes. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- configure | 6 ++++++ configure.ac | 1 + dlls/ntdll/unix/file.c | 24 +++++++++++++++++++++++- include/config.h.in | 3 +++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/configure b/configure index b21cc96dec0..aaebcc553f5 100755 --- a/configure +++ b/configure @@ -8194,6 +8194,12 @@ if test "x$ac_cv_header_sys_event_h" = xyes then : printf "%s\n" "#define HAVE_SYS_EVENT_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "sys/extattr.h" "ac_cv_header_sys_extattr_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_extattr_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_EXTATTR_H 1" >>confdefs.h + fi ac_fn_c_check_header_compile "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default" if test "x$ac_cv_header_sys_filio_h" = xyes diff --git a/configure.ac b/configure.ac index 51a02d3e876..fe6a773d1c3 100644 --- a/configure.ac +++ b/configure.ac @@ -467,6 +467,7 @@ AC_CHECK_HEADERS(\ sys/cdio.h \ sys/epoll.h \ sys/event.h \ + sys/extattr.h \ sys/filio.h \ sys/ipc.h \ sys/link.h \ diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 44ff136c423..e80eb368e8a 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -102,6 +102,10 @@ #ifdef HAVE_SYS_XATTR_H #include <sys/xattr.h> #endif +#ifdef HAVE_SYS_EXTATTR_H +#undef XATTR_ADDITIONAL_OPTIONS +#include <sys/extattr.h> +#endif #include <time.h> #include <unistd.h> @@ -171,7 +175,14 @@ typedef struct #define MAX_IGNORED_FILES 4 -#define SAMBA_XATTR_DOS_ATTRIB "user.DOSATTRIB" +#ifndef XATTR_USER_PREFIX +# define XATTR_USER_PREFIX "user." +#endif +#ifndef XATTR_USER_PREFIX_LEN +# define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1) +#endif + +#define SAMBA_XATTR_DOS_ATTRIB XATTR_USER_PREFIX "DOSATTRIB" #define XATTR_ATTRIBS_MASK (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM) struct file_identity @@ -371,6 +382,8 @@ static int xattr_fremove( int filedes, const char *name ) # else return fremovexattr( filedes, name ); # endif +#elif defined(HAVE_SYS_EXTATTR_H) + return extattr_delete_fd( filedes, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN] ); #else errno = ENOSYS; return -1; @@ -386,6 +399,9 @@ static int xattr_fset( int filedes, const char *name, const void *value, size_t # else return fsetxattr( filedes, name, value, size, 0 ); # endif +#elif defined(HAVE_SYS_EXTATTR_H) + return extattr_set_fd( filedes, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN], + value, size ); #else errno = ENOSYS; return -1; @@ -401,6 +417,9 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si # else return getxattr( path, name, value, size ); # endif +#elif defined(HAVE_SYS_EXTATTR_H) + return extattr_get_file( path, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN], + value, size ); #else errno = ENOSYS; return -1; @@ -416,6 +435,9 @@ static int xattr_fget( int filedes, const char *name, void *value, size_t size ) # else return fgetxattr( filedes, name, value, size ); # endif +#elif defined(HAVE_SYS_EXTATTR_H) + return extattr_get_fd( filedes, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN], + value, size ); #else errno = ENOSYS; return -1; diff --git a/include/config.h.in b/include/config.h.in index 1cea698f585..3a06d36bd02 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -568,6 +568,9 @@ /* Define to 1 if you have the <sys/event.h> header file. */ #undef HAVE_SYS_EVENT_H +/* Define to 1 if you have the <sys/extattr.h> header file. */ +#undef HAVE_SYS_EXTATTR_H + /* Define to 1 if you have the <sys/filio.h> header file. */ #undef HAVE_SYS_FILIO_H

1 0

Rémi Bernon : server: Remove no-op raw_msg.foreground release.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 9804210966628c89ce04648c529f9cc3c2b1e8dc URL: https://gitlab.winehq.org/wine/wine/-/commit/9804210966628c89ce04648c529f9c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 20:44:12 2021 +0200 server: Remove no-op raw_msg.foreground release. It's previously set to NULL and never updated. --- server/queue.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/queue.c b/server/queue.c index 01fe8d6c060..22f720530b9 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2043,8 +2043,6 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ msg_data->rawinput = input->hw.rawinput; enum_processes( queue_rawinput_message, &raw_msg ); - - if (raw_msg.foreground) release_object( raw_msg.foreground ); return; }

1 0

Zebediah Figura : ntdll: Make the "not found" trace in nt_to_unix_file_name_no_root() less misleading.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 5f29bcda6a2f67c826add8a0e59a7ac0f5fd6537 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f29bcda6a2f67c826add8a0e59a7a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Oct 31 23:52:11 2022 -0500 ntdll: Make the "not found" trace in nt_to_unix_file_name_no_root() less misleading. unix_name is not guaranteed to be zero-terminated at this point. --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 6b73d9dc7e8..44ff136c423 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3540,7 +3540,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char } else { - TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); + TRACE( "%s not found in %s\n", debugstr_w(name), debugstr_an(unix_name, pos) ); free( unix_name ); } return status;

1 0

Eric Pouech : winedbg: Don't use invalid address mode in exception prolog.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 41221452c875592c8eaf24be7ec722ebc22e5fd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/41221452c875592c8eaf24be7ec722… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Nov 13 14:23:01 2022 +0100 winedbg: Don't use invalid address mode in exception prolog. Removes a GCC 12.2 warning about printing NULL string. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/tgt_active.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 943ac7a5891..9e130038f22 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -153,7 +153,7 @@ static BOOL dbg_exception_prolog(BOOL is_debug, const EXCEPTION_RECORD* rec) if (addr.Mode != dbg_curr_thread->addr_mode) { - const char* name = NULL; + const char* name; switch (addr.Mode) { @@ -162,6 +162,7 @@ static BOOL dbg_exception_prolog(BOOL is_debug, const EXCEPTION_RECORD* rec) case AddrModeReal: name = "vm86"; break; case AddrModeFlat: name = dbg_curr_process->be_cpu->pointer_size == 4 ? "32 bit" : "64 bit"; break; + default: return FALSE; } dbg_printf("In %s mode.\n", name); dbg_curr_thread->addr_mode = addr.Mode;

1 0

Eric Pouech : cmd: Don't write outside of variable array.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 8f1febc43019af11c606cb4a5207be999f5ecefc URL: https://gitlab.winehq.org/wine/wine/-/commit/8f1febc43019af11c606cb4a5207be… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sun Nov 13 15:31:27 2022 +0100 cmd: Don't write outside of variable array. GCC 12.2 rightfully complains about an out-of-founds array access. This can possibly happen for unsupported variable names. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 82008c3ec7a..4856b619812 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2025,7 +2025,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, } /* Execute the body of the foor loop with these values */ - if (forloopcontext.variable[varidx] && forloopcontext.variable[varidx][0] != forf_eol) { + if (varidx >= 0 && forloopcontext.variable[varidx] && forloopcontext.variable[varidx][0] != forf_eol) { CMD_LIST *thisCmdStart = cmdStart; *doExecuted = TRUE; WCMD_part_execute(&thisCmdStart, firstCmd, FALSE, TRUE);

1 0