wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Zebediah Figura : server: Do not signal read bits if there are read asyncs alerted.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 30a56639fde4daf5e1eb3c3d37541b1bc9f75a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=30a56639fde4daf5e1eb3c3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:27 2022 -0500 server: Do not signal read bits if there are read asyncs alerted. Asyncs which are alerted but not "waiting" may still consume all data, and we shouldn't signal AFD_POLL_READ or AFD_POLL_OOB in that case. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index cf25994c383..2bb2963a840 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1001,10 +1001,13 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) if ((event & POLLOUT) && sock->connect_req && sock->connect_req->iosb->status == STATUS_PENDING) complete_async_connect( sock ); - if (event & (POLLIN | POLLPRI) && async_waiting( &sock->read_q )) + if ((event & (POLLIN | POLLPRI)) && async_queued( &sock->read_q )) { - if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); - async_wake_up( &sock->read_q, STATUS_ALERTED ); + if (async_waiting( &sock->read_q )) + { + if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); + async_wake_up( &sock->read_q, STATUS_ALERTED ); + } event &= ~(POLLIN | POLLPRI); }

1 0

Zebediah Figura : server: Don't poll for POLLIN or POLLPRI if there are alerted read asyncs.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 04b33ef098f453d7c46c6b45990d4ceb36716620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04b33ef098f453d7c46c6b45… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:26 2022 -0500 server: Don't poll for POLLIN or POLLPRI if there are alerted read asyncs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- server/sock.c | 34 +++++++++++++++++++++------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index cf27b4003c5..2ace83f5e21 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -382,7 +382,7 @@ static void test_poll(void) ok(size == 1, "got size %lu\n", size); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); ret = send(client, "a", 1, 0); ok(ret == 1, "got %d\n", ret); diff --git a/server/sock.c b/server/sock.c index db0df5ecf79..cf25994c383 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1229,6 +1229,18 @@ static int sock_get_poll_events( struct fd *fd ) if (!sock->type) /* not initialized yet */ return -1; + LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry ) + { + unsigned int i; + + for (i = 0; i < req->count; ++i) + { + if (req->sockets[i].sock != sock) continue; + + ev |= poll_flags_from_afd( sock, req->sockets[i].mask ); + } + } + switch (sock->state) { case SOCK_UNCONNECTED: @@ -1271,7 +1283,15 @@ static int sock_get_poll_events( struct fd *fd ) } else if (async_queued( &sock->read_q )) { - if (async_waiting( &sock->read_q )) ev |= POLLIN | POLLPRI; + /* Clear POLLIN and POLLPRI if we have an alerted async, even if + * we're polling this socket for READ or OOB. We can't signal the + * poll if the pending async will read all of the data [cf. the + * matching logic in sock_dispatch_asyncs()], but we also don't + * want to spin polling for POLLIN if we're not going to use it. */ + if (async_waiting( &sock->read_q )) + ev |= POLLIN | POLLPRI; + else + ev &= ~(POLLIN | POLLPRI); } else { @@ -1302,18 +1322,6 @@ static int sock_get_poll_events( struct fd *fd ) break; } - LIST_FOR_EACH_ENTRY( req, &poll_list, struct poll_req, entry ) - { - unsigned int i; - - for (i = 0; i < req->count; ++i) - { - if (req->sockets[i].sock != sock) continue; - - ev |= poll_flags_from_afd( sock, req->sockets[i].mask ); - } - } - return ev; }

1 0

Zebediah Figura : server: Do not signal read/write bits if there are read/write asyncs waiting.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: cafd260014932bf6a7319dae768a1f43e65176cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cafd260014932bf6a7319dae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 5 00:43:25 2022 -0500 server: Do not signal read/write bits if there are read/write asyncs waiting. This is validated by tests introduced in 59beffb46c813a3de2eae6f28e3f7f321f666e89 etc. This commit alone doesn't fix said tests, because: * on this poll, we will alert the waiting async; * when reselecting, we will still request POLLIN, because the AFD_POLL_READ request is still active, * when POLLIN is subsequently signaled, we do not remove it in sock_dispatch_asyncs(), because we check async_waiting(), not async_queued(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 29dd1ca7fa8..db0df5ecf79 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1179,10 +1179,9 @@ static void sock_poll_event( struct fd *fd, int event ) break; } - complete_async_polls( sock, event, error ); - event = sock_dispatch_asyncs( sock, event, error ); sock_dispatch_events( sock, prevstate, event, error ); + complete_async_polls( sock, event, error ); sock_reselect( sock ); }

