June 2023 - Wine-commits - list.winehq.org

Georg Lehmann : winevulkan: Update to VK spec version 1.3.254.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 7eb75124e74804f56813ef371193d0db97e12e9c URL: https://gitlab.winehq.org/wine/wine/-/commit/7eb75124e74804f56813ef371193d0… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jun 16 17:48:29 2023 +0200 winevulkan: Update to VK spec version 1.3.254. --- dlls/winevulkan/loader_thunks.c | 9 ++ dlls/winevulkan/loader_thunks.h | 7 + dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 276 ++++++++++++++++++++++++++++++++++++++-- dlls/winevulkan/vulkan_thunks.h | 2 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 58 ++++++++- 7 files changed, 345 insertions(+), 11 deletions(-)

1 0

Alexandre Julliard : conhost: Use nameless union/structs.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 2e58c9e0605b3846d50c6bb09f4274f9324746ac URL: https://gitlab.winehq.org/wine/wine/-/commit/2e58c9e0605b3846d50c6bb09f4274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:56:55 2023 +0200 conhost: Use nameless union/structs. --- programs/conhost/window.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 0d6036f07d7..043ecd5510f 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #include <stdlib.h> #include "conhost.h" @@ -1924,15 +1923,15 @@ static BOOL config_dialog( struct console *console, BOOL current ) psp.hInstance = wndclass.hInstance; psp.lParam = (LPARAM)&di; - psp.u.pszTemplate = MAKEINTRESOURCEW(IDD_OPTION); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_OPTION); psp.pfnDlgProc = option_dialog_proc; pages[0] = CreatePropertySheetPageW( &psp ); - psp.u.pszTemplate = MAKEINTRESOURCEW(IDD_FONT); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_FONT); psp.pfnDlgProc = font_dialog_proc; pages[1] = CreatePropertySheetPageW( &psp ); - psp.u.pszTemplate = MAKEINTRESOURCEW(IDD_CONFIG); + psp.pszTemplate = MAKEINTRESOURCEW(IDD_CONFIG); psp.pfnDlgProc = config_dialog_proc; pages[2] = CreatePropertySheetPageW( &psp ); @@ -1947,7 +1946,7 @@ static BOOL config_dialog( struct console *console, BOOL current ) header.pszCaption = buff; header.nPages = 3; header.hwndParent = console->win; - header.u3.phpage = pages; + header.phpage = pages; header.dwFlags = PSH_NOAPPLYNOW; if (PropertySheetW( &header ) < 1) return TRUE;

1 0

Alexandre Julliard : explorer: Use nameless union/structs.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 14518662d6a2e99b63f54b70d5e913081dcbf368 URL: https://gitlab.winehq.org/wine/wine/-/commit/14518662d6a2e99b63f54b70d5e913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:57:11 2023 +0200 explorer: Use nameless union/structs. --- programs/explorer/desktop.c | 5 +---- programs/explorer/systray.c | 7 +++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 341aff89056..1610814048e 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -22,8 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define OEMRESOURCE #include <windows.h> #include <rpc.h> @@ -973,8 +971,7 @@ static void initialize_display_settings(void) WINE_TRACE( "Device %s current display mode %lux%lu %luBits %luHz at %ld,%ld.\n", wine_dbgstr_w( ddW.DeviceName ), dmW.dmPelsWidth, dmW.dmPelsHeight, - dmW.dmBitsPerPel, dmW.dmDisplayFrequency, dmW.u1.s2.dmPosition.x, - dmW.u1.s2.dmPosition.y ); + dmW.dmBitsPerPel, dmW.dmDisplayFrequency, dmW.dmPosition.x, dmW.dmPosition.y ); if (ChangeDisplaySettingsExW( ddW.DeviceName, &dmW, 0, CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, 0 )) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 7790648d021..5070e123829 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -20,7 +20,6 @@ #include <assert.h> -#define NONAMELESSUNION #include <windows.h> #include <commctrl.h> #include <shellapi.h> @@ -412,7 +411,7 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) lstrcpynW( icon->info_text, nid->szInfo, ARRAY_SIZE( icon->info_text )); lstrcpynW( icon->info_title, nid->szInfoTitle, ARRAY_SIZE( icon->info_title )); icon->info_flags = nid->dwInfoFlags; - icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); + icon->info_timeout = max(min(nid->uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); icon->info_icon = nid->hBalloonIcon; update_balloon( icon ); } @@ -536,7 +535,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) nid.hIcon = 0; nid.dwState = data->dwState; nid.dwStateMask = data->dwStateMask; - nid.u.uTimeout = data->u.uTimeout; + nid.uTimeout = data->u.uTimeout; nid.dwInfoFlags = data->dwInfoFlags; nid.guidItem = data->guidItem; lstrcpyW( nid.szTip, data->szTip ); @@ -589,7 +588,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) case NIM_SETVERSION: if (icon) { - icon->version = nid.u.uVersion; + icon->version = nid.uVersion; ret = TRUE; } break;

