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

Rémi Bernon : server: Store the cursor clip rect in the shared data.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 496f6631574aea0bc372276a9547afa7f53af5ca URL: https://gitlab.winehq.org/wine/wine/-/commit/496f6631574aea0bc372276a9547af… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 19 22:25:01 2024 +0100 server: Store the cursor clip rect in the shared data. Based on a patch by Huw Davies. --- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/queue.c | 26 ++++++++++++++++---------- server/user.h | 1 - server/winstation.c | 4 ++++ 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index df31a957486..162d00bd65f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -888,6 +888,7 @@ struct shared_cursor int x; int y; unsigned int last_change; + rectangle_t clip; }; typedef volatile struct @@ -6567,7 +6568,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 813 +#define SERVER_PROTOCOL_VERSION 814 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 20ed82982dd..0592dddaa97 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -904,6 +904,7 @@ struct shared_cursor int x; /* cursor position */ int y; unsigned int last_change; /* time of last position change */ + rectangle_t clip; /* cursor clip rectangle */ }; typedef volatile struct diff --git a/server/queue.c b/server/queue.c index c2e957cfd21..e06f6afe0f7 100644 --- a/server/queue.c +++ b/server/queue.c @@ -410,7 +410,8 @@ static struct message *alloc_hardware_message( lparam_t info, struct hw_msg_sour static int is_cursor_clipped( struct desktop *desktop ) { - rectangle_t top_rect, clip_rect = desktop->cursor.clip; + const desktop_shm_t *desktop_shm = desktop->shared; + rectangle_t top_rect, clip_rect = desktop_shm->cursor.clip; get_top_window_rectangle( desktop, &top_rect ); return !is_rect_equal( &clip_rect, &top_rect ); } @@ -471,8 +472,8 @@ static int update_desktop_cursor_pos( struct desktop *desktop, user_handle_t win int updated; unsigned int time = get_tick_count(); - x = max( min( x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); - y = max( min( y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); + x = max( min( x, desktop_shm->cursor.clip.right - 1 ), desktop_shm->cursor.clip.left ); + y = max( min( y, desktop_shm->cursor.clip.bottom - 1 ), desktop_shm->cursor.clip.top ); SHARED_WRITE_BEGIN( desktop_shm, desktop_shm_t ) { @@ -537,29 +538,34 @@ static void get_message_defaults( struct msg_queue *queue, int *x, int *y, unsig void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, unsigned int flags, int reset ) { const desktop_shm_t *desktop_shm = desktop->shared; - rectangle_t top_rect; + rectangle_t top_rect, new_rect; unsigned int old_flags; int x, y; get_top_window_rectangle( desktop, &top_rect ); if (rect) { - rectangle_t new_rect = *rect; + new_rect = *rect; if (new_rect.left < top_rect.left) new_rect.left = top_rect.left; if (new_rect.right > top_rect.right) new_rect.right = top_rect.right; if (new_rect.top < top_rect.top) new_rect.top = top_rect.top; if (new_rect.bottom > top_rect.bottom) new_rect.bottom = top_rect.bottom; if (new_rect.left > new_rect.right || new_rect.top > new_rect.bottom) new_rect = top_rect; - desktop->cursor.clip = new_rect; } - else desktop->cursor.clip = top_rect; + else new_rect = top_rect; + + SHARED_WRITE_BEGIN( desktop_shm, desktop_shm_t ) + { + shared->cursor.clip = new_rect; + } + SHARED_WRITE_END; old_flags = desktop->cursor.clip_flags; desktop->cursor.clip_flags = flags; /* warp the mouse to be inside the clip rect */ - x = max( min( desktop_shm->cursor.x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); - y = max( min( desktop_shm->cursor.y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); + x = max( min( desktop_shm->cursor.x, new_rect.right - 1 ), new_rect.left ); + y = max( min( desktop_shm->cursor.y, new_rect.bottom - 1 ), new_rect.top ); if (x != desktop_shm->cursor.x || y != desktop_shm->cursor.y) set_cursor_pos( desktop, x, y ); /* request clip cursor rectangle reset to the desktop thread */ @@ -3745,7 +3751,7 @@ DECL_HANDLER(set_cursor) reply->new_x = desktop_shm->cursor.x; reply->new_y = desktop_shm->cursor.y; - reply->new_clip = desktop->cursor.clip; + reply->new_clip = desktop_shm->cursor.clip; reply->last_change = desktop_shm->cursor.last_change; } diff --git a/server/user.h b/server/user.h index a20aff99284..7ad1e82ae54 100644 --- a/server/user.h +++ b/server/user.h @@ -56,7 +56,6 @@ struct winstation struct global_cursor { - rectangle_t clip; /* cursor clip rectangle */ unsigned int clip_flags; /* last cursor clip flags */ user_handle_t win; /* window that contains the cursor */ }; diff --git a/server/winstation.c b/server/winstation.c index 87981f64167..3e08f4b3337 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -310,6 +310,10 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned shared->cursor.x = 0; shared->cursor.y = 0; shared->cursor.last_change = 0; + shared->cursor.clip.left = 0; + shared->cursor.clip.top = 0; + shared->cursor.clip.right = 0; + shared->cursor.clip.bottom = 0; } SHARED_WRITE_END; }

1 0

Rémi Bernon : server: Get rid of the global cursor structure.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 472ce7fd1dd048899d2342576f302c4eb3759e6e URL: https://gitlab.winehq.org/wine/wine/-/commit/472ce7fd1dd048899d2342576f302c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 19 22:27:55 2024 +0100 server: Get rid of the global cursor structure. Based on a patch by Huw Davies. --- server/queue.c | 12 ++++++------ server/user.h | 9 ++------- server/winstation.c | 3 ++- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/server/queue.c b/server/queue.c index e06f6afe0f7..1a98714004c 100644 --- a/server/queue.c +++ b/server/queue.c @@ -440,7 +440,7 @@ static struct thread_input *get_desktop_cursor_thread_input( struct desktop *des struct thread_input *input = NULL; struct thread *thread; - if ((thread = get_window_thread( desktop->cursor.win ))) + if ((thread = get_window_thread( desktop->cursor_win ))) { if (thread->queue) input = thread->queue->input; release_object( thread ); @@ -451,9 +451,9 @@ static struct thread_input *get_desktop_cursor_thread_input( struct desktop *des static int update_desktop_cursor_window( struct desktop *desktop, user_handle_t win ) { - int updated = win != desktop->cursor.win; + int updated = win != desktop->cursor_win; struct thread_input *input; - desktop->cursor.win = win; + desktop->cursor_win = win; if (updated && (input = get_desktop_cursor_thread_input( desktop ))) { @@ -495,7 +495,7 @@ static void update_desktop_cursor_handle( struct desktop *desktop, struct thread { if (input == get_desktop_cursor_thread_input( desktop )) { - user_handle_t win = desktop->cursor.win; + user_handle_t win = desktop->cursor_win; /* when clipping send the message to the foreground window as well, as some driver have an artificial overlay window */ if (is_cursor_clipped( desktop )) queue_cursor_message( desktop, 0, WM_WINE_SETCURSOR, win, handle ); queue_cursor_message( desktop, win, WM_WINE_SETCURSOR, win, handle ); @@ -560,8 +560,8 @@ void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, unsig } SHARED_WRITE_END; - old_flags = desktop->cursor.clip_flags; - desktop->cursor.clip_flags = flags; + old_flags = desktop->clip_flags; + desktop->clip_flags = flags; /* warp the mouse to be inside the clip rect */ x = max( min( desktop_shm->cursor.x, new_rect.right - 1 ), new_rect.left ); diff --git a/server/user.h b/server/user.h index 7ad1e82ae54..7355177e13d 100644 --- a/server/user.h +++ b/server/user.h @@ -54,12 +54,6 @@ struct winstation struct namespace *desktop_names; /* namespace for desktops of this winstation */ }; -struct global_cursor -{ - unsigned int clip_flags; /* last cursor clip flags */ - user_handle_t win; /* window that contains the cursor */ -}; - struct key_repeat { int enable; /* enable auto-repeat */ @@ -86,9 +80,10 @@ struct desktop struct timeout_user *close_timeout; /* timeout before closing the desktop */ struct thread_input *foreground_input; /* thread input of foreground thread */ unsigned int users; /* processes and threads using this desktop */ - struct global_cursor cursor; /* global cursor information */ unsigned char keystate[256]; /* asynchronous key state */ struct key_repeat key_repeat; /* key auto-repeat */ + unsigned int clip_flags; /* last cursor clip flags */ + user_handle_t cursor_win; /* window that contains the cursor */ const desktop_shm_t *shared; /* desktop session shared memory */ }; diff --git a/server/winstation.c b/server/winstation.c index 3e08f4b3337..300d899638b 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -292,7 +292,8 @@ static struct desktop *create_desktop( const struct unicode_str *name, unsigned desktop->foreground_input = NULL; desktop->users = 0; list_init( &desktop->threads ); - memset( &desktop->cursor, 0, sizeof(desktop->cursor) ); + desktop->clip_flags = 0; + desktop->cursor_win = 0; memset( desktop->keystate, 0, sizeof(desktop->keystate) ); memset( &desktop->key_repeat, 0, sizeof(desktop->key_repeat) ); list_add_tail( &winstation->desktops, &desktop->entry );

1 0

Rémi Bernon : win32u: Use the shared memory for get_clip_cursor.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 5b013260d149b256b4da36c4caef155ff42a5cb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b013260d149b256b4da36c4caef15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 21 00:31:15 2024 +0200 win32u: Use the shared memory for get_clip_cursor. --- dlls/win32u/input.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 2fbe21e56af..4d0c2589c1b 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2555,24 +2555,21 @@ BOOL WINAPI NtUserGetPointerInfoList( UINT32 id, POINTER_INPUT_TYPE type, UINT_P BOOL get_clip_cursor( RECT *rect, UINT dpi ) { - BOOL ret; + struct object_lock lock = OBJECT_LOCK_INIT; + const desktop_shm_t *desktop_shm; + NTSTATUS status; if (!rect) return FALSE; - SERVER_START_REQ( set_cursor ) - { - req->flags = 0; - if ((ret = !wine_server_call( req ))) - *rect = wine_server_get_rect( reply->new_clip ); - } - SERVER_END_REQ; + while ((status = get_shared_desktop( &lock, &desktop_shm )) == STATUS_PENDING) + *rect = wine_server_get_rect( desktop_shm->cursor.clip ); - if (ret) + if (!status) { HMONITOR monitor = monitor_from_rect( rect, MONITOR_DEFAULTTOPRIMARY, 0 ); *rect = map_dpi_rect( *rect, get_monitor_dpi( monitor ), dpi ); } - return ret; + return !status; } BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset )

1 0

Elizabeth Figura : ntdll: Do not fill the IOSB in NtFsControlFile() on failure.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 1dee9881e2dfe6a31692aa96aa97dabc8c9de9e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1dee9881e2dfe6a31692aa96aa97da… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 22:26:38 2024 -0500 ntdll: Do not fill the IOSB in NtFsControlFile() on failure. --- dlls/ntdll/unix/file.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e521dd44686..c128e8aa369 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6225,14 +6225,12 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap } else { - io->Information = 0; status = STATUS_BUFFER_TOO_SMALL; } break; } case FSCTL_GET_REPARSE_POINT: - io->Information = 0; if (out_buffer && out_size) { FIXME("FSCTL_GET_REPARSE_POINT semi-stub\n"); @@ -6247,7 +6245,6 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap int fd, needs_close; struct stat st; - io->Information = 0; if (out_size >= sizeof(*info)) { status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ); @@ -6273,7 +6270,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap in_buffer, in_size, out_buffer, out_size ); } - if (status != STATUS_PENDING) io->Status = status; + if (!NT_ERROR(status) && status != STATUS_PENDING) io->Status = status; return status; }

1 0

Elizabeth Figura : ntdll: Do not fill the IOSB or signal completion on failure in tape_DeviceIoControl().
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 86be09ac0bc87f081a1e8abc7f43ed3e98ffb9c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/86be09ac0bc87f081a1e8abc7f43ed… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 20:38:02 2022 -0500 ntdll: Do not fill the IOSB or signal completion on failure in tape_DeviceIoControl(). We should never fill the IOSB or signal completion for NT_ERROR conditions. --- dlls/ntdll/unix/tape.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 48807dbca7a..f513e558898 100644 --- a/dlls/ntdll/unix/tape.c +++ b/dlls/ntdll/unix/tape.c @@ -528,9 +528,8 @@ NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, TRACE( "%p %s %p %d %p %d %p\n", device, io2str(code), in_buffer, in_size, out_buffer, out_size, io ); - io->Information = 0; - - if ((status = server_get_unix_fd( device, 0, &fd, &needs_close, NULL, NULL ))) goto error; + if ((status = server_get_unix_fd( device, 0, &fd, &needs_close, NULL, NULL ))) + return status; switch (code) { @@ -580,9 +579,11 @@ NTSTATUS tape_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, if (needs_close) close( fd ); -error: - io->Status = status; - io->Information = sz; - if (event) NtSetEvent( event, NULL ); + if (!NT_ERROR(status)) + { + io->Status = status; + io->Information = sz; + if (event) NtSetEvent( event, NULL ); + } return status; }

1 0

Elizabeth Figura : ntdll: Do not fill the IOSB or signal completion on failure in serial_DeviceIoControl().
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 98b99b65690bbe7779ed01352f757c41dd9e8a34 URL: https://gitlab.winehq.org/wine/wine/-/commit/98b99b65690bbe7779ed01352f757c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 20:37:32 2022 -0500 ntdll: Do not fill the IOSB or signal completion on failure in serial_DeviceIoControl(). We should never fill the IOSB or signal completion for NT_ERROR conditions. --- dlls/ntdll/unix/serial.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ea9931d891a..a8abee6eeb6 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -1261,14 +1261,12 @@ NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE ap return STATUS_NOT_SUPPORTED; } - io->Information = 0; - - if ((status = server_get_unix_fd( device, access, &fd, &needs_close, &type, NULL ))) goto error; + if ((status = server_get_unix_fd( device, access, &fd, &needs_close, &type, NULL ))) + return status; if (type != FD_TYPE_SERIAL) { if (needs_close) close( fd ); - status = STATUS_OBJECT_TYPE_MISMATCH; - goto error; + return STATUS_OBJECT_TYPE_MISMATCH; } switch (code) @@ -1455,11 +1453,15 @@ NTSTATUS serial_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE ap status = STATUS_INVALID_PARAMETER; break; } + if (needs_close) close( fd ); - error: - io->Status = status; - io->Information = sz; - if (event) NtSetEvent(event, NULL); + + if (!NT_ERROR(status)) + { + io->Status = status; + io->Information = sz; + if (event) NtSetEvent(event, NULL); + } return status; }

1 0

