Alexandre Julliard : winex11: Make sure that the owner window exists when setting the transient for attribute .
Alexandre Julliard
julliard at winehq.org
Tue Feb 23 11:17:24 CST 2010
Module: wine
Branch: master
Commit: 7b3a00c09ece0031d2fddd0d3e79c7187f95700e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3a00c09ece0031d2fddd0d3e79c7187f95700e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Feb 23 12:33:01 2010 +0100
winex11: Make sure that the owner window exists when setting the transient for attribute.
---
dlls/winex11.drv/window.c | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 1f40eba..fdaa012 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -966,13 +966,34 @@ 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
*
* Set the window manager hints for a newly-created window
*/
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 );
More information about the wine-cvs
mailing list