May 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : msi/tests: Show that MsiSetTargetPath updates folder properties.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: defcf092a9ac2dc3711b3d6c67f50976961380b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=defcf092a9ac2dc3711b3d6c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 11 11:25:17 2011 +0200 msi/tests: Show that MsiSetTargetPath updates folder properties. --- dlls/msi/tests/package.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ce8866c..d240acf 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1144,9 +1144,21 @@ static void test_settargetpath(void) query_file_path( hpkg, "[#RootFile]", buffer ); ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer); + sz = sizeof(buffer); + r = MsiGetPropertyA( hpkg, "TestParent", buffer, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); + lstrcatA( tempdir, "TestParent\\" ); + ok( !lstrcmpi(buffer, tempdir), "Expected \"%s\", got \"%s\"\n", tempdir, buffer ); + r = MsiSetTargetPath( hpkg, "TestParent", "C:\\one\\two" ); ok( r == ERROR_SUCCESS, "MsiSetTargetPath returned %d\n", r ); + sz = sizeof(buffer); + r = MsiGetPropertyA( hpkg, "TestParent", buffer, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); + ok( lstrcmpi(buffer, "C:\\one\\two\\TestDir\\"), + "Expected \"C:\\one\\two\\TestDir\\\", got \"%s\"\n", buffer ); + query_file_path( hpkg, "[#TestFile]", buffer ); ok( !lstrcmpi(buffer, "C:\\one\\two\\TestDir\\testfile.txt"), "Expected C:\\one\\two\\TestDir\\testfile.txt, got %s\n", buffer );

1 0

Jacek Caban : wininet: Set TCP_NODELAY on socket.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: c280970c3e04021645353db52169f22f68ad4670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c280970c3e04021645353db52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 11:32:34 2011 +0000 wininet: Set TCP_NODELAY on socket. --- dlls/wininet/netconnection.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c1e108e..1119e48 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -58,6 +58,9 @@ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif +#ifdef HAVE_NETINET_TCP_H +# include <netinet/tcp.h> +#endif #ifdef HAVE_OPENSSL_SSL_H # include <openssl/ssl.h> # include <openssl/opensslv.h> @@ -497,7 +500,7 @@ static DWORD init_openssl(void) DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, netconn_t **ret) { netconn_t *netconn; - int result; + int result, flag; if(useSSL) { DWORD res; @@ -532,6 +535,13 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, netcon return sock_get_error(errno); } +#ifdef TCP_NODELAY + flag = 1; + result = setsockopt(netconn->socketFD, IPPROTO_TCP, TCP_NODELAY, (void*)&flag, sizeof(flag)); + if(result < 0) + WARN("setsockopt(TCP_NODELAY) failed\n"); +#endif + server_addref(server); netconn->server = server;

1 0

