January 2008 - Wine-Commits

Alexandre Julliard : winex11: Catch DIB memory accesses that touch the last page beyond the DIB bits end .
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: a7cdf6e110e8d5caaafd59e4f8eba117fbc3cd12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7cdf6e110e8d5caaafd59e4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 10:21:17 2008 +0100 winex11: Catch DIB memory accesses that touch the last page beyond the DIB bits end. --- dlls/winex11.drv/dib.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index fc71c24..a95783e 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include <X11/Xlib.h> #ifdef HAVE_LIBXXSHM @@ -4302,6 +4303,7 @@ static LONG CALLBACK X11DRV_DIB_FaultHandler( PEXCEPTION_POINTERS ep ) BOOL found = FALSE; BYTE *addr; struct list *ptr; + const size_t pagemask = getpagesize() - 1; if (ep->ExceptionRecord->ExceptionCode != EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_CONTINUE_SEARCH; @@ -4312,7 +4314,8 @@ static LONG CALLBACK X11DRV_DIB_FaultHandler( PEXCEPTION_POINTERS ep ) LIST_FOR_EACH( ptr, &dibs_list ) { physBitmap = LIST_ENTRY( ptr, X_PHYSBITMAP, entry ); - if ((physBitmap->base <= addr) && (addr < physBitmap->base + physBitmap->size)) + if ((physBitmap->base <= addr) && + (addr < physBitmap->base + ((physBitmap->size + pagemask) & ~pagemask))) { found = TRUE; break; @@ -4322,6 +4325,9 @@ static LONG CALLBACK X11DRV_DIB_FaultHandler( PEXCEPTION_POINTERS ep ) if (!found) return EXCEPTION_CONTINUE_SEARCH; + if (addr >= physBitmap->base + physBitmap->size) + WARN( "%p: access to %p beyond the end of the DIB\n", physBitmap->hbitmap, addr ); + X11DRV_DIB_Lock( physBitmap, DIB_Status_None ); if (ep->ExceptionRecord->ExceptionInformation[0] == EXCEPTION_WRITE_FAULT) { /* the app tried to write the DIB bits */

1 0