Elizabeth Figura : ntdll: Remove the redundant filling of the IOSB in NtDeviceIoControlFile().
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 0e928ccaea0c03da28fca2d7356402c6c2357cc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e928ccaea0c03da28fca2d7356402… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jul 25 19:13:31 2022 -0500 ntdll: Remove the redundant filling of the IOSB in NtDeviceIoControlFile(). --- dlls/ntdll/unix/file.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 429f8839ed2..e521dd44686 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6120,7 +6120,6 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT case FILE_DEVICE_BEEP: case FILE_DEVICE_NETWORK: status = sock_ioctl( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); - if (status != STATUS_NOT_SUPPORTED && status != STATUS_BAD_DEVICE_TYPE) return status; break; case FILE_DEVICE_DISK: case FILE_DEVICE_CD_ROM: @@ -6143,8 +6142,6 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT if (status == STATUS_NOT_SUPPORTED || status == STATUS_BAD_DEVICE_TYPE) return server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); - - if (status != STATUS_PENDING && !NT_ERROR(status)) io->Status = status; return status; }

1 0

Elizabeth Figura : ntdll: Do not fill the IOSB or signal completion on failure in cdrom_DeviceIoControl().
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 5f76f07bff03dc80453cf742be1fe23781c12d92 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f76f07bff03dc80453cf742be1fe2… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 24 20:36:30 2022 -0500 ntdll: Do not fill the IOSB or signal completion on failure in cdrom_DeviceIoControl(). Synchronous NT_ERROR conditions should not touch the IOSB or signal completion. --- dlls/ntdll/unix/cdrom.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index 45b61d54d05..427e559968f 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/dlls/ntdll/unix/cdrom.c @@ -2822,18 +2822,13 @@ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc TRACE( "%p %s %p %d %p %d %p\n", device, iocodex(code), in_buffer, in_size, out_buffer, out_size, io ); - io->Information = 0; - if ((status = server_get_unix_fd( device, 0, &fd, &needs_close, NULL, NULL ))) - { - if (status == STATUS_BAD_DEVICE_TYPE) return status; /* no associated fd */ - goto error; - } + return status; if ((status = CDROM_Open(fd, &dev))) { if (needs_close) close( fd ); - goto error; + return status; } #ifdef __APPLE__ @@ -2847,16 +2842,13 @@ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc * Also for some reason it wants the fd to be closed before we even * open the parent if we're trying to eject the disk. */ - if ((status = get_parent_device( fd, name, sizeof(name) ))) goto error; + if ((status = get_parent_device( fd, name, sizeof(name) ))) return status; if (code == IOCTL_STORAGE_EJECT_MEDIA) NtClose( device ); if (needs_close) close( fd ); TRACE("opening parent %s\n", name ); if ((fd = open( name, O_RDONLY )) == -1) - { - status = errno_to_status( errno ); - goto error; - } + return errno_to_status( errno ); needs_close = 1; } #endif @@ -3117,13 +3109,14 @@ NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc break; default: - if (needs_close) close( fd ); - return STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; } if (needs_close) close( fd ); - error: - io->Status = status; - io->Information = sz; - if (event) NtSetEvent(event, NULL); + if (!NT_ERROR(status)) + { + io->Status = status; + io->Information = sz; + if (event) NtSetEvent(event, NULL); + } return status; }

1 0

Alexandre Julliard : ntdll: Move the IP string conversion functions to rtlstr.c.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: b2017a48dcb7fca3c0436a7f178649655f91de04 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2017a48dcb7fca3c0436a7f178649… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 11:33:58 2024 +0200 ntdll: Move the IP string conversion functions to rtlstr.c. --- dlls/ntdll/rtl.c | 641 ---------------------------------------------------- dlls/ntdll/rtlstr.c | 605 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 605 insertions(+), 641 deletions(-)

1 0

Alexandre Julliard : ntdll: Move RtlIsProcessorFeaturePresent implementation to the CPU backends.
by Alexandre Julliard June 21, 2024

June 21, 2024

