diff options
author | Tobias Droste <tdroste@gmx.de> | 2010-09-29 22:51:48 +0200 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-09-29 14:41:53 -0700 |
commit | c7e4222c9a27094ce4fc2831ac92acbb7b21fb1a (patch) | |
tree | ac0596aaff9921f3567e47f6df1d0832031b55ba /randr/rroutput.c | |
parent | 72a9c686d7ecaa68d27687b316dbba92902809b4 (diff) |
randr: set error numbers of resource types in RRExtenstionInit() (V2)
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30367
Currently the ddx calls xf86RandR12Init()
(-> RRScreenInit()
-> RRInit()
-> RRModeInit()
-> RRCrtcInit()
-> RROutputInit())
before RRExtensionInit() is called. This causes RRErrorBase
being 0 while setting resource type error values (resource types:
RROutput, RRMode and RRCrtc). The fix moves the setting of error
values to own functions which are called in RRExtensionInit()
to get the right RRErrorBase.
V2: With header file
Signed-off-by: Tobias Droste <tdroste@gmx.de>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'randr/rroutput.c')
-rw-r--r-- | randr/rroutput.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/randr/rroutput.c b/randr/rroutput.c index 937b14df0..5edeb7dd2 100644 --- a/randr/rroutput.c +++ b/randr/rroutput.c @@ -418,10 +418,19 @@ RROutputInit (void) RROutputType = CreateNewResourceType (RROutputDestroyResource, "OUTPUT"); if (!RROutputType) return FALSE; - SetResourceTypeErrorValue(RROutputType, RRErrorBase + BadRROutput); + return TRUE; } +/* + * Initialize output type error value + */ +void +RROutputInitErrorValue(void) +{ + SetResourceTypeErrorValue(RROutputType, RRErrorBase + BadRROutput); +} + #define OutputInfoExtra (SIZEOF(xRRGetOutputInfoReply) - 32) int |