winex11: Also catch X errors from XF86VidModeSetGammaRamp().

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winex11: Also catch X errors from XF86VidModeSetGammaRamp().
81f8b6e8 · Alexandre Julliard · 5b62f89b · 81f8b6e8
Commit 81f8b6e8 authored Oct 29, 2019 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

xvidmode.c dlls/winex11.drv/xvidmode.c +4 -0

No files found.
--- a/dlls/winex11.drv/xvidmode.c
+++ b/dlls/winex11.drv/xvidmode.c
@@ -416,8 +416,12 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp)
                               ramp->red, ramp->green, ramp->blue, GAMMA_RAMP_SIZE);
    }

+    X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL);
    ret = pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display),
                                   xf86vm_gammaramp_size, red, green, blue);
+    if (ret) XSync( gdi_display, FALSE );
+    if (X11DRV_check_error()) ret = FALSE;
+
    if (red != ramp->red)
        heap_free(red);
    return ret;