Module: wine Branch: master Commit: 0051e102cccee6fd461474324e32da947a9fb963 URL: https://gitlab.winehq.org/wine/wine/-/commit/0051e102cccee6fd461474324e32da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 11:16:57 2024 +0200 ntdll: Move RtlIsProcessorFeaturePresent implementation to the CPU backends. --- dlls/ntdll/rtl.c | 35 ----------------------------------- dlls/ntdll/signal_arm.c | 9 +++++++++ dlls/ntdll/signal_arm64.c | 30 ++++++++++++++++++++++++++++++ dlls/ntdll/signal_arm64ec.c | 10 ++++++++++ dlls/ntdll/signal_i386.c | 9 +++++++++ dlls/ntdll/signal_x86_64.c | 10 ++++++++++ 6 files changed, 68 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 1288b57f11c..3dff04e52c9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -34,7 +34,6 @@ #include "wine/exception.h" #include "ntdll_misc.h" #include "in6addr.h" -#include "ddk/ntddk.h" #include "ddk/ntifs.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -1421,40 +1420,6 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) processor->Reserved = 0; } -/*********************************************************************** - * RtlIsProcessorFeaturePresent [NTDLL.@] - */ -BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) -{ -#ifdef __aarch64__ - static const ULONGLONG arm64_features = - (1ull << PF_COMPARE_EXCHANGE_DOUBLE) | - (1ull << PF_NX_ENABLED) | - (1ull << PF_ARM_VFP_32_REGISTERS_AVAILABLE) | - (1ull << PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_SECOND_LEVEL_ADDRESS_TRANSLATION) | - (1ull << PF_FASTFAIL_AVAILABLE) | - (1ull << PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE) | - (1ull << PF_ARM_64BIT_LOADSTORE_ATOMIC) | - (1ull << PF_ARM_EXTERNAL_CACHE_AVAILABLE) | - (1ull << PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V8_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE) | - (1ull << PF_ARM_V83_LRCPC_INSTRUCTIONS_AVAILABLE); - - return (feature < PROCESSOR_FEATURE_MAX && (arm64_features & (1ull << feature)) && - user_shared_data->ProcessorFeatures[feature]); -#elif defined _WIN64 - return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; -#else - return NtWow64IsProcessorFeaturePresent( feature ); -#endif -} - /*********************************************************************** * RtlInitializeGenericTableAvl (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index aeed022d78f..595eb71a81e 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -566,6 +566,15 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return NtWow64IsProcessorFeaturePresent( feature ); +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8b4fea80bb6..0531083ba4e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -31,6 +31,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "ntdll_misc.h" #include "wine/debug.h" @@ -600,6 +601,35 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + static const ULONGLONG arm64_features = + (1ull << PF_COMPARE_EXCHANGE_DOUBLE) | + (1ull << PF_NX_ENABLED) | + (1ull << PF_ARM_VFP_32_REGISTERS_AVAILABLE) | + (1ull << PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_SECOND_LEVEL_ADDRESS_TRANSLATION) | + (1ull << PF_FASTFAIL_AVAILABLE) | + (1ull << PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE) | + (1ull << PF_ARM_64BIT_LOADSTORE_ATOMIC) | + (1ull << PF_ARM_EXTERNAL_CACHE_AVAILABLE) | + (1ull << PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V8_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE) | + (1ull << PF_ARM_V83_LRCPC_INSTRUCTIONS_AVAILABLE); + + return (feature < PROCESSOR_FEATURE_MAX && (arm64_features & (1ull << feature)) && + user_shared_data->ProcessorFeatures[feature]); +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 9fde2a4a715..44b026fc044 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -28,6 +28,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/list.h" #include "ntdll_misc.h" @@ -1204,6 +1205,15 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a6c47f1226b..8f11d19024b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -461,6 +461,15 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return NtWow64IsProcessorFeaturePresent( feature ); +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f491f07282e..0daf27f6850 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -32,6 +32,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "ddk/wdm.h" #include "wine/exception.h" #include "wine/list.h" #include "ntdll_misc.h" @@ -802,6 +803,15 @@ NTSTATUS WINAPI RtlGetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, } +/*********************************************************************** + * RtlIsProcessorFeaturePresent [NTDLL.@] + */ +BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) +{ + return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; +} + + /************************************************************************* * RtlWalkFrameChain (NTDLL.@) */

1 0