1 0

Rémi Bernon : mountmgr.sys: Avoid passing a stack pointer to the run_loop thread.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 808d4a77f7d719b2985e1df9c996a427606cb079 URL: https://source.winehq.org/git/wine.git/?a=commit;h=808d4a77f7d719b2985e1df9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 14:20:01 2022 +0200 mountmgr.sys: Avoid passing a stack pointer to the run_loop thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/mountmgr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1f9bd56a384..66034621b44 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -609,7 +609,8 @@ static DWORD WINAPI device_op_thread( void *arg ) static DWORD WINAPI run_loop_thread( void *arg ) { - return MOUNTMGR_CALL( run_loop, arg ); + struct run_loop_params params = {.op_thread = arg, .op_apc = device_op}; + return MOUNTMGR_CALL( run_loop, &params ); } @@ -624,7 +625,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) DEVICE_OBJECT *device; HKEY devicemap_key; NTSTATUS status; - struct run_loop_params params; + HANDLE thread; TRACE( "%s\n", debugstr_w(path->Buffer) ); @@ -655,9 +656,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RtlInitUnicodeString( &nameW, L"\\Driver\\Harddisk" ); status = IoCreateDriver( &nameW, harddisk_driver_entry ); - params.op_thread = CreateThread( NULL, 0, device_op_thread, NULL, 0, NULL ); - params.op_apc = device_op; - CloseHandle( CreateThread( NULL, 0, run_loop_thread, &params, 0, NULL )); + thread = CreateThread( NULL, 0, device_op_thread, NULL, 0, NULL ); + CloseHandle( CreateThread( NULL, 0, run_loop_thread, thread, 0, NULL )); #ifdef _WIN64 /* create a symlink so that the Wine port overrides key can be edited with 32-bit reg or regedit */

1 0

