[PATCH 1/2] winex11: Simplify X11DRV_XRandR_Init() error handling a bit.
Henri Verbeet
hverbeet at codeweavers.com
Wed Jul 11 10:35:44 CDT 2012
This supersedes patch 88050.
---
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 f818a61..3e2e659 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -276,18 +276,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();
}
--
1.7.8.6
More information about the wine-patches
mailing list