1 0

Alexandre Julliard : ipconfig: Use nameless union/structs.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: e3664fa8ad24d6dc47f0563810b0780a809c283e URL: https://gitlab.winehq.org/wine/wine/-/commit/e3664fa8ad24d6dc47f0563810b078… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:57:24 2023 +0200 ipconfig: Use nameless union/structs. --- programs/ipconfig/ipconfig.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 40324a0a493..f59c3ab7182 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include <stdio.h> #include <winsock2.h> #include <windows.h> @@ -317,7 +315,7 @@ static void print_full_information(void) print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); print_field(STRING_DESCRIPTION, p->Description); print_field(STRING_PHYS_ADDR, physaddr_to_string(physaddr_buf, p->PhysicalAddress, p->PhysicalAddressLength)); - print_field(STRING_DHCP_ENABLED, boolean_to_string(p->u1.Flags & IP_ADAPTER_DHCP_ENABLED)); + print_field(STRING_DHCP_ENABLED, boolean_to_string(p->Flags & IP_ADAPTER_DHCP_ENABLED)); /* FIXME: Output autoconfiguration status. */

1 0

Alexandre Julliard : netstat: Use nameless union/structs.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 52a868a8feda29ef14a93e410fc79ae81ad813a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/52a868a8feda29ef14a93e410fc79a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:57:36 2023 +0200 netstat: Use nameless union/structs. --- programs/netstat/netstat.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 2c1ef89c231..6e771776b38 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #include <stdio.h> #include "netstat.h" #include <winsock2.h> @@ -256,9 +255,9 @@ static void NETSTAT_tcp_table(void) for (i = 0; i < table->dwNumEntries; i++) { - if ((table->table[i].u.dwState == MIB_TCP_STATE_CLOSE_WAIT) || - (table->table[i].u.dwState == MIB_TCP_STATE_ESTAB) || - (table->table[i].u.dwState == MIB_TCP_STATE_TIME_WAIT)) + if ((table->table[i].dwState == MIB_TCP_STATE_CLOSE_WAIT) || + (table->table[i].dwState == MIB_TCP_STATE_ESTAB) || + (table->table[i].dwState == MIB_TCP_STATE_TIME_WAIT)) { NETSTAT_host_name(table->table[i].dwLocalAddr, HostIp); NETSTAT_port_name(table->table[i].dwLocalPort, HostPort); @@ -267,7 +266,7 @@ static void NETSTAT_tcp_table(void) swprintf(Host, ARRAY_SIZE(Host), fmtcolon, HostIp, HostPort); swprintf(Remote, ARRAY_SIZE(Remote), fmtcolon, RemoteIp, RemotePort); - NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, tcpstatesW[table->table[i].u.dwState]); + NETSTAT_wprintf(fmttcpout, tcpW, Host, Remote, tcpstatesW[table->table[i].dwState]); } } HeapFree(GetProcessHeap(), 0, table);

1 0

Alexandre Julliard : oleview: Use nameless unions/structs.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 5d9ea809dad3276aede0879782988f707acd0e56 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d9ea809dad3276aede0879782988f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:58:03 2023 +0200 oleview: Use nameless unions/structs. --- programs/oleview/details.c | 16 +++---- programs/oleview/interface.c | 2 +- programs/oleview/main.h | 6 --- programs/oleview/tree.c | 102 +++++++++++++++++++++---------------------- programs/oleview/typelib.c | 70 ++++++++++++++--------------- 5 files changed, 95 insertions(+), 101 deletions(-)

1 0