Alexandre Julliard : winex11: Check for need to make window managed when WS_VISIBLE is set outside of SetWindowPos .
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: 8913182b89d542633678d1c3abcfe00e28be8e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8913182b89d542633678d1c3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 10:21:07 2008 +0100 winex11: Check for need to make window managed when WS_VISIBLE is set outside of SetWindowPos. --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/window.c | 2 ++ dlls/winex11.drv/winpos.c | 10 +++++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 23a6675..96d050a 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -108,6 +108,7 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { root_window = win; + managed_mode = 0; /* no managed windows in desktop mode */ max_width = screen_width; max_height = screen_height; xinerama_init( width, height ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c21836d..2177e10 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -79,6 +79,8 @@ BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rect ) { DWORD style, ex_style; + if (!managed_mode) return FALSE; + /* child windows are not managed */ style = GetWindowLongW( hwnd, GWL_STYLE ); if ((style & (WS_CHILD|WS_POPUP)) == WS_CHILD) return FALSE; diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e5d16ee..13b73f3 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -148,6 +148,12 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) X11DRV_set_wm_hints( display, data ); if (!data->mapped) { + if (!data->managed && is_window_managed( hwnd, SWP_NOACTIVATE, &data->window_rect )) + { + TRACE( "making win %p/%lx managed\n", hwnd, data->whole_window ); + data->managed = TRUE; + SetPropA( hwnd, managed_prop, (HANDLE)1 ); + } TRACE( "mapping win %p\n", hwnd ); X11DRV_sync_window_style( display, data ); wine_tsx11_lock(); @@ -368,9 +374,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, } /* check if we need to switch the window to managed */ - if (!data->managed && data->whole_window && managed_mode && - root_window == DefaultRootWindow( display ) && - is_window_managed( hwnd, swp_flags, rectWindow )) + if (!data->managed && data->whole_window && is_window_managed( hwnd, swp_flags, rectWindow )) { TRACE( "making win %p/%lx managed\n", hwnd, data->whole_window ); data->managed = TRUE;

1 0

Alexandre Julliard : winex11: Create the window data structure lazily, once the window is made visible.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: 026974f5be4c71a275117388b94cd7e94a95a4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=026974f5be4c71a275117388b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 10:20:51 2008 +0100 winex11: Create the window data structure lazily, once the window is made visible. --- dlls/winex11.drv/window.c | 66 ++++++++++++++++++++++++++++++-------------- dlls/winex11.drv/winpos.c | 17 ++++++++--- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 58 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 73f9659..c21836d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -312,7 +312,8 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) HWND next_hwnd; int w, h; - if (!(data = X11DRV_get_win_data(hwnd))) return FALSE; + if (!(data = X11DRV_get_win_data(hwnd)) && + !(data = X11DRV_create_win_data(hwnd))) return FALSE; wine_tsx11_lock(); @@ -651,7 +652,8 @@ void X11DRV_make_systray_window( HWND hwnd ) struct x11drv_win_data *data; Window systray_window; - if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!(data = X11DRV_get_win_data( hwnd )) && + !(data = X11DRV_create_win_data( hwnd ))) return; wine_tsx11_lock(); if (!systray_atom) @@ -1315,26 +1317,10 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) BOOL ret = FALSE; INT cx = cs->cx, cy = cs->cy; - if (hwnd == GetDesktopWindow()) + if (hwnd == GetDesktopWindow() && root_window != DefaultRootWindow( display )) { - if (root_window != DefaultRootWindow( display )) - { - if (!create_desktop_win_data( display, hwnd )) return FALSE; - } - } - else - { - struct x11drv_win_data *data; - - if (!(data = alloc_win_data( display, hwnd ))) return FALSE; - - /* create an X window if it's a top level window */ - if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) - { - if (!create_whole_window( display, data )) goto failed; - } - /* get class or window DC if needed */ - alloc_window_dce( data ); + /* the desktop win data can't be created lazily */ + if (!create_desktop_win_data( display, hwnd )) return FALSE; } /* Call the WH_CBT hook */ @@ -1467,6 +1453,44 @@ struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) /*********************************************************************** + * X11DRV_create_win_data + * + * Create an X11 data window structure for an existing window. + */ +struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ) +{ + Display *display = thread_display(); + struct x11drv_win_data *data; + HWND parent; + + if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL; /* desktop */ + if (!(data = alloc_win_data( display, hwnd ))) return NULL; + + GetWindowRect( hwnd, &data->window_rect ); + MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); + data->whole_rect = data->window_rect; + GetClientRect( hwnd, &data->client_rect ); + MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 ); + + if (parent == GetDesktopWindow()) + { + if (!create_whole_window( display, data )) + { + HeapFree( GetProcessHeap(), 0, data ); + return NULL; + } + TRACE( "win %p/%lx window %s whole %s client %s\n", + hwnd, data->whole_window, wine_dbgstr_rect( &data->window_rect ), + wine_dbgstr_rect( &data->whole_rect ), wine_dbgstr_rect( &data->client_rect )); + } + + /* get class or window DC if needed */ + alloc_window_dce( data ); + return data; +} + + +/*********************************************************************** * X11DRV_get_whole_window * * Return the X window associated with the full area of a window diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 1489ebe..e5d16ee 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -134,13 +134,14 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) DWORD new_style, changed; if (hwnd == GetDesktopWindow()) return; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - new_style = GetWindowLongW( hwnd, GWL_STYLE ); changed = new_style ^ old_style; if (changed & WS_VISIBLE) { + if (!(data = X11DRV_get_win_data( hwnd )) && + !(data = X11DRV_create_win_data( hwnd ))) return; + if (data->whole_window && (new_style & WS_VISIBLE) && X11DRV_is_window_rect_mapped( &data->window_rect )) { @@ -161,7 +162,8 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) if (changed & WS_DISABLED) { - if (data->whole_window && data->wm_hints) + data = X11DRV_get_win_data( hwnd ); + if (data && data->wm_hints) { wine_tsx11_lock(); data->wm_hints->input = !(new_style & WS_DISABLED); @@ -357,7 +359,13 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, valid_rects, &visible_rect )) return FALSE; - if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; + new_style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(data = X11DRV_get_win_data( hwnd ))) + { + /* create the win data if the window is being made visible */ + if (!(new_style & WS_VISIBLE)) return TRUE; + if (!(data = X11DRV_create_win_data( hwnd ))) return FALSE; + } /* check if we need to switch the window to managed */ if (!data->managed && data->whole_window && managed_mode && @@ -376,7 +384,6 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, } } - new_style = GetWindowLongW( hwnd, GWL_STYLE ); old_window_rect = data->window_rect; old_whole_rect = data->whole_rect; old_client_rect = data->client_rect; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5bcd76a..71ea670 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -682,6 +682,7 @@ struct x11drv_win_data }; extern struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ); +extern struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ); extern Window X11DRV_get_whole_window( HWND hwnd ); extern XID X11DRV_get_fbconfig_id( HWND hwnd ); extern Drawable X11DRV_get_gl_drawable( HWND hwnd );