Nikolay Sivov : kernelbase: Implement UnmapViewOfFile2().
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 757f9e975119b733b0808e5f65d848667faaf925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=757f9e975119b733b0808e5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 5 09:49:39 2022 +0300 kernelbase: Implement UnmapViewOfFile2(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/memory.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7095927c61e..854797ddeb0 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1653,6 +1653,7 @@ @ stdcall UnlockFile(long long long long long) @ stdcall UnlockFileEx(long long long long ptr) @ stdcall UnmapViewOfFile(ptr) +@ stdcall UnmapViewOfFile2(long ptr long) # @ stub UnmapViewOfFileEx # @ stub UnregisterBadMemoryNotification # @ stub UnregisterGPNotificationInternal diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 49bf71e0aa2..87c07887482 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -303,6 +303,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFile( const void *addr ) } +/*********************************************************************** + * UnmapViewOfFile2 (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFile2( HANDLE process, void *addr, ULONG flags ) +{ + return set_ntstatus( NtUnmapViewOfSectionEx( process, addr, flags )); +} + + /*********************************************************************** * VirtualAlloc (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 55be6dbf62b..2b109af19df 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2741,6 +2741,7 @@ WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED #define UnlockResource(handle) ((handle), 0) #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID); +WINBASEAPI BOOL WINAPI UnmapViewOfFile2(HANDLE,PVOID,ULONG); WINBASEAPI BOOL WINAPI UmsThreadYield(void *); WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void); WINBASEAPI BOOL WINAPI UnregisterWait(HANDLE);

1 0

Nikolay Sivov : ntdll: Partially implement NtUnmapViewOfSectionEx().
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: d63db81295d285dcdf3e19cc157f2a09b3dd2d87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63db81295d285dcdf3e19cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 5 09:49:38 2022 +0300 ntdll: Partially implement NtUnmapViewOfSectionEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/virtual.c | 9 +++++++++ dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 13 +++++++++++++ include/winternl.h | 1 + 6 files changed, 27 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a7a39a0bce2..b1650ab4306 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -427,6 +427,7 @@ @ stdcall -syscall NtUnlockFile(long ptr ptr ptr ptr) @ stdcall -syscall NtUnlockVirtualMemory(long ptr ptr long) @ stdcall -syscall NtUnmapViewOfSection(long ptr) +@ stdcall -syscall NtUnmapViewOfSectionEx(long ptr long) # @ stub NtVdmControl # @ stub NtW32Call @ stdcall -syscall NtWaitForAlertByThreadId(ptr ptr) @@ -1454,6 +1455,7 @@ @ stdcall -private -syscall ZwUnlockFile(long ptr ptr ptr ptr) NtUnlockFile @ stdcall -private -syscall ZwUnlockVirtualMemory(long ptr ptr long) NtUnlockVirtualMemory @ stdcall -private -syscall ZwUnmapViewOfSection(long ptr) NtUnmapViewOfSection +@ stdcall -private -syscall ZwUnmapViewOfSectionEx(long ptr long) NtUnmapViewOfSectionEx # @ stub ZwVdmControl # @ stub ZwW32Call @ stdcall -private -syscall ZwWaitForAlertByThreadId(ptr ptr) NtWaitForAlertByThreadId diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index cad760a1445..7f85582adf3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -336,6 +336,7 @@ static void * const syscalls[] = NtUnlockFile, NtUnlockVirtualMemory, NtUnmapViewOfSection, + NtUnmapViewOfSectionEx, NtWaitForAlertByThreadId, NtWaitForDebugEvent, NtWaitForKeyedEvent, diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 02478cceb06..6ecca9cb98a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4610,6 +4610,15 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) return status; } +/*********************************************************************** + * NtUnmapViewOfSectionEx (NTDLL.@) + * ZwUnmapViewOfSectionEx (NTDLL.@) + */ +NTSTATUS WINAPI NtUnmapViewOfSectionEx( HANDLE process, PVOID addr, ULONG flags ) +{ + if (flags) FIXME("Ignoring flags %#x.\n", flags); + return NtUnmapViewOfSection( process, addr ); +} /****************************************************************************** * virtual_fill_image_information diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 3b364d909d7..bd107ce0ef5 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -237,6 +237,7 @@ SYSCALL_ENTRY( NtUnlockFile ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ SYSCALL_ENTRY( NtUnmapViewOfSection ) \ + SYSCALL_ENTRY( NtUnmapViewOfSectionEx ) \ SYSCALL_ENTRY( NtWaitForAlertByThreadId ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 61c84e5d7be..c21464857fa 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -525,6 +525,19 @@ NTSTATUS WINAPI wow64_NtUnmapViewOfSection( UINT *args ) } +/********************************************************************** + * wow64_NtUnmapViewOfSectionEx + */ +NTSTATUS WINAPI wow64_NtUnmapViewOfSectionEx( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *addr = get_ptr( &args ); + ULONG flags = get_ulong( &args ); + + return NtUnmapViewOfSectionEx( process, addr, flags ); +} + + /********************************************************************** * wow64_NtWow64AllocateVirtualMemory64 */ diff --git a/include/winternl.h b/include/winternl.h index 1d358fc0b2d..84babcbb0e9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4160,6 +4160,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnloadKeyEx(POBJECT_ATTRIBUTES,HANDLE); NTSYSAPI NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,PULONG); NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID); +NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSectionEx(HANDLE,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID); NTSYSAPI NTSTATUS WINAPI NtWaitForAlertByThreadId(const void*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*);

1 0

Jacek Caban : win32u: Use KeUserModeCallback interface for CopyImage.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: d8c807ba98578abd5132c1815e1316f689a93ebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8c807ba98578abd5132c181… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 5 13:34:25 2022 +0200 win32u: Use KeUserModeCallback interface for CopyImage. Its implementation doesn't seem to be exposed from win32u and it generally fits well in user space. It will be also useful for drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 8 +++++++- dlls/win32u/class.c | 30 +++++++++++++++--------------- dlls/win32u/cursoricon.c | 15 +++++++++++++++ dlls/win32u/defwnd.c | 16 ++++++++-------- dlls/win32u/ntuser_private.h | 1 - include/ntuser.h | 11 +++++++++++ 6 files changed, 56 insertions(+), 25 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index b282056d8c8..9cd9bd60146 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -159,7 +159,6 @@ static void CDECL free_win_ptr( WND *win ) static const struct user_callbacks user_funcs = { - CopyImage, EndMenu, ImmProcessKey, ImmTranslateMessage, @@ -176,6 +175,12 @@ static const struct user_callbacks user_funcs = unregister_imm, }; +static NTSTATUS WINAPI User32CopyImage( const struct copy_image_params *params, ULONG size ) +{ + HANDLE ret = CopyImage( params->hwnd, params->type, params->dx, params->dy, params->flags ); + return HandleToUlong( ret ); +} + static NTSTATUS WINAPI User32FreeCachedClipboardData( const struct free_cached_data_params *params, ULONG size ) { @@ -202,6 +207,7 @@ static const void *kernel_callback_table[NtUserCallCount] = User32CallWinEventHook, User32CallWindowProc, User32CallWindowsHook, + User32CopyImage, User32FreeCachedClipboardData, User32LoadDriver, User32RegisterBuiltinClasses, diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index fd74f63291a..1a6c92edc3a 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -444,11 +444,11 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam class->hbrBackground = wc->hbrBackground; class->winproc = alloc_winproc( wc->lpfnWndProc, ansi ); if (client_menu_name) class->menu_name = *client_menu_name; - if (wc->hIcon && !wc->hIconSm && user_callbacks) - class->hIconSmIntern = user_callbacks->pCopyImage( wc->hIcon, IMAGE_ICON, - get_system_metrics( SM_CXSMICON ), - get_system_metrics( SM_CYSMICON ), - LR_COPYFROMRESOURCE ); + if (wc->hIcon && !wc->hIconSm) + class->hIconSmIntern = CopyImage( wc->hIcon, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ); release_class_ptr( class ); return atom; } @@ -699,20 +699,20 @@ static ULONG_PTR set_class_long( HWND hwnd, INT offset, LONG_PTR newval, UINT si NtUserDestroyCursor( class->hIconSmIntern, 0 ); class->hIconSmIntern = NULL; } - if (newval && !class->hIconSm && user_callbacks) - class->hIconSmIntern = user_callbacks->pCopyImage( (HICON)newval, IMAGE_ICON, - get_system_metrics( SM_CXSMICON ), - get_system_metrics( SM_CYSMICON ), - LR_COPYFROMRESOURCE ); + if (newval && !class->hIconSm) + class->hIconSmIntern = CopyImage( (HICON)newval, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ); class->hIcon = (HICON)newval; break; case GCLP_HICONSM: retval = (ULONG_PTR)class->hIconSm; - if (retval && !newval && class->hIcon && user_callbacks) - class->hIconSmIntern = user_callbacks->pCopyImage( class->hIcon, IMAGE_ICON, - get_system_metrics( SM_CXSMICON ), - get_system_metrics( SM_CYSMICON ), - LR_COPYFROMRESOURCE ); + if (retval && !newval && class->hIcon) + class->hIconSmIntern = CopyImage( class->hIcon, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), + LR_COPYFROMRESOURCE ); else if (newval && class->hIconSmIntern) { NtUserDestroyCursor( class->hIconSmIntern, 0 ); diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 0249eb3da50..032110b26d0 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -786,3 +786,18 @@ ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) } return ret; } + +/****************************************************************************** + * CopyImage (win32u.so) + */ +HANDLE WINAPI CopyImage( HANDLE hwnd, UINT type, INT dx, INT dy, UINT flags ) +{ + void *ret_ptr; + ULONG ret_len; + NTSTATUS ret; + struct copy_image_params params = + { .hwnd = hwnd, .type = type, .dx = dx, .dy = dy, .flags = flags }; + + ret = KeUserModeCallback( NtUserCopyImage, &params, sizeof(params), &ret_ptr, &ret_len ); + return UlongToHandle( ret ); +} diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 7455a91980c..1fa80928c65 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -123,11 +123,11 @@ static HICON set_window_icon( HWND hwnd, WPARAM type, HICON icon ) { case ICON_SMALL: ret = win->hIconSmall; - if (ret && !icon && win->hIcon && user_callbacks) + if (ret && !icon && win->hIcon) { - win->hIconSmall2 = user_callbacks->pCopyImage( win->hIcon, IMAGE_ICON, - get_system_metrics( SM_CXSMICON ), - get_system_metrics( SM_CYSMICON ), 0 ); + win->hIconSmall2 = CopyImage( win->hIcon, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), 0 ); } else if (icon && win->hIconSmall2) { @@ -144,11 +144,11 @@ static HICON set_window_icon( HWND hwnd, WPARAM type, HICON icon ) NtUserDestroyCursor( win->hIconSmall2, 0 ); win->hIconSmall2 = NULL; } - if (icon && !win->hIconSmall && user_callbacks) + if (icon && !win->hIconSmall) { - win->hIconSmall2 = user_callbacks->pCopyImage( icon, IMAGE_ICON, - get_system_metrics( SM_CXSMICON ), - get_system_metrics( SM_CYSMICON ), 0 ); + win->hIconSmall2 = CopyImage( icon, IMAGE_ICON, + get_system_metrics( SM_CXSMICON ), + get_system_metrics( SM_CYSMICON ), 0 ); } win->hIcon = icon; break; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 6e25e0ec0db..931c87a6e1c 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -32,7 +32,6 @@ struct hardware_msg_data; struct user_callbacks { - HANDLE (WINAPI *pCopyImage)( HANDLE, UINT, INT, INT, UINT ); BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); diff --git a/include/ntuser.h b/include/ntuser.h index bc44ac76d4e..a39fffaedf9 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -32,6 +32,7 @@ enum NtUserCallWinEventHook, NtUserCallWinProc, NtUserCallWindowsHook, + NtUserCopyImage, NtUserFreeCachedClipboardData, NtUserLoadDriver, NtUserRegisterBuiltinClasses, @@ -146,6 +147,16 @@ struct win_hook_params WCHAR module[MAX_PATH]; }; +/* NtUserCopyMessage params */ +struct copy_image_params +{ + HANDLE hwnd; + UINT type; + INT dx; + INT dy; + UINT flags; +}; + /* NtUserFreeCachedClipboardData params */ struct free_cached_data_params {

1 0

Jacek Caban : winex11: Directly use win32u in more places.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 4af9ac6733440aafc220306a3c835ccc96b61936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4af9ac6733440aafc220306a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 23:49:53 2022 +0200 winex11: Directly use win32u in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 4 ++-- dlls/winex11.drv/desktop.c | 5 +++-- dlls/winex11.drv/event.c | 5 +++-- dlls/winex11.drv/mouse.c | 8 ++++---- dlls/winex11.drv/window.c | 12 ++++++++---- dlls/winex11.drv/wintab.c | 10 +++++----- 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 9486f37954e..276eee9b4dd 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2292,8 +2292,8 @@ void X11DRV_UpdateClipboard(void) if (GetCurrentThreadId() == clipboard_thread_id) return; now = NtGetTickCount(); if ((int)(now - last_update) <= SELECTION_UPDATE_DELAY) return; - if (SendMessageTimeoutW( GetClipboardOwner(), WM_X11DRV_UPDATE_CLIPBOARD, 0, 0, - SMTO_ABORTIFHUNG, 5000, &ret ) && ret) + if (send_message_timeout( NtUserGetClipboardOwner(), WM_X11DRV_UPDATE_CLIPBOARD, 0, 0, + SMTO_ABORTIFHUNG, 5000, &ret ) && ret) last_update = now; } diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 61fe5578e8b..c335bc5ba2b 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -192,9 +192,10 @@ static LONG X11DRV_desktop_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) static void query_desktop_work_area( RECT *rc_work ) { - static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d'}; + UNICODE_STRING str = { sizeof(trayW), sizeof(trayW), (WCHAR *)trayW }; RECT rect; - HWND hwnd = FindWindowW( trayW, NULL ); + HWND hwnd = NtUserFindWindowEx( 0, 0, &str, NULL, 0 ); if (!hwnd || !NtUserIsWindowVisible( hwnd )) return; if (!NtUserGetWindowRect( hwnd, &rect )) return; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 12b0884a250..d5e7127ceed 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -665,10 +665,11 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) HMENU hSysMenu; if (NtUserGetClassLongW( hwnd, GCL_STYLE ) & CS_NOCLOSE) return; - hSysMenu = GetSystemMenu(hwnd, FALSE); + hSysMenu = NtUserGetSystemMenu( hwnd, FALSE ); if (hSysMenu) { - UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); + UINT state = NtUserThunkedMenuItemInfo( hSysMenu, SC_CLOSE, MF_BYCOMMAND, + NtUserGetMenuState, NULL, NULL ); if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) return; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 46951103bc1..02c5bf88f0e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -406,7 +406,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); - DestroyWindow( msg_hwnd ); + NtUserDestroyWindow( msg_hwnd ); NtUserClipCursor( NULL ); return TRUE; } @@ -432,7 +432,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!clipping_cursor) { disable_xinput2(); - DestroyWindow( msg_hwnd ); + NtUserDestroyWindow( msg_hwnd ); return FALSE; } clip_rect = *clip; @@ -1697,9 +1697,9 @@ void move_resize_window( HWND hwnd, int dir ) while (NtUserPeekMessage( &msg, 0, 0, 0, PM_REMOVE )) { - if (!CallMsgFilterW( &msg, MSGF_SIZE )) + if (!NtUserCallMsgFilter( &msg, MSGF_SIZE )) { - TranslateMessage( &msg ); + NtUserTranslateMessage( &msg, 0 ); NtUserDispatchMessage( &msg ); } } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7726ba78db0..cfb61c3217a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2007,13 +2007,16 @@ HWND create_foreign_window( Display *display, Window xwin ) if (!class_registered) { + UNICODE_STRING class_name, version = { 0 }; WNDCLASSEXW class; memset( &class, 0, sizeof(class) ); class.cbSize = sizeof(class); class.lpfnWndProc = foreign_window_proc; class.lpszClassName = classW; - if (!RegisterClassExW( &class ) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) + RtlInitUnicodeString( &class_name, classW ); + if (!NtUserRegisterClassExWOW( &class, &class_name, &version, NULL, 0, 0, NULL ) && + GetLastError() != ERROR_CLASS_ALREADY_EXISTS) { ERR( "Could not register foreign window class\n" ); return FALSE; @@ -2052,7 +2055,7 @@ HWND create_foreign_window( Display *display, Window xwin ) if (!(data = alloc_win_data( display, hwnd ))) { - DestroyWindow( hwnd ); + NtUserDestroyWindow( hwnd ); return 0; } SetRect( &data->window_rect, pos.x, pos.y, pos.x + attr.width, pos.y + attr.height ); @@ -2681,12 +2684,13 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, /* check if the window icon should be hidden (i.e. moved off-screen) */ static BOOL hide_icon( struct x11drv_win_data *data ) { - static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d'}; + UNICODE_STRING str = { sizeof(trayW), sizeof(trayW), (WCHAR *)trayW }; if (data->managed) return TRUE; /* hide icons in desktop mode when the taskbar is active */ if (!is_virtual_desktop()) return FALSE; - return NtUserIsWindowVisible( FindWindowW( trayW, NULL )); + return NtUserIsWindowVisible( NtUserFindWindowEx( 0, 0, &str, NULL, 0 )); } /*********************************************************************** diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 44d9c7698aa..a6b80daedbe 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -536,8 +536,8 @@ NTSTATUS x11drv_tablet_load_info( void *hwnd ) gSysContext.lcSensZ = 65536; gSysContext.lcSysSensX= 65536; gSysContext.lcSysSensY= 65536; - gSysContext.lcSysExtX = GetSystemMetrics(SM_CXVIRTUALSCREEN); - gSysContext.lcSysExtY = GetSystemMetrics(SM_CYVIRTUALSCREEN); + gSysContext.lcSysExtX = NtUserGetSystemMetrics( SM_CXVIRTUALSCREEN ); + gSysContext.lcSysExtY = NtUserGetSystemMetrics( SM_CYVIRTUALSCREEN ); /* initialize cursors */ disable_system_cursors(); @@ -905,7 +905,7 @@ static BOOL motion_event( HWND hwnd, XEvent *event ) gMsgPacket.pkNormalPressure = motion->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); - SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + send_message( hwndTabletDefault, WT_PACKET, gMsgPacket.pkSerialNumber, (LPARAM)hwnd ); last_packet = gMsgPacket; return TRUE; } @@ -944,7 +944,7 @@ static BOOL button_event( HWND hwnd, XEvent *event ) } gMsgPacket.pkButtons = get_button_state(curnum); gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); - SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + send_message( hwndTabletDefault, WT_PACKET, gMsgPacket.pkSerialNumber, (LPARAM)hwnd ); last_packet = gMsgPacket; return TRUE; } @@ -996,7 +996,7 @@ static BOOL proximity_event( HWND hwnd, XEvent *event ) */ proximity_info = MAKELPARAM((event->type == proximity_in_type), (event->type == proximity_in_type) || (event->type == proximity_out_type)); - SendMessageW(hwndTabletDefault, WT_PROXIMITY, (WPARAM)hwnd, proximity_info); + send_message( hwndTabletDefault, WT_PROXIMITY, (WPARAM)hwnd, proximity_info ); return TRUE; }

