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

winex11: Add error checks around every XF86VidMode call.

This commit is contained in:
Alexandre Julliard 2011-10-24 11:19:28 +02:00
parent a3a1f4e3fb
commit 36420d2286
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,19 +203,20 @@ void X11DRV_XF86VM_Init(void)
/* see if XVidMode is available */ /* see if XVidMode is available */
wine_tsx11_lock(); wine_tsx11_lock();
ok = pXF86VidModeQueryExtension(gdi_display, &xf86vm_event, &xf86vm_error); ok = pXF86VidModeQueryExtension(gdi_display, &xf86vm_event, &xf86vm_error);
if (ok) wine_tsx11_unlock();
{ if (!ok) return;
X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL);
ok = pXF86VidModeQueryVersion(gdi_display, &xf86vm_major, &xf86vm_minor); ok = pXF86VidModeQueryVersion(gdi_display, &xf86vm_major, &xf86vm_minor);
if (X11DRV_check_error()) ok = FALSE; if (X11DRV_check_error() || !ok) return;
}
if (ok)
{
#ifdef X_XF86VidModeSetGammaRamp #ifdef X_XF86VidModeSetGammaRamp
if (xf86vm_major > 2 || (xf86vm_major == 2 && xf86vm_minor >= 1)) if (xf86vm_major > 2 || (xf86vm_major == 2 && xf86vm_minor >= 1))
{ {
X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL);
pXF86VidModeGetGammaRampSize(gdi_display, DefaultScreen(gdi_display), pXF86VidModeGetGammaRampSize(gdi_display, DefaultScreen(gdi_display),
&xf86vm_gammaramp_size); &xf86vm_gammaramp_size);
if (X11DRV_check_error()) xf86vm_gammaramp_size = 0;
if (xf86vm_gammaramp_size == 256) if (xf86vm_gammaramp_size == 256)
xf86vm_use_gammaramp = TRUE; xf86vm_use_gammaramp = TRUE;
} }
@ -223,12 +224,12 @@ void X11DRV_XF86VM_Init(void)
/* retrieve modes */ /* retrieve modes */
if (usexvidmode && root_window == DefaultRootWindow( gdi_display )) if (usexvidmode && root_window == DefaultRootWindow( gdi_display ))
{
X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL);
ok = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes); ok = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes);
else if (X11DRV_check_error() || !ok) return;
ok = FALSE; /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */
} }
wine_tsx11_unlock(); else return; /* In desktop mode, do not switch resolution... But still use the Gamma ramp stuff */
if (!ok) return;
TRACE("XVidMode modes: count=%d\n", nmodes); TRACE("XVidMode modes: count=%d\n", nmodes);