1 0

Alexandre Julliard : comctl32: Tooltips should be top-most windows.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: e85f7ed79ea6e74674d92136a0cbb084aafd133f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85f7ed79ea6e74674d92136a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 21:42:33 2008 +0100 comctl32: Tooltips should be top-most windows. --- dlls/comctl32/tooltips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index f976ce9..7661ffa 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -752,7 +752,7 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr, BOOL track_activate) * it is no longer needed */ } - SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top, + SetWindowPos (hwnd, HWND_TOPMOST, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_SHOWWINDOW | SWP_NOACTIVATE);

1 0

Alexandre Julliard : winex11: Don' t create a win_data structure for the root window in non-desktop mode.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: b6cc7f9bccb77eae43a598c67ba7fd67e251081d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cc7f9bccb77eae43a598c67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 10:20:11 2008 +0100 winex11: Don't create a win_data structure for the root window in non-desktop mode. --- dlls/winex11.drv/window.c | 71 ++++++++++++++++++++------------------------ dlls/winex11.drv/winpos.c | 11 +------ 2 files changed, 34 insertions(+), 48 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index da6efab..73f9659 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -875,7 +875,6 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) if (data->hwnd == GetDesktopWindow()) { - if (data->whole_window == DefaultRootWindow(display)) return; /* force some styles for the desktop to get the correct decorations */ style |= WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; owner = 0; @@ -947,7 +946,7 @@ void X11DRV_set_iconic_state( HWND hwnd ) BOOL iconic = (style & WS_MINIMIZE) != 0; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->whole_window || data->whole_window == DefaultRootWindow(display)) return; + if (!data->whole_window) return; GetWindowRect( hwnd, &rect ); @@ -1155,8 +1154,7 @@ static void destroy_whole_window( Display *display, struct x11drv_win_data *data if (thread_data->cursor_window == data->whole_window) thread_data->cursor_window = None; wine_tsx11_lock(); XDeleteContext( display, data->whole_window, winContext ); - if (data->whole_window != DefaultRootWindow(display)) - XDestroyWindow( display, data->whole_window ); + XDestroyWindow( display, data->whole_window ); data->whole_window = 0; if (data->xic) { @@ -1242,22 +1240,22 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) /* initialize the desktop window id in the desktop manager process */ -static void get_desktop_xwin( Display *display, struct x11drv_win_data *data ) +static struct x11drv_win_data *create_desktop_win_data( Display *display, HWND hwnd ) { - data->whole_window = root_window; - if (root_window != DefaultRootWindow( display )) - { - VisualID visualid; + struct x11drv_win_data *data; + VisualID visualid; - wine_tsx11_lock(); - visualid = XVisualIDFromVisual(visual); - wine_tsx11_unlock(); - data->managed = TRUE; - SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); - SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); - SetPropA( data->hwnd, visual_id_prop, (HANDLE)visualid ); - set_initial_wm_hints( display, data ); - } + if (!(data = alloc_win_data( display, hwnd ))) return NULL; + wine_tsx11_lock(); + visualid = XVisualIDFromVisual(visual); + wine_tsx11_unlock(); + data->whole_window = root_window; + data->managed = TRUE; + SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); + SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); + SetPropA( data->hwnd, visual_id_prop, (HANDLE)visualid ); + set_initial_wm_hints( display, data ); + return data; } /********************************************************************** @@ -1309,7 +1307,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) { Display *display = thread_display(); WND *wndPtr; - struct x11drv_win_data *data; HWND insert_after; RECT rect; DWORD style; @@ -1318,21 +1315,28 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) BOOL ret = FALSE; INT cx = cs->cx, cy = cs->cy; - if (!(data = alloc_win_data( display, hwnd ))) return FALSE; - - if (hwnd == GetDesktopWindow()) get_desktop_xwin( display, data ); + if (hwnd == GetDesktopWindow()) + { + if (root_window != DefaultRootWindow( display )) + { + if (!create_desktop_win_data( display, hwnd )) return FALSE; + } + } else { + struct x11drv_win_data *data; + + if (!(data = alloc_win_data( display, hwnd ))) return FALSE; + /* create an X window if it's a top level window */ if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) { if (!create_whole_window( display, data )) goto failed; } + /* get class or window DC if needed */ + alloc_window_dce( data ); } - /* get class or window DC if needed */ - alloc_window_dce( data ); - /* Call the WH_CBT hook */ /* the window style passed to the hook must be the real window style, @@ -1379,11 +1383,11 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) } /* make sure the window is still valid */ - if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; - if (data->whole_window) X11DRV_sync_window_style( display, data ); + if (!(wndPtr = WIN_GetPtr(hwnd))) return FALSE; /* send WM_NCCALCSIZE */ - rect = data->window_rect; + rect = wndPtr->rectWindow; + WIN_ReleasePtr( wndPtr ); SendMessageW( hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&rect ); if (!(wndPtr = WIN_GetPtr(hwnd))) return FALSE; @@ -1393,17 +1397,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) X11DRV_SetWindowPos( hwnd, insert_after, &wndPtr->rectWindow, &rect, SWP_NOACTIVATE, NULL ); - TRACE( "win %p window %d,%d,%d,%d client %d,%d,%d,%d whole %d,%d,%d,%d X client %d,%d,%d,%d xwin %x\n", - hwnd, wndPtr->rectWindow.left, wndPtr->rectWindow.top, - wndPtr->rectWindow.right, wndPtr->rectWindow.bottom, - wndPtr->rectClient.left, wndPtr->rectClient.top, - wndPtr->rectClient.right, wndPtr->rectClient.bottom, - data->whole_rect.left, data->whole_rect.top, - data->whole_rect.right, data->whole_rect.bottom, - data->client_rect.left, data->client_rect.top, - data->client_rect.right, data->client_rect.bottom, - (unsigned int)data->whole_window ); - WIN_ReleasePtr( wndPtr ); if (unicode) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 08baa65..1489ebe 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -353,17 +353,11 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, RECT old_window_rect, old_whole_rect, old_client_rect, visible_rect; DWORD new_style; - if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; - if (!set_server_window_pos( hwnd, insert_after, rectWindow, rectClient, swp_flags, valid_rects, &visible_rect )) return FALSE; - if (data->whole_window == DefaultRootWindow(gdi_display)) - { - data->whole_rect = data->client_rect = data->window_rect = *rectWindow; - return TRUE; - } + if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; /* check if we need to switch the window to managed */ if (!data->managed && data->whole_window && managed_mode && @@ -933,7 +927,6 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam void X11DRV_resize_desktop( unsigned int width, unsigned int height ) { HWND hwnd = GetDesktopWindow(); - struct x11drv_win_data *data; struct desktop_resize_data resize_data; SetRect( &resize_data.old_screen_rect, 0, 0, screen_width, screen_height ); @@ -941,7 +934,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) xinerama_init( width, height ); - if (!(data = X11DRV_get_win_data( hwnd ))) + if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) { SendMessageW( hwnd, WM_X11DRV_RESIZE_DESKTOP, 0, MAKELPARAM( width, height ) ); }