1 0

Jacek Caban : winex11: Directly use NtUserGetIconInfo.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 7769c8e9dfe238194d4ae7aab80ad83dc55d2e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7769c8e9dfe238194d4ae7aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 22:18:43 2022 +0200 winex11: Directly use NtUserGetIconInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 7133f2e2694..46951103bc1 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1228,6 +1228,27 @@ done: return cursor; } +static BOOL get_icon_info( HICON handle, ICONINFOEXW *ret ) +{ + UNICODE_STRING module, res_name; + ICONINFO info; + + module.Buffer = ret->szModName; + module.MaximumLength = sizeof(ret->szModName) - sizeof(WCHAR); + res_name.Buffer = ret->szResName; + res_name.MaximumLength = sizeof(ret->szResName) - sizeof(WCHAR); + if (!NtUserGetIconInfo( handle, &info, &module, &res_name, NULL, 0 )) return FALSE; + ret->fIcon = info.fIcon; + ret->xHotspot = info.xHotspot; + ret->yHotspot = info.yHotspot; + ret->hbmColor = info.hbmColor; + ret->hbmMask = info.hbmMask; + ret->wResID = res_name.Length ? 0 : LOWORD( res_name.Buffer ); + ret->szModName[module.Length] = 0; + ret->szResName[res_name.Length] = 0; + return TRUE; +} + /*********************************************************************** * create_xlib_load_mono_cursor * @@ -1243,8 +1264,7 @@ static Cursor create_xlib_load_mono_cursor( HDC hdc, HANDLE handle, int width, i if (!(mono = CopyImage( handle, IMAGE_CURSOR, width, height, LR_MONOCHROME | LR_COPYFROMRESOURCE ))) return None; - info.cbSize = sizeof(info); - if (GetIconInfoExW( mono, &info )) + if (get_icon_info( mono, &info )) { if (!info.hbmColor) { @@ -1413,8 +1433,7 @@ static Cursor create_cursor( HANDLE handle ) if (!handle) return get_empty_cursor(); - info.cbSize = sizeof(info); - if (!GetIconInfoExW( handle, &info )) return 0; + if (!get_icon_info( handle, &info )) return 0; if (use_system_cursors && (cursor = create_xcursor_system_cursor( &info ))) {

1 0

Jacek Caban : win32u: Move NtUserCallMsgFilter implementation from user32.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 70d3e41d64b765112320c9ccc36ec9b7317d14e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d3e41d64b765112320c9cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 17:25:57 2022 +0200 win32u: Move NtUserCallMsgFilter implementation from user32. A/W conversion is not used in those cases anyway, so just use a single implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 2 +- dlls/user32/hook.c | 20 ------------------- dlls/user32/menu.c | 2 +- dlls/user32/nonclient.c | 6 +++--- dlls/user32/scroll.c | 2 +- dlls/user32/user32.spec | 6 +++--- dlls/user32/winpos.c | 4 ++-- dlls/win32u/hook.c | 11 +++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 14 files changed, 119 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70d3e41d64b765112320…

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022