Henri Verbeet : winex11: Simplify X11DRV_XRandR_Init() error handling a bit .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5ed890904b7d890bfa1682dff465758d10a7ef96
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5ed890904b7d890bfa1682dff4...

Author: Henri Verbeet 
Date:   Wed Jul 11 17:35:44 2012 +0200

winex11: Simplify X11DRV_XRandR_Init() error handling a bit.

---

dlls/winex11.drv/xrandr.c |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c
index 53d16c9..ccb004f 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -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();
 }