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

winex11.drv: Fix explorer regression caused by systray patch 

Move systray_dock_window call to X11DRV_CreateWindow so that it can
safely call SetWindowPos without having _CheckNotSysLevel crash the
explorer.
This commit is contained in:
James Liggett 2006-08-23 13:35:02 -07:00 committed by Alexandre Julliard
parent bbd05a4644
commit 8a75f3bb79
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,10 +515,6 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data )
/* size hints */
set_size_hints( display, data, style );
/* Dock system tray windows. */
if (ex_style & WS_EX_TRAYWINDOW)
systray_dock_window( display, data );
/* set the WM_CLIENT_MACHINE and WM_LOCALE_NAME properties */
XSetWMProperties(display, data->whole_window, NULL, NULL, NULL, 0, NULL, NULL, NULL);
@ -1168,6 +1164,12 @@ 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: