winex11: Move X11 display failure MESSAGE to winediag.

This commit is contained in:
Roderick Colenbrander 2009-12-08 13:11:20 +01:00 committed by Alexandre Julliard
parent 850c6347e2
commit 662653c8ff

View File

@ -56,6 +56,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
WINE_DECLARE_DEBUG_CHANNEL(synchronous); WINE_DECLARE_DEBUG_CHANNEL(synchronous);
WINE_DECLARE_DEBUG_CHANNEL(winediag);
static CRITICAL_SECTION X11DRV_CritSection; static CRITICAL_SECTION X11DRV_CritSection;
static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION_DEBUG critsect_debug =
@ -643,8 +644,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
if (!(data->display = XOpenDisplay(NULL))) if (!(data->display = XOpenDisplay(NULL)))
{ {
wine_tsx11_unlock(); wine_tsx11_unlock();
MESSAGE( "x11drv: Can't open display: %s\n", XDisplayName(NULL) ); ERR_(winediag)( "x11drv: Can't open display: %s. Please ensure that your X server is running and that $DISPLAY is set correctly.\n", XDisplayName(NULL));
MESSAGE( "Please ensure that your X server is running and that $DISPLAY is set correctly.\n" );
ExitProcess(1); ExitProcess(1);
} }