June 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Introduce new helpers to convert server rectangle_t.
by Alexandre Julliard June 6, 2024

June 6, 2024

Module: wine Branch: master Commit: 9e9d2d43c1d1931fd3450543b4913d339687d24c URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9d2d43c1d1931fd3450543b4913d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 10:37:26 2024 +0200 win32u: Introduce new helpers to convert server rectangle_t. --- dlls/win32u/dce.c | 15 ++++---------- dlls/win32u/input.c | 47 +++++++++---------------------------------- dlls/win32u/message.c | 5 +---- dlls/win32u/window.c | 31 +++++----------------------- dlls/wineandroid.drv/window.c | 5 +---- dlls/winex11.drv/event.c | 5 +---- dlls/winex11.drv/mouse.c | 5 +---- dlls/winex11.drv/window.c | 5 +---- include/wine/server.h | 26 ++++++++++++++++++++++++ 9 files changed, 49 insertions(+), 95 deletions(-)

1 0

Brendan Shanks : ntdll: On macOS, check for xattr existence before calling getxattr.
by Alexandre Julliard June 5, 2024

June 5, 2024

Module: wine Branch: master Commit: 6a512200f4719ea6b0be6de83cac632112a38b36 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a512200f4719ea6b0be6de83cac63… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 30 15:34:34 2024 -0700 ntdll: On macOS, check for xattr existence before calling getxattr. --- dlls/ntdll/unix/file.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d1a6573ed69..1cafe7aa8b7 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -408,8 +408,42 @@ static int xattr_fset( int filedes, const char *name, const void *value, size_t } +/* On macOS, getxattr() is significantly slower than listxattr() + * (even for files with no extended attributes). + */ +#ifdef __APPLE__ +static BOOL xattr_exists( const char **path, int *filedes, const char *name ) +{ + char xattrs[1024]; + ssize_t i = 0, ret; + + if (path) + ret = listxattr( *path, xattrs, sizeof(xattrs), 0 ); + else + ret = flistxattr( *filedes, xattrs, sizeof(xattrs), 0 ); + if (ret == -1) + return errno == ERANGE; + + while (i < ret) + { + if (!strcmp( name, &xattrs[i] )) + return TRUE; + i += strlen(&xattrs[i]) + 1; + } + + errno = ENOATTR; + return FALSE; +} +#endif + + static int xattr_get( const char *path, const char *name, void *value, size_t size ) { +#ifdef __APPLE__ + if (!xattr_exists( &path, NULL, name )) + return -1; +#endif + #ifdef HAVE_SYS_XATTR_H # ifdef XATTR_ADDITIONAL_OPTIONS return getxattr( path, name, value, size, 0, 0 ); @@ -428,6 +462,11 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si static int xattr_fget( int filedes, const char *name, void *value, size_t size ) { +#ifdef __APPLE__ + if (!xattr_exists( NULL, &filedes, name )) + return -1; +#endif + #ifdef HAVE_SYS_XATTR_H # ifdef XATTR_ADDITIONAL_OPTIONS return fgetxattr( filedes, name, value, size, 0, 0 );

1 0

Brendan McGrath : ntdll/tests: Test error code when NtOpenFile uses file as directory.
by Alexandre Julliard June 5, 2024

June 5, 2024

