xfixes: Fix a couple of resource lookups
This commit is contained in:
parent
0eb19f9437
commit
e7785e8af3
|
@ -64,14 +64,19 @@ static DevPrivateKey CursorScreenPrivateKey = &CursorScreenPrivateKeyIndex;
|
|||
|
||||
static void deleteCursorHideCountsForScreen (ScreenPtr pScreen);
|
||||
|
||||
#define VERIFY_CURSOR(pCursor, cursor, client, access) { \
|
||||
pCursor = (CursorPtr)SecurityLookupIDByType((client), (cursor), \
|
||||
RT_CURSOR, (access)); \
|
||||
if (!pCursor) { \
|
||||
(client)->errorValue = (cursor); \
|
||||
return BadCursor; \
|
||||
} \
|
||||
}
|
||||
#define VERIFY_CURSOR(pCursor, cursor, client, access) \
|
||||
do { \
|
||||
int err; \
|
||||
err = dixLookupResourceByType((pointer *) &pCursor, cursor, \
|
||||
RT_CURSOR, client, access); \
|
||||
if (err == BadValue) { \
|
||||
client->errorValue = cursor; \
|
||||
return BadCursor; \
|
||||
} else if (err != Success) { \
|
||||
client->errorValue = cursor; \
|
||||
return err; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
/*
|
||||
* There is a global list of windows selecting for cursor events
|
||||
|
|
|
@ -32,13 +32,19 @@
|
|||
extern _X_EXPORT RESTYPE RegionResType;
|
||||
extern _X_EXPORT int XFixesErrorBase;
|
||||
|
||||
#define VERIFY_REGION(pRegion, rid, client, mode) { \
|
||||
pRegion = SecurityLookupIDByType (client, rid, RegionResType, mode); \
|
||||
if (!pRegion) { \
|
||||
client->errorValue = rid; \
|
||||
return XFixesErrorBase + BadRegion; \
|
||||
} \
|
||||
}
|
||||
#define VERIFY_REGION(pRegion, rid, client, mode) \
|
||||
do { \
|
||||
int err; \
|
||||
err = dixLookupResourceByType((pointer *) &pRegion, rid, \
|
||||
RegionResType, client, mode); \
|
||||
if (err == BadValue) { \
|
||||
client->errorValue = rid; \
|
||||
return XFixesErrorBase + BadRegion; \
|
||||
} else if (err != Success) { \
|
||||
client->errorValue = rid; \
|
||||
return err; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define VERIFY_REGION_OR_NONE(pRegion, rid, client, mode) { \
|
||||
pRegion = 0; \
|
||||
|
|
Loading…
Reference in New Issue