Alexandre Julliard : regedit: Use nameless unions/structs.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: c2d1c8dcd3e8af7a3f927d21d6b88c7f74466b11 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d1c8dcd3e8af7a3f927d21d6b88c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:58:16 2023 +0200 regedit: Use nameless unions/structs. --- programs/regedit/treeview.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 95e18571b86..e81e05def12 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -21,8 +21,6 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ -#define NONAMELESSUNION - #include <windows.h> #include <commctrl.h> #include <shlwapi.h> @@ -189,13 +187,13 @@ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HK } } - tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; - tvins.u.item.pszText = label; - tvins.u.item.cchTextMax = lstrlenW(label); - tvins.u.item.iImage = Image_Closed; - tvins.u.item.iSelectedImage = Image_Open; - tvins.u.item.cChildren = dwChildren; - tvins.u.item.lParam = (LPARAM)hKey; + tvins.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; + tvins.item.pszText = label; + tvins.item.cchTextMax = lstrlenW(label); + tvins.item.iImage = Image_Closed; + tvins.item.iSelectedImage = Image_Open; + tvins.item.cChildren = dwChildren; + tvins.item.lParam = (LPARAM)hKey; tvins.hInsertAfter = hKey ? TVI_LAST : TVI_SORT; tvins.hParent = hParent; @@ -551,16 +549,16 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) hkcc[] = L"HKEY_CURRENT_CONFIG", hkdd[] = L"HKEY_DYN_DATA"; - tvins.u.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; + tvins.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM; /* Set the text of the item. */ - tvins.u.item.pszText = pHostName; - tvins.u.item.cchTextMax = lstrlenW(pHostName); + tvins.item.pszText = pHostName; + tvins.item.cchTextMax = lstrlenW(pHostName); /* Assume the item is not a parent item, so give it an image. */ - tvins.u.item.iImage = Image_Root; - tvins.u.item.iSelectedImage = Image_Root; - tvins.u.item.cChildren = 5; + tvins.item.iImage = Image_Root; + tvins.item.iSelectedImage = Image_Root; + tvins.item.cChildren = 5; /* Save the heading level in the item's application-defined data area. */ - tvins.u.item.lParam = 0; + tvins.item.lParam = 0; tvins.hInsertAfter = TVI_FIRST; tvins.hParent = TVI_ROOT; /* Add the item to the tree view control. */

1 0

Alexandre Julliard : services: Use nameless unions/structs.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: f5784e2fd1b7243639bbd6b1d190247c2901ff68 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5784e2fd1b7243639bbd6b1d19024… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 17:58:37 2023 +0200 services: Use nameless unions/structs. --- programs/services/rpc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index b3d5c9403fe..b8e42f13938 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -19,8 +19,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <stdarg.h> #include <windows.h> @@ -1143,8 +1141,8 @@ static BOOL process_send_command(struct process_entry *process, const void *data DWORD count, ret; BOOL r; - overlapped.u.s.Offset = 0; - overlapped.u.s.OffsetHigh = 0; + overlapped.Offset = 0; + overlapped.OffsetHigh = 0; overlapped.hEvent = process->overlapped_event; r = WriteFile(process->control_pipe, data, size, &count, &overlapped); if (!r && GetLastError() == ERROR_IO_PENDING)

1 0

Rémi Bernon : win32u: Remove unnecessary set_cursor new_clip rect copy.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 56e2a08dae6ead7738488c0b33832abb7b3a91d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/56e2a08dae6ead7738488c0b33832a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 16 08:42:52 2023 +0200 win32u: Remove unnecessary set_cursor new_clip rect copy. --- dlls/win32u/input.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 205b792d784..2311fb359af 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2614,13 +2614,7 @@ BOOL WINAPI NtUserClipCursor( const RECT *rect ) } else req->flags = SET_CURSOR_NOCLIP; - if ((ret = !wine_server_call( req ))) - { - new_rect.left = reply->new_clip.left; - new_rect.top = reply->new_clip.top; - new_rect.right = reply->new_clip.right; - new_rect.bottom = reply->new_clip.bottom; - } + ret = !wine_server_call( req ); } SERVER_END_REQ;

1 0