Module: wine Branch: master Commit: a0c2f40b4e26128bd3ba99613eeba4b2e41d6e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0c2f40b4e26128bd3ba99613eeba4… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Wed May 29 11:46:11 2024 +1000 ntdll/tests: Test error code when NtOpenFile uses file as directory. --- dlls/ntdll/tests/file.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 9dd49c925b7..7961abad1b1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -414,6 +414,16 @@ static void open_file_test(void) CloseHandle( handle ); pRtlFreeUnicodeString( &nameW ); + wcscat( path, L"\\" ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + status = NtOpenFile( &handle, FILE_LIST_DIRECTORY | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT ); + todo_wine + ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( handle ); + pRtlFreeUnicodeString( &nameW ); + wcscat( path, L"\\cmd.exe" ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io,

1 0

Brendan McGrath : server: Don't always return STATUS_OBJECT_NAME_INVALID on ENOTDIR.
by Alexandre Julliard June 5, 2024

June 5, 2024

Module: wine Branch: master Commit: d88863805dc4b79d965577a31b2845c0c81a09d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d88863805dc4b79d965577a31b2845… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Wed May 29 11:52:18 2024 +1000 server: Don't always return STATUS_OBJECT_NAME_INVALID on ENOTDIR. Only return STATUS_OBJECT_NAME_INVALID if we're not looking for a FILE_DIRECTORY_FILE. --- dlls/kernel32/tests/file.c | 1 - dlls/ntdll/tests/file.c | 1 - server/fd.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9e5c1e4c594..940b1441e19 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2769,7 +2769,6 @@ static void test_FindFirstFileA(void) handle = FindFirstFileA(buffer2, &data); err = GetLastError(); ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should fail\n", buffer2 ); - todo_wine ok ( err == ERROR_DIRECTORY, "Bad Error number %x\n", err ); } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7961abad1b1..7d3618a3804 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -419,7 +419,6 @@ static void open_file_test(void) status = NtOpenFile( &handle, FILE_LIST_DIRECTORY | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT ); - todo_wine ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status ); CloseHandle( handle ); pRtlFreeUnicodeString( &nameW ); diff --git a/server/fd.c b/server/fd.c index fc7f7be92b9..f28937466fc 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1942,7 +1942,7 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam if (fd->unix_fd == -1) { /* check for trailing slash on file path */ - if ((errno == ENOENT || errno == ENOTDIR) && name[strlen(name) - 1] == '/') + if ((errno == ENOENT || (errno == ENOTDIR && !(options & FILE_DIRECTORY_FILE))) && name[strlen(name) - 1] == '/') set_error( STATUS_OBJECT_NAME_INVALID ); else file_set_error();

1 0

Rémi Bernon : win32u: Move UpdateLayeredWindow implementation out of the drivers.
by Alexandre Julliard June 5, 2024

June 5, 2024

Module: wine Branch: master Commit: 83a143efe0b0714ff90edfd1654dcd295feada2f URL: https://gitlab.winehq.org/wine/wine/-/commit/83a143efe0b0714ff90edfd1654dcd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 4 08:41:11 2024 +0200 win32u: Move UpdateLayeredWindow implementation out of the drivers. --- dlls/win32u/driver.c | 11 +++++----- dlls/win32u/window.c | 48 ++++++++++++++++++++++++++++++----------- dlls/wineandroid.drv/android.h | 2 -- dlls/wineandroid.drv/init.c | 1 - dlls/wineandroid.drv/window.c | 49 ------------------------------------------ dlls/winemac.drv/macdrv.h | 4 ++-- dlls/winemac.drv/window.c | 40 +++------------------------------- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/window.c | 40 ---------------------------------- dlls/winex11.drv/x11drv.h | 2 -- include/wine/gdi_driver.h | 4 +--- 11 files changed, 46 insertions(+), 156 deletions(-)

1 0

Brendan McGrath : kernel32/tests: Test error code when FindFirstFileA uses file as directory.
by Alexandre Julliard June 5, 2024

June 5, 2024

Module: wine Branch: master Commit: 34446f8cb66036dd3cd0083a558eafd351317150 URL: https://gitlab.winehq.org/wine/wine/-/commit/34446f8cb66036dd3cd0083a558eaf… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue May 28 12:24:24 2024 +1000 kernel32/tests: Test error code when FindFirstFileA uses file as directory. --- dlls/kernel32/tests/file.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 02625140702..9e5c1e4c594 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2715,6 +2715,7 @@ static void test_FindFirstFileA(void) char buffer[5] = "C:\\"; char buffer2[100]; char nonexistent[MAX_PATH]; + BOOL found = FALSE; /* try FindFirstFileA on "C:\" */ buffer[0] = get_windows_drive(); @@ -2746,10 +2747,32 @@ static void test_FindFirstFileA(void) ok( FindNextFileA( handle, &data ), "FindNextFile failed\n" ); ok( !strcmp( data.cFileName, ".." ), "FindNextFile should return '..' as second entry\n" ); while (FindNextFileA( handle, &data )) + { ok ( strcmp( data.cFileName, "." ) && strcmp( data.cFileName, ".." ), "FindNextFile shouldn't return '%s'\n", data.cFileName ); + if (!found && (data.dwFileAttributes == FILE_ATTRIBUTE_NORMAL || + data.dwFileAttributes == FILE_ATTRIBUTE_ARCHIVE)) + { + GetWindowsDirectoryA( buffer2, sizeof(buffer2) ); + strcat(buffer2, "\\"); + strcat(buffer2, data.cFileName); + strcat(buffer2, "\\*"); + found = TRUE; + } + } ok ( FindClose(handle) == TRUE, "Failed to close handle %s\n", buffer2 ); + ok ( found, "Windows dir should not be empty\n" ); + if (found) + { + SetLastError( 0xdeadbeef ); + handle = FindFirstFileA(buffer2, &data); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should fail\n", buffer2 ); + todo_wine + ok ( err == ERROR_DIRECTORY, "Bad Error number %x\n", err ); + } + /* try FindFirstFileA on "C:\foo\" */ SetLastError( 0xdeadbeaf ); if (!GetTempFileNameA( buffer, "foo", 0, nonexistent ))

1 0

Rémi Bernon : server: Avoid calling set_event from within msg_queue_add_queue.
by Alexandre Julliard June 5, 2024

June 5, 2024

Module: wine Branch: master Commit: 9ec501141e153aa01bcd6e4ce3846d1a4f786d51 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ec501141e153aa01bcd6e4ce3846d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 4 22:40:46 2024 +0200 server: Avoid calling set_event from within msg_queue_add_queue. --- server/queue.c | 10 ++++++++-- server/thread.c | 8 ++++++-- server/user.h | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index e881e40271d..7a1a8b6ece6 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1098,7 +1098,6 @@ static int is_queue_hung( struct msg_queue *queue ) static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry ) { struct msg_queue *queue = (struct msg_queue *)obj; - struct process *process = get_wait_queue_thread(entry)->process; /* a thread can only wait on its own queue */ if (get_wait_queue_thread(entry)->queue != queue) @@ -1106,7 +1105,6 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent set_error( STATUS_ACCESS_DENIED ); return 0; } - if (process->idle_event && !(queue->wake_mask & QS_SMRESULT)) set_event( process->idle_event ); if (queue->fd && list_empty( &obj->wait_queue )) /* first on the queue */ set_fd_events( queue->fd, POLLIN ); @@ -1255,6 +1253,14 @@ static int check_queue_input_window( struct msg_queue *queue, user_handle_t wind return ret; } +/* check if the thread queue is idle and set the process idle event if so */ +void check_thread_queue_idle( struct thread *thread ) +{ + struct msg_queue *queue = thread->queue; + if ((queue->wake_mask & QS_SMRESULT)) return; + if (thread->process->idle_event) set_event( thread->process->idle_event ); +} + /* make sure the specified thread has a queue */ int init_thread_queue( struct thread *thread ) { diff --git a/server/thread.c b/server/thread.c index 55bd63d3030..6542e1584ab 100644 --- a/server/thread.c +++ b/server/thread.c @@ -778,7 +778,7 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj { struct thread_wait *wait; struct wait_queue_entry *entry; - unsigned int i; + unsigned int i, idle = 0; if (!(wait = mem_alloc( FIELD_OFFSET(struct thread_wait, queues[count]) ))) return 0; wait->next = current->wait; @@ -802,8 +802,12 @@ static int wait_on( const select_op_t *select_op, unsigned int count, struct obj end_wait( current, get_error() ); return 0; } + + if (obj == (struct object *)current->queue) idle = 1; } - return 1; + + if (idle) check_thread_queue_idle( current ); + return current->wait ? 1 : 0; } static int wait_on_handles( const select_op_t *select_op, unsigned int count, const obj_handle_t *handles, diff --git a/server/user.h b/server/user.h index d805a179d16..703a55d5009 100644 --- a/server/user.h +++ b/server/user.h @@ -113,6 +113,7 @@ extern void set_queue_hooks( struct thread *thread, struct hook_table *hooks ); extern void inc_queue_paint_count( struct thread *thread, int incr ); extern void queue_cleanup_window( struct thread *thread, user_handle_t win ); extern int init_thread_queue( struct thread *thread ); +extern void check_thread_queue_idle( struct thread *thread ); extern int attach_thread_input( struct thread *thread_from, struct thread *thread_to ); extern void detach_thread_input( struct thread *thread_from ); extern void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect,

1 0

Rémi Bernon : win32u: Introduce a new CreateLayeredWindow driver entry.
by Alexandre Julliard June 5, 2024

June 5, 2024

Module: wine Branch: master Commit: 091883d4b6b32cfa9e9cc0c0c3a4c104babdc815 URL: https://gitlab.winehq.org/wine/wine/-/commit/091883d4b6b32cfa9e9cc0c0c3a4c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 2 12:33:27 2024 +0200 win32u: Introduce a new CreateLayeredWindow driver entry. --- dlls/win32u/driver.c | 21 ++++++++++++++++++--- dlls/win32u/window.c | 10 +++++++++- dlls/wineandroid.drv/android.h | 4 +++- dlls/wineandroid.drv/init.c | 1 + dlls/wineandroid.drv/window.c | 42 +++++++++++++++++++++++------------------ dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 4 +++- dlls/winemac.drv/window.c | 41 ++++++++++++++++++++++++---------------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/window.c | 43 ++++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 4 +++- include/wine/gdi_driver.h | 3 ++- 12 files changed, 115 insertions(+), 60 deletions(-)

1 0

Rémi Bernon : winex11: Always clear UpdateLayeredWindow target rectangle.
by Alexandre Julliard June 5, 2024

June 5, 2024

Module: wine Branch: master Commit: 18282e2bfb30dad4800038e3a9cd03058cfabc0c URL: https://gitlab.winehq.org/wine/wine/-/commit/18282e2bfb30dad4800038e3a9cd03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jun 2 12:32:27 2024 +0200 winex11: Always clear UpdateLayeredWindow target rectangle. --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f2ffbebcc7c..9287e73bca0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -3029,8 +3029,8 @@ BOOL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, { intersect_rect( &rect, &rect, info->prcDirty ); memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); - NtGdiPatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); } + NtGdiPatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); src_rect = rect; if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); NtGdiTransformPoints( info->hdcSrc, (POINT *)&src_rect, (POINT *)&src_rect, 2, NtGdiDPtoLP );

1 0

Rémi Bernon : winemac: Blend alpha with NtGdiAlphaBlend instead of window opacity.
by Alexandre Julliard June 5, 2024

June 5, 2024

Module: wine Branch: master Commit: 3581a96052957ae68fb8827ca651c00845762e3a URL: https://gitlab.winehq.org/wine/wine/-/commit/3581a96052957ae68fb8827ca651c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 28 19:19:30 2024 +0200 winemac: Blend alpha with NtGdiAlphaBlend instead of window opacity. This seems equivalent but makes the code similar to other drivers. --- dlls/winemac.drv/window.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 4a6ea1585ac..882c3f743bf 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1871,7 +1871,6 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, struct window_surface *surface; struct macdrv_win_data *data; BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; - BYTE alpha; RECT rect, src_rect; HDC hdc; BOOL ret = FALSE; @@ -1914,16 +1913,6 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, return TRUE; } - if (info->dwFlags & ULW_ALPHA) - { - /* Apply SourceConstantAlpha via window alpha, not blend. */ - alpha = info->pblend->SourceConstantAlpha; - blend = *info->pblend; - blend.SourceConstantAlpha = 0xff; - } - else - alpha = 0xff; - if (!(hdc = NtGdiCreateCompatibleDC(0))) goto done; window_surface_lock(surface); NtGdiSelectBitmap(hdc, surface->color_bitmap); @@ -1934,6 +1923,7 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y ); NtGdiTransformPoints(info->hdcSrc, (POINT *)&src_rect, (POINT *)&src_rect, 2, NtGdiDPtoLP); + if (info->dwFlags & ULW_ALPHA) blend = *info->pblend; if (!(ret = NtGdiAlphaBlend(hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, info->hdcSrc, src_rect.left, src_rect.top, src_rect.right - src_rect.left, src_rect.bottom - src_rect.top, @@ -1948,7 +1938,7 @@ BOOL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, if ((data = get_win_data(hwnd))) { /* The ULW flags are a superset of the LWA flags. */ - sync_window_opacity(data, info->crKey, alpha, TRUE, info->dwFlags); + sync_window_opacity(data, info->crKey, 255, TRUE, info->dwFlags); release_win_data(data); }

1 0