ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Make sure that the owner window exists when setting the transient for attribute.

This commit is contained in:
Alexandre Julliard 2010-02-23 12:33:01 +01:00
parent 1571337c03
commit 7b3a00c09e
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/winex11.drv/window.c
View File

@ -965,6 +965,26 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data
}
/***********************************************************************
* get_owner_whole_window
*
* Retrieve an owner's window, creating it if necessary.
*/
static Window get_owner_whole_window( HWND owner )
{
struct x11drv_win_data *data;
if (!owner) return 0;
if (!(data = X11DRV_get_win_data( owner )))
{
if (!(data = X11DRV_create_win_data( owner )))
return (Window)GetPropA( owner, whole_window_prop );
}
return data->whole_window;
}
/***********************************************************************
* set_wm_hints
*
@ -972,7 +992,8 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data
*/
static void set_wm_hints( Display *display, struct x11drv_win_data *data )
{
Window group_leader;
Window group_leader = data->whole_window;
Window owner_win = 0;
Atom window_type;
MwmHints mwm_hints;
DWORD style, ex_style;
@ -990,21 +1011,13 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data )
style = GetWindowLongW( data->hwnd, GWL_STYLE );
ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE );
owner = get_window_owner( data->hwnd );
if ((owner_win = get_owner_whole_window( owner ))) group_leader = owner_win;
}
/* transient for hint */
if (owner)
{
Window owner_win = X11DRV_get_whole_window( owner );
wine_tsx11_lock();
XSetTransientForHint( display, data->whole_window, owner_win );
wine_tsx11_unlock();
group_leader = owner_win;
}
else group_leader = data->whole_window;
wine_tsx11_lock();
if (owner_win) XSetTransientForHint( display, data->whole_window, owner_win );
/* size hints */
set_size_hints( display, data, style );