From 3035a61ea50853918320538e230b61beaa5d3e9d Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 22 Oct 2012 08:57:03 +0100 Subject: [PATCH 2/2] XVidMode: Use the errorValue to report the failing test --- hw/xfree86/common/xf86vmode.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/common/xf86vmode.c b/hw/xfree86/common/xf86vmode.c index 08ef4cd..77fe0fb 100644 --- a/hw/xfree86/common/xf86vmode.c +++ b/hw/xfree86/common/xf86vmode.c @@ -1132,16 +1132,20 @@ ProcXF86VidModeSwitchToMode(ClientPtr client) if (len != stuff->privsize) return BadLength; - if (stuff->screen >= screenInfo.numScreens) + if (stuff->screen >= screenInfo.numScreens) { + client->errorValue = __LINE__; return BadValue; + } if (VidModeGetCurrentModeline(stuff->screen, &mode, &dotClock) && VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock && MODEMATCH(mode, stuff)) return Success; - if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock)) + if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock)) { + client->errorValue = __LINE__; return BadValue; + } do { if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { @@ -1163,8 +1167,10 @@ ProcXF86VidModeSwitchToMode(ClientPtr client) if ((VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock) && MODEMATCH(mode, stuff)) { - if (!VidModeSwitchMode(stuff->screen, mode)) + if (!VidModeSwitchMode(stuff->screen, mode)) { + client->errorValue = __LINE__; return BadValue; + } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) ErrorF("SwitchToMode - Succeeded\n"); @@ -1172,6 +1178,7 @@ ProcXF86VidModeSwitchToMode(ClientPtr client) } } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock)); + client->errorValue = __LINE__; return BadValue; } -- 1.7.10.4