Rémi Bernon : server: Pass set_cursor flags in WM_WINE_CLIPCURSOR wparam.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: ab9b99c4a51afa36fdbec950aee1abbdc2fe28a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab9b99c4a51afa36fdbec950aee1ab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 16 08:54:43 2023 +0200 server: Pass set_cursor flags in WM_WINE_CLIPCURSOR wparam. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55047 --- dlls/win32u/input.c | 6 +++--- dlls/win32u/message.c | 4 +++- dlls/win32u/sysparams.c | 2 +- dlls/win32u/win32u_private.h | 2 +- server/queue.c | 12 ++++++------ server/user.h | 3 ++- server/window.c | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 2311fb359af..8010183d97c 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2544,13 +2544,13 @@ BOOL get_clip_cursor( RECT *rect ) return ret; } -BOOL process_wine_clipcursor( HWND hwnd, BOOL empty, BOOL reset ) +BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset ) { struct user_thread_info *thread_info = get_user_thread_info(); RECT rect, virtual_rect = NtUserGetVirtualScreenRect(); - BOOL was_clipping; + BOOL was_clipping, empty = !!(flags & SET_CURSOR_NOCLIP); - TRACE( "hwnd %p, empty %u, reset %u\n", hwnd, empty, reset ); + TRACE( "hwnd %p, flags %#x, reset %u\n", hwnd, flags, reset ); if ((was_clipping = thread_info->clipping_cursor)) InterlockedDecrement( &clipping_cursor ); thread_info->clipping_cursor = FALSE; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index cb44e0037d9..687caef9bfc 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1272,7 +1272,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return call_current_hook( h_extra->handle, HC_ACTION, wparam, h_extra->lparam ); } case WM_WINE_CLIPCURSOR: - if (wparam && lparam) return clip_fullscreen_window( hwnd, FALSE ); + /* non-hardware message, posted on display mode change to trigger fullscreen + clipping or to the desktop window to forcefully release the cursor grabs */ + if (!wparam) return clip_fullscreen_window( hwnd, FALSE ); return process_wine_clipcursor( hwnd, wparam, lparam ); case WM_WINE_SETCURSOR: FIXME( "Unexpected non-hardware WM_WINE_SETCURSOR message\n" ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 4f69cac7040..59f624214b7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2929,7 +2929,7 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), SMTO_ABORTIFHUNG, 2000, FALSE ); /* post clip_fullscreen_window request to the foreground window */ - NtUserPostMessage( NtUserGetForegroundWindow(), WM_WINE_CLIPCURSOR, TRUE, TRUE ); + NtUserPostMessage( NtUserGetForegroundWindow(), WM_WINE_CLIPCURSOR, 0, 0 ); } return ret; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3bd41a4ffa8..ee117ed2637 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -104,7 +104,7 @@ extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; extern void toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; extern void update_mouse_tracking_info( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; -extern BOOL process_wine_clipcursor( HWND hwnd, BOOL empty, BOOL reset ) DECLSPEC_HIDDEN; +extern BOOL process_wine_clipcursor( HWND hwnd, UINT flags, BOOL reset ) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN; /* menu.c */ diff --git a/server/queue.c b/server/queue.c index ec8ddcbee5c..fcc946ff0cb 100644 --- a/server/queue.c +++ b/server/queue.c @@ -508,7 +508,7 @@ static void get_message_defaults( struct msg_queue *queue, int *x, int *y, unsig } /* set the cursor clip rectangle */ -void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int reset ) +void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, unsigned int flags, int reset ) { rectangle_t top_rect; int x, y; @@ -532,17 +532,17 @@ void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, int r if (x != desktop->cursor.x || y != desktop->cursor.y) set_cursor_pos( desktop, x, y ); /* request clip cursor rectangle reset to the desktop thread */ - if (reset) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, TRUE, FALSE ); + if (reset) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, flags, FALSE ); /* notify foreground thread, of reset, or to apply new cursor clipping rect */ - queue_cursor_message( desktop, 0, WM_WINE_CLIPCURSOR, rect == NULL, reset ); + queue_cursor_message( desktop, 0, WM_WINE_CLIPCURSOR, flags, reset ); } /* change the foreground input and reset the cursor clip rect */ static void set_foreground_input( struct desktop *desktop, struct thread_input *input ) { if (desktop->foreground_input == input) return; - set_clip_rectangle( desktop, NULL, 1 ); + set_clip_rectangle( desktop, NULL, SET_CURSOR_NOCLIP, 1 ); desktop->foreground_input = input; } @@ -3383,8 +3383,8 @@ DECL_HANDLER(set_cursor) input->cursor_count += req->show_count; } if (req->flags & SET_CURSOR_POS) set_cursor_pos( desktop, req->x, req->y ); - if (req->flags & SET_CURSOR_CLIP) set_clip_rectangle( desktop, &req->clip, 0 ); - if (req->flags & SET_CURSOR_NOCLIP) set_clip_rectangle( desktop, NULL, 0 ); + if (req->flags & SET_CURSOR_CLIP) set_clip_rectangle( desktop, &req->clip, req->flags, 0 ); + if (req->flags & SET_CURSOR_NOCLIP) set_clip_rectangle( desktop, NULL, SET_CURSOR_NOCLIP, 0 ); if (req->flags & (SET_CURSOR_HANDLE | SET_CURSOR_COUNT)) { diff --git a/server/user.h b/server/user.h index f67e710938f..b6f47bcac1c 100644 --- a/server/user.h +++ b/server/user.h @@ -110,7 +110,8 @@ extern void queue_cleanup_window( struct thread *thread, user_handle_t win ); extern int init_thread_queue( 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, int reset ); +extern void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect, + unsigned int flags, int reset ); extern void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lparam_t lparam ); extern void send_notify_message( user_handle_t win, unsigned int message, diff --git a/server/window.c b/server/window.c index 9db8ccbe27e..328e3dfc64c 100644 --- a/server/window.c +++ b/server/window.c @@ -1829,7 +1829,7 @@ static void set_window_pos( struct window *win, struct window *previous, } /* reset cursor clip rectangle when the desktop changes size */ - if (win == win->desktop->top_window) set_clip_rectangle( win->desktop, NULL, 1 ); + if (win == win->desktop->top_window) set_clip_rectangle( win->desktop, NULL, SET_CURSOR_NOCLIP, 1 ); /* if the window is not visible, everything is easy */ if (!visible) return;

1 0