Nikolay Sivov : comctl32/listview: Don't forward HDN_ITEMCHANGING/ HDN_ITEMCHANGED to listview parent.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: 69bcdb7aad96c6ad21d8a28dd712a7159a974d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69bcdb7aad96c6ad21d8a28dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 11 11:10:24 2011 +0400 comctl32/listview: Don't forward HDN_ITEMCHANGING/HDN_ITEMCHANGED to listview parent. --- dlls/comctl32/listview.c | 9 --------- dlls/comctl32/tests/listview.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6f7d7f3..8f7745f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10141,7 +10141,6 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) */ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) { - HWND hwndSelf = infoPtr->hwndSelf; const NMHEADERW *lpnmh; TRACE("(lpnmhdr=%p)\n", lpnmhdr); @@ -10194,10 +10193,6 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) LISTVIEW_InvalidateList(infoPtr); notify_forward_header(infoPtr, lpnmh); return FALSE; - - case HDN_ITEMCHANGINGW: - case HDN_ITEMCHANGINGA: - return notify_forward_header(infoPtr, lpnmh); case HDN_ITEMCHANGEDW: case HDN_ITEMCHANGEDA: @@ -10205,10 +10200,6 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) COLUMN_INFO *lpColumnInfo; HDITEMW hdi; INT dx, cxy; - - notify_forward_header(infoPtr, lpnmh); - if (!IsWindow(hwndSelf)) - break; if (!lpnmh->pitem || !(lpnmh->pitem->mask & HDI_WIDTH)) { diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3bf3dcb..20f231e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -305,6 +305,13 @@ static const struct message listview_destroy[] = { { 0 } }; +static const struct message listview_header_changed_seq[] = { + { LVM_SETCOLUMNA, sent }, + { WM_NOTIFY, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, + { WM_NOTIFY, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -4593,11 +4600,13 @@ static void test_destroynotify(void) static void test_header_notification(void) { + static char textA[] = "newtext"; HWND list, header; HDITEMA item; NMHEADER nmh; LVCOLUMNA col; LRESULT ret; + BOOL r; list = create_listview_control(LVS_REPORT); ok(list != NULL, "failed to create listview window\n"); @@ -4608,6 +4617,21 @@ static void test_header_notification(void) ret = SendMessage(list, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); ok(!ret, "expected 0, got %ld\n", ret); + /* check list parent notification after header item changed, + this test should be placed before header subclassing to avoid + Listview -> Header messages to be logged */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + col.mask = LVCF_TEXT; + col.pszText = textA; + r = SendMessage(list, LVM_SETCOLUMNA, 0, (LPARAM)&col); + ok(r == TRUE, "got %d\n", r); + + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_header_changed_seq, + "header notify, listview", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "header notify, parent", FALSE); + header = subclass_header(list); ret = SendMessage(header, HDM_GETITEMCOUNT, 0, 0);

1 0

Paul Chitescu : qcap: Initialize to NULL the content of ppPin, not the pointer itself.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: 84a39b4f636fe84d0470ac60b4182b384842c971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a39b4f636fe84d0470ac60b… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed May 11 04:45:59 2011 +0300 qcap: Initialize to NULL the content of ppPin, not the pointer itself. --- dlls/qcap/vfwcapture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 8997480..1138a64 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -726,7 +726,7 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, PIN_INFO piOutput; HRESULT hr; - ppPin = NULL; + *ppPin = NULL; piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = pBaseFilter;

1 0

Eric Pouech : kernel32: In CreateFile, when trying to open the CON special DOS file, force OPEN_EXISTING as creation flag.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: 8a529d60e285308023bc56e7300a2a864289ae60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a529d60e285308023bc56e73… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 10 22:02:35 2011 +0200 kernel32: In CreateFile, when trying to open the CON special DOS file, force OPEN_EXISTING as creation flag. --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/console.c | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 6ee243e..537ea0a 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1322,10 +1322,10 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, switch (access & (GENERIC_READ|GENERIC_WRITE)) { case GENERIC_READ: - ret = OpenConsoleW(coninW, access, (sa && sa->bInheritHandle), creation); + ret = OpenConsoleW(coninW, access, (sa && sa->bInheritHandle), OPEN_EXISTING); goto done; case GENERIC_WRITE: - ret = OpenConsoleW(conoutW, access, (sa && sa->bInheritHandle), creation); + ret = OpenConsoleW(conoutW, access, (sa && sa->bInheritHandle), OPEN_EXISTING); goto done; default: SetLastError( ERROR_FILE_NOT_FOUND ); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 0cd88a3..07a090b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1002,7 +1002,6 @@ static void test_OpenCON(void) for (i = 0; i < sizeof(accesses) / sizeof(accesses[0]); i++) { - if (accesses[i] != OPEN_EXISTING) todo_wine { h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); CloseHandle(h); @@ -1018,23 +1017,6 @@ static void test_OpenCON(void) ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); } CloseHandle(h); - } else { - h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); - ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); - CloseHandle(h); - - h = CreateFileW(conW, GENERIC_READ, 0, NULL, accesses[i], 0, NULL); - /* Windows versions differ here: - * MSDN states in CreateFile that TRUNCATE_EXISTING requires GENERIC_WRITE - * NT, XP, Vista comply, but Win7 doesn't and allows to open CON with TRUNCATE_EXISTING - * So don't test when disposition is TRUNCATE_EXISTING - */ - if (accesses[i] != TRUNCATE_EXISTING) - { - ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); - } - CloseHandle(h); - } h = CreateFileW(conW, GENERIC_READ|GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); ok(h == INVALID_HANDLE_VALUE, "Expected not to open the CON device on read-write (%x)\n", accesses[i]); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %x\n", GetLastError());

1 0

Alexandre Julliard : winex11: Add an option to automatically clip the pointer in desktop and multi-monitor modes .
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: ae52a8c2cb0cbca1496e86956a59e5d7160ca5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae52a8c2cb0cbca1496e86956… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 13:07:34 2011 +0200 winex11: Add an option to automatically clip the pointer in desktop and multi-monitor modes. --- dlls/winex11.drv/mouse.c | 7 +++++-- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a4b846b..3e1a78f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -518,8 +518,11 @@ BOOL clip_fullscreen_window( HWND hwnd ) if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE; if (GetTickCount() - x11drv_thread_data()->clip_reset < 1000) return FALSE; SetRect( &rect, 0, 0, screen_width, screen_height ); - if (!EqualRect( &rect, &virtual_screen_rect )) return FALSE; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (!grab_fullscreen) + { + if (!EqualRect( &rect, &virtual_screen_rect )) return FALSE; + if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + } TRACE( "win %p clipping fullscreen\n", hwnd ); return grab_clipping_window( &rect, TRUE ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b7011da..fc6902b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -601,6 +601,7 @@ extern int use_primary_selection; extern int use_system_cursors; extern int show_systray; extern int grab_pointer; +extern int grab_fullscreen; extern int usexcomposite; extern int managed_mode; extern int decorated_mode; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index cb6d793..8e0a784 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -84,6 +84,7 @@ int use_primary_selection = 0; int use_system_cursors = 1; int show_systray = 1; int grab_pointer = 1; +int grab_fullscreen = 0; int managed_mode = 1; int decorated_mode = 1; int private_color_map = 0; @@ -426,6 +427,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "GrabPointer", buffer, sizeof(buffer) )) grab_pointer = IS_OPTION_TRUE( buffer[0] ); + if (!get_config_key( hkey, appkey, "GrabFullscreen", buffer, sizeof(buffer) )) + grab_fullscreen = IS_OPTION_TRUE( buffer[0] ); + screen_depth = 0; if (!get_config_key( hkey, appkey, "ScreenDepth", buffer, sizeof(buffer) )) screen_depth = atoi(buffer);

1 0

André Hentschel : include: Fall back to little endian when it's not specified on ARM.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: a1950b9669c6b1d8455b904c1ac63b856ca6f34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1950b9669c6b1d8455b904c1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 10 20:49:58 2011 +0200 include: Fall back to little endian when it's not specified on ARM. --- include/basetsd.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 1259ad9..852f6f4 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -295,7 +295,7 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY; # define WORDS_BIGENDIAN # define BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS -#elif defined(__ARMEL__) +#elif defined(__ARMEL__) || defined(__arm__) # undef WORDS_BIGENDIAN # undef BITFIELDS_BIGENDIAN # undef ALLOW_UNALIGNED_ACCESS

1 0

Alexandre Julliard : winex11: Export a couple of helper functions for window rectangles.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: a07b8411fcfe4261da3941a7cb7dcfc3c5736c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07b8411fcfe4261da3941a7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 12:09:12 2011 +0200 winex11: Export a couple of helper functions for window rectangles. --- dlls/winex11.drv/window.c | 24 ++---------------------- dlls/winex11.drv/x11drv.h | 12 ++++++++++++ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 32a3f4c..9e67612 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -225,24 +225,6 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec /*********************************************************************** - * is_window_rect_mapped - * - * Check if the X whole window should be mapped based on its rectangle - */ -static BOOL is_window_rect_mapped( const RECT *rect ) -{ - /* don't map if rect is off-screen */ - if (rect->left >= virtual_screen_rect.right || - rect->top >= virtual_screen_rect.bottom || - rect->right <= virtual_screen_rect.left || - rect->bottom <= virtual_screen_rect.top) - return FALSE; - - return TRUE; -} - - -/*********************************************************************** * is_window_resizable * * Check if window should be made resizable by the window manager @@ -251,8 +233,7 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl { if (style & WS_THICKFRAME) return TRUE; /* Metacity needs the window to be resizable to make it fullscreen */ - return (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && - data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height); + return is_window_rect_fullscreen( &data->whole_rect ); } @@ -1271,8 +1252,7 @@ void update_net_wm_states( Display *display, struct x11drv_win_data *data ) if (data->whole_window == root_window) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); - if (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && - data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height) + if (is_window_rect_fullscreen( &data->whole_rect )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) new_state |= (1 << NET_WM_STATE_MAXIMIZED); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a924e06..8e756b2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -819,6 +819,18 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) rect->right = width - tmp; } +static inline BOOL is_window_rect_mapped( const RECT *rect ) +{ + return (rect->left < virtual_screen_rect.right && rect->top < virtual_screen_rect.bottom && + rect->right > virtual_screen_rect.left && rect->bottom > virtual_screen_rect.top); +} + +static inline BOOL is_window_rect_fullscreen( const RECT *rect ) +{ + return (rect->left <= 0 && rect->right >= screen_width && + rect->top <= 0 && rect->bottom >= screen_height); +} + /* X context to associate a hwnd to an X window */ extern XContext winContext;

1 0

Alexandre Julliard : winex11: Reset the clipping when the desktop window loses focus.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: a28722f5313c283ee89ad150e80bcca18720f1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28722f5313c283ee89ad150e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 12:07:37 2011 +0200 winex11: Reset the clipping when the desktop window loses focus. --- dlls/winex11.drv/desktop.c | 2 +- dlls/winex11.drv/event.c | 22 ++++++++++------------ dlls/winex11.drv/mouse.c | 11 +++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index fe4a040..b78306d 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -143,7 +143,7 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) /* Create window */ win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask | - PointerMotionMask | ButtonPressMask | ButtonReleaseMask; + PointerMotionMask | ButtonPressMask | ButtonReleaseMask | FocusChangeMask; win_attr.cursor = XCreateFontCursor( display, XC_top_left_arrow ); if (visual != DefaultVisual( display, DefaultScreen(display) )) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 3af56f8..52d4b81 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -706,6 +706,7 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *xev ) TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); if (event->detail == NotifyPointer) return; + if (hwnd == GetDesktopWindow()) return; if ((xic = X11DRV_get_ic( hwnd ))) { @@ -740,20 +741,13 @@ static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) int revert; XIC xic; - if (!hwnd) + TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); + + if (event->detail == NotifyPointer) { - if (event->detail == NotifyPointer && event->window == x11drv_thread_data()->clip_window) - { - TRACE( "clip window lost focus\n" ); - ungrab_clipping_window(); - ClipCursor( NULL ); /* make sure the clip rectangle is reset too */ - } + if (!hwnd && event->window == x11drv_thread_data()->clip_window) reset_clipping_window(); return; } - - TRACE( "win %p xwin %lx detail=%s\n", hwnd, event->window, focus_details[event->detail] ); - - if (event->detail == NotifyPointer) return; if (ximInComposeMode) return; x11drv_thread_data()->last_focus = hwnd; @@ -763,8 +757,12 @@ static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) XUnsetICFocus( xic ); wine_tsx11_unlock(); } + if (root_window != DefaultRootWindow(event->display)) + { + if (hwnd == GetDesktopWindow()) reset_clipping_window(); + return; + } if (hwnd != GetForegroundWindow()) return; - if (root_window != DefaultRootWindow(event->display)) return; SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); /* don't reset the foreground window, if the window which is diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index fdc92ab..06805a7 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -449,6 +449,17 @@ void ungrab_clipping_window(void) } /*********************************************************************** + * reset_clipping_window + * + * Forcibly reset the window clipping on external events. + */ +void reset_clipping_window(void) +{ + ungrab_clipping_window(); + ClipCursor( NULL ); /* make sure the clip rectangle is reset too */ +} + +/*********************************************************************** * clip_cursor_notify * * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7113a02..a924e06 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -831,6 +831,7 @@ extern void set_window_cursor( Window window, HCURSOR handle ); extern void sync_window_cursor( Window window ); extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ); extern void ungrab_clipping_window(void); +extern void reset_clipping_window(void); extern void X11DRV_InitKeyboard( Display *display ); extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags );

1 0

Alexandre Julliard : winex11: Automatically clip the pointer when the foreground window is full-screen.
by Alexandre Julliard May 11, 2011

May 11, 2011

Module: wine Branch: master Commit: a59c7cc8596b658d3c0854a737528cf60947ac1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59c7cc8596b658d3c0854a73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 11 12:30:03 2011 +0200 winex11: Automatically clip the pointer when the foreground window is full-screen. --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/event.c | 6 +++- dlls/winex11.drv/mouse.c | 74 +++++++++++++++++++++++++++++++++---------- dlls/winex11.drv/x11drv.h | 2 + 4 files changed, 65 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b78306d..b45f786 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -200,6 +200,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam DefaultScreen(display), mask, &changes ); wine_tsx11_unlock(); } + if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd ); return TRUE; } diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 52d4b81..d2ab40a 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -714,7 +714,11 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *xev ) XSetICFocus( xic ); wine_tsx11_unlock(); } - if (use_take_focus) return; /* ignore FocusIn if we are using take focus */ + if (use_take_focus) + { + if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd ); + return; + } if (!can_activate_window(hwnd)) { diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 06805a7..a4b846b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -373,7 +373,7 @@ static HWND create_clipping_msg_window(void) * * Start a pointer grab on the clip window. */ -static BOOL grab_clipping_window( const RECT *clip ) +static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) { struct x11drv_thread_data *data = x11drv_thread_data(); Window clip_window; @@ -390,7 +390,8 @@ static BOOL grab_clipping_window( const RECT *clip ) } /* don't clip to 1x1 rectangle if we don't have XInput */ - if (data->xi2_state != xi_enabled && clip->right - clip->left == 1 && clip->bottom - clip->top == 1) + if (clip->right - clip->left == 1 && clip->bottom - clip->top == 1) only_with_xinput = TRUE; + if (only_with_xinput && data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); if (msg_hwnd) DestroyWindow( msg_hwnd ); @@ -480,6 +481,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) else if (hwnd == data->clip_hwnd) /* this is a notification that clipping has been reset */ { data->clip_hwnd = 0; + data->clip_reset = GetTickCount(); disable_xinput2(); DestroyWindow( hwnd ); } @@ -490,12 +492,39 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) GetClipCursor( &clip ); if (clip.left > virtual_screen_rect.left || clip.right < virtual_screen_rect.right || clip.top > virtual_screen_rect.top || clip.bottom < virtual_screen_rect.bottom) - return grab_clipping_window( &clip ); + return grab_clipping_window( &clip, FALSE ); } return 0; } /*********************************************************************** + * clip_fullscreen_window + * + * Turn on clipping if the active window is fullscreen. + */ +BOOL clip_fullscreen_window( HWND hwnd ) +{ + struct x11drv_win_data *data; + RECT rect; + DWORD style; + + if (hwnd == GetDesktopWindow()) return FALSE; + if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(style & WS_VISIBLE)) return FALSE; + if ((style & (WS_POPUP | WS_CHILD)) == WS_CHILD) return FALSE; + /* maximized windows don't count as full screen */ + if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; + if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE; + if (GetTickCount() - x11drv_thread_data()->clip_reset < 1000) return FALSE; + SetRect( &rect, 0, 0, screen_width, screen_height ); + if (!EqualRect( &rect, &virtual_screen_rect )) return FALSE; + if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + TRACE( "win %p clipping fullscreen\n", hwnd ); + return grab_clipping_window( &rect, TRUE ); +} + +/*********************************************************************** * send_mouse_input * * Update the various window states on a mouse event. @@ -540,7 +569,12 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU last_cursor_change = GetTickCount(); } - if (hwnd != GetDesktopWindow()) hwnd = GetAncestor( hwnd, GA_ROOT ); + if (hwnd != GetDesktopWindow()) + { + hwnd = GetAncestor( hwnd, GA_ROOT ); + if ((input->u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN)) && hwnd == GetForegroundWindow()) + clip_fullscreen_window( hwnd ); + } /* update the wine server Z-order */ @@ -1221,25 +1255,31 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (GetWindowThreadProcessId( GetDesktopWindow(), NULL ) == GetCurrentThreadId()) return TRUE; /* don't clip in the desktop process */ - /* we are clipping if the clip rectangle is smaller than the screen */ - if (grab_pointer && (clip->left > virtual_screen_rect.left || - clip->right < virtual_screen_rect.right || - clip->top > virtual_screen_rect.top || - clip->bottom < virtual_screen_rect.bottom)) + if (grab_pointer) { - DWORD tid, pid; HWND foreground = GetForegroundWindow(); - /* forward request to the foreground window if it's in a different thread */ - tid = GetWindowThreadProcessId( foreground, &pid ); - if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) + /* we are clipping if the clip rectangle is smaller than the screen */ + if (clip->left > virtual_screen_rect.left || clip->right < virtual_screen_rect.right || + clip->top > virtual_screen_rect.top || clip->bottom < virtual_screen_rect.bottom) { - TRACE( "forwarding clip request to %p\n", foreground ); - if (SendMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 )) return TRUE; + DWORD tid, pid; + + /* forward request to the foreground window if it's in a different thread */ + tid = GetWindowThreadProcessId( foreground, &pid ); + if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) + { + TRACE( "forwarding clip request to %p\n", foreground ); + if (SendMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 )) return TRUE; + } + else if (grab_clipping_window( clip, FALSE )) return TRUE; + } + else /* if currently clipping, check if we should switch to fullscreen clipping */ + { + struct x11drv_thread_data *data = x11drv_thread_data(); + if (data && data->clip_hwnd && clip_fullscreen_window( foreground )) return TRUE; } - else if (grab_clipping_window( clip )) return TRUE; } - ungrab_clipping_window(); return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8e756b2..b7011da 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -552,6 +552,7 @@ struct x11drv_thread_data Window selection_wnd; /* window used for selection interactions */ Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ + DWORD clip_reset; /* time when clipping was last reset */ HKL kbd_layout; /* active keyboard layout */ enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ }; @@ -844,6 +845,7 @@ extern void sync_window_cursor( Window window ); extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ); extern void ungrab_clipping_window(void); extern void reset_clipping_window(void); +extern BOOL clip_fullscreen_window( HWND hwnd ); extern void X11DRV_InitKeyboard( Display *display ); extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags );

1 0