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

winex11: Simplify X11DRV_XRandR_Init() error handling a bit.

This commit is contained in:
Henri Verbeet 2012-07-11 17:35:44 +02:00 committed by Alexandre Julliard
parent 7b32809890
commit 5ed890904b
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/winex11.drv/xrandr.c
View File

@ -277,18 +277,15 @@ void X11DRV_XRandR_Init(void)
/* see if Xrandr is available */
wine_tsx11_lock();
ok = pXRRQueryExtension(gdi_display, &xrandr_event, &xrandr_error);
if (ok)
{
X11DRV_expect_error(gdi_display, XRandRErrorHandler, NULL);
ok = pXRRQueryVersion(gdi_display, &xrandr_major, &xrandr_minor);
if (X11DRV_check_error()) ok = FALSE;
}
if (ok)
{
TRACE("Found XRandR - major: %d, minor: %d\n", xrandr_major, xrandr_minor);
xrandr_init_modes();
}
if (!pXRRQueryExtension( gdi_display, &xrandr_event, &xrandr_error )) goto done;
X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL );
ok = pXRRQueryVersion( gdi_display, &xrandr_major, &xrandr_minor );
if (X11DRV_check_error() || !ok) goto done;
TRACE("Found XRandR %d.%d.\n", xrandr_major, xrandr_minor);
xrandr_init_modes();
done:
wine_tsx11_unlock();
}