From c7d1319872e0ae0b7d945e9af8c4027ee5aa2055 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 9 Nov 2009 11:12:22 -0500 Subject: [PATCH] randr: Fill in errorValue when verifying outputs/crtcs/modes Signed-off-by: Adam Jackson Signed-off-by: Keith Packard --- randr/randrstr.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/randr/randrstr.h b/randr/randrstr.h index af1437404..975fe3396 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -344,24 +344,30 @@ extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType; {\ int rc = dixLookupResourceByType((pointer *)&(ptr), id,\ RROutputType, client, a);\ - if (rc != Success)\ + if (rc != Success) {\ + client->errorValue = id;\ return (rc == BadValue) ? RRErrorBase + BadRROutput : rc;\ + }\ } #define VERIFY_RR_CRTC(id, ptr, a)\ {\ int rc = dixLookupResourceByType((pointer *)&(ptr), id,\ RRCrtcType, client, a);\ - if (rc != Success)\ + if (rc != Success) {\ + client->errorValue = id;\ return (rc == BadValue) ? RRErrorBase + BadRRCrtc : rc;\ + }\ } #define VERIFY_RR_MODE(id, ptr, a)\ {\ int rc = dixLookupResourceByType((pointer *)&(ptr), id,\ RRModeType, client, a);\ - if (rc != Success)\ + if (rc != Success) {\ + client->errorValue = id;\ return (rc == BadValue) ? RRErrorBase + BadRRMode : rc;\ + }\ } #define GetRRClient(pClient) ((RRClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RRClientPrivateKey))