1 0

Alexandre Julliard : user32: Menus should be top-most windows.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: 4a753f90cf61be5ed6d93d336b1ace01e9ca75b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a753f90cf61be5ed6d93d336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 21:42:46 2008 +0100 user32: Menus should be top-most windows. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index cb60ffc..99c4933 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1834,7 +1834,7 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, /* Display the window */ - SetWindowPos( menu->hWnd, HWND_TOP, 0, 0, 0, 0, + SetWindowPos( menu->hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE ); UpdateWindow( menu->hWnd ); return TRUE;

1 0

Alexandre Julliard : winex11: Export a function to dock a window into the system tray, and get rid of the WS_EX_TRAYWINDOW style.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: cbdf1294e6474ae5254a2fe9cb900b08a89b8b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbdf1294e6474ae5254a2fe9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 21:40:45 2008 +0100 winex11: Export a function to dock a window into the system tray, and get rid of the WS_EX_TRAYWINDOW style. --- dlls/winex11.drv/window.c | 18 +++++++----------- dlls/winex11.drv/winex11.drv.spec | 3 +++ include/winuser.h | 3 --- programs/explorer/systray.c | 8 +++++++- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1715b0c..da6efab 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -79,9 +79,6 @@ BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rect ) { DWORD style, ex_style; - /* tray window is always managed */ - ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); - if (ex_style & WS_EX_TRAYWINDOW) return TRUE; /* child windows are not managed */ style = GetWindowLongW( hwnd, GWL_STYLE ); if ((style & (WS_CHILD|WS_POPUP)) == WS_CHILD) return FALSE; @@ -91,6 +88,7 @@ BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rect ) /* windows with caption are managed */ if ((style & WS_CAPTION) == WS_CAPTION) return TRUE; /* tool windows are not managed */ + ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOOLWINDOW) return FALSE; /* windows with thick frame are managed */ if (style & WS_THICKFRAME) return TRUE; @@ -642,15 +640,19 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICO } /*********************************************************************** - * systray_dock_window + * wine_make_systray_window (X11DRV.@) * * Docks the given X window with the NETWM system tray. */ -static void systray_dock_window( Display *display, struct x11drv_win_data *data ) +void X11DRV_make_systray_window( HWND hwnd ) { static Atom systray_atom; + Display *display = thread_display(); + struct x11drv_win_data *data; Window systray_window; + if (!(data = X11DRV_get_win_data( hwnd ))) return; + wine_tsx11_lock(); if (!systray_atom) { @@ -1449,12 +1451,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) newPos.right, newPos.bottom, swFlag ); } - /* Dock system tray windows. */ - /* Dock after the window is created so we don't have problems calling - * SetWindowPos. */ - if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_TRAYWINDOW) - systray_dock_window( display, data ); - return TRUE; failed: diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 87db841..7fbdfff 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -128,6 +128,9 @@ # Desktop @ cdecl wine_create_desktop(long long) X11DRV_create_desktop +# System tray +@ cdecl wine_make_systray_window(long) X11DRV_make_systray_window + # XIM @ cdecl ForceXIMReset(long) X11DRV_ForceXIMReset diff --git a/include/winuser.h b/include/winuser.h index 3a6a42c..aec4a83 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3217,9 +3217,6 @@ typedef struct tagMINIMIZEDMETRICS { #define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE|WS_EX_CLIENTEDGE) #define WS_EX_PALETTEWINDOW (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW|WS_EX_TOPMOST) -/* WINE internal... */ -#define WS_EX_TRAYWINDOW 0x80000000L - #endif /* NOWINSTYLES */ /* Window scrolling */ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index a5535ff..06347d4 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -220,6 +220,7 @@ static void modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) static void add_icon(NOTIFYICONDATAW *nid) { + HMODULE x11drv = GetModuleHandleA( "winex11.drv" ); RECT rect; struct icon *icon; static const WCHAR adaptor_windowname[] = /* Wine System Tray Adaptor */ {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',' ','A','d','a','p','t','o','r',0}; @@ -250,13 +251,18 @@ static void add_icon(NOTIFYICONDATAW *nid) AdjustWindowRect(&rect, WS_CLIPSIBLINGS | WS_CAPTION, FALSE); /* create the adaptor window */ - icon->window = CreateWindowEx(WS_EX_TRAYWINDOW, adaptor_classname, + icon->window = CreateWindowEx(0, adaptor_classname, adaptor_windowname, WS_CLIPSIBLINGS | WS_CAPTION, CW_USEDEFAULT, CW_USEDEFAULT, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, NULL, icon); + if (x11drv) + { + void (*make_systray_window)(HWND) = (void *)GetProcAddress( x11drv, "wine_make_systray_window" ); + if (make_systray_window) make_systray_window( icon->window ); + } if (!hide_systray) ShowWindow(icon->window, SW_SHOWNA);

1 0

Alexandre Julliard : winex11: Remove obsolete code to set Z-order for child windows.
by Alexandre Julliard Jan. 24, 2008

Jan. 24, 2008

Module: wine Branch: master Commit: d147e02087d03e0c87e7cc995ab9af932b44874d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d147e02087d03e0c87e7cc995… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 21:39:32 2008 +0100 winex11: Remove obsolete code to set Z-order for child windows. --- dlls/winex11.drv/window.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index c52d13a..1715b0c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1086,7 +1086,7 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data * * Create the whole X window for a given window */ -static Window create_whole_window( Display *display, struct x11drv_win_data *data, DWORD style ) +static Window create_whole_window( Display *display, struct x11drv_win_data *data ) { int cx, cy, mask; XSetWindowAttributes attr; @@ -1114,14 +1114,6 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat return 0; } XSaveContext( display, data->whole_window, winContext, (char *)data->hwnd ); - - /* non-maximized child must be at bottom of Z order */ - if ((style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) - { - XWindowChanges changes; - changes.stack_mode = Below; - XConfigureWindow( display, data->whole_window, CWStackMode, &changes ); - } wine_tsx11_unlock(); xim = x11drv_thread_data()->xim; @@ -1332,7 +1324,7 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) /* create an X window if it's a top level window */ if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) { - if (!create_whole_window( display, data, cs->style )) goto failed; + if (!create_whole_window( display, data )) goto failed; } } @@ -1586,7 +1578,7 @@ void X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) else /* new top level window */ { /* FIXME: we ignore errors since we can't really recover anyway */ - create_whole_window( display, data, GetWindowLongW( hwnd, GWL_STYLE ) ); + create_whole_window( display, data ); } }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: d0794c4aeb0be5f14ccd5394e004389a8ca485bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0794c4aeb0be5f14ccd5394e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 23 15:16:30 2008 +0100 Assorted spelling fixes. --- dlls/cabinet/fci.c | 2 +- dlls/crypt32/tests/encode.c | 2 +- dlls/ddraw/tests/d3d.c | 2 +- dlls/ddraw/viewport.c | 2 +- dlls/gdi32/printdrv.c | 2 +- dlls/kernel32/tests/drive.c | 2 +- dlls/kernel32/tests/resource.c | 12 ++++++------ dlls/msxml3/domimpl.c | 2 +- dlls/twain_32/README | 2 +- dlls/winealsa.drv/midi.c | 2 +- dlls/winecoreaudio.drv/midi.c | 2 +- dlls/wined3d/basetexture.c | 6 +++--- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 2 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/vertexbuffer.c | 2 +- dlls/wineoss.drv/midi.c | 2 +- tools/widl/typelib_struct.h | 2 +- tools/wrc/parser.y | 2 +- 21 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0794c4aeb0be5f14ccd5…

1 0

Rob Shearman : credui: The list should be the first parameter to the list_add_tail function.
by Alexandre Julliard Jan. 23, 2008

Jan. 23, 2008

Module: wine Branch: master Commit: 9a032584f79e3f9daddd4029c08a64d856aba240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a032584f79e3f9daddd4029c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 23 16:33:08 2008 +0000 credui: The list should be the first parameter to the list_add_tail function. --- dlls/credui/credui_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 43ab2d6..342e701 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -631,11 +631,10 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, if (!found) { entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); - list_init(&entry->entry); len = strlenW(pszTargetName); entry->pszTargetName = HeapAlloc(GetProcessHeap(), 0, (len + 1)*sizeof(WCHAR)); memcpy(entry->pszTargetName, pszTargetName, (len + 1)*sizeof(WCHAR)); - list_add_tail(&entry->entry, &pending_credentials_list); + list_add_tail(&pending_credentials_list, &entry->entry); } len = strlenW(params.pszUsername);

1 0