frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Use dixLookupResourceByType instead of LookupIDByType 

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
This commit is contained in:
Jeremy Huddleston 2009-11-04 18:15:08 -08:00
parent 069fc6ce0a
commit 0e3ad44c3b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xquartz/applewm.c
View File

@ -213,10 +213,11 @@ static int
WMFreeClient (pointer data, XID id) { WMFreeClient (pointer data, XID id) {
WMEventPtr pEvent; WMEventPtr pEvent;
WMEventPtr *pHead, pCur, pPrev; WMEventPtr *pHead, pCur, pPrev;
int i;
pEvent = (WMEventPtr) data; pEvent = (WMEventPtr) data;
pHead = (WMEventPtr *) LookupIDByType(eventResource, EventType); i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess | DixWriteAccess | DixDestroyAccess);
if (pHead) { if (i == Success && pHead) {
pPrev = 0; pPrev = 0;
for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next) for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)
pPrev = pCur; pPrev = pCur;
@ -254,12 +255,12 @@ ProcAppleWMSelectInput (register ClientPtr client)
REQUEST(xAppleWMSelectInputReq); REQUEST(xAppleWMSelectInputReq);
WMEventPtr pEvent, pNewEvent, *pHead; WMEventPtr pEvent, pNewEvent, *pHead;
XID clientResource; XID clientResource;
int i;
REQUEST_SIZE_MATCH (xAppleWMSelectInputReq); REQUEST_SIZE_MATCH (xAppleWMSelectInputReq);
pHead = (WMEventPtr *)SecurityLookupIDByType(client, i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, client, DixWriteAccess);
eventResource, EventType, DixWriteAccess);
if (stuff->mask != 0) { if (stuff->mask != 0) {
if (pHead) { if (i == Success && pHead) {
/* check for existing entry. */ /* check for existing entry. */
for (pEvent = *pHead; pEvent; pEvent = pEvent->next) for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
{ {
@ -293,7 +294,7 @@ ProcAppleWMSelectInput (register ClientPtr client)
* the list may be arbitrarily rearranged which cannot be * the list may be arbitrarily rearranged which cannot be
* done through the resource database. * done through the resource database.
*/ */
if (!pHead) if (i != Success || !pHead)
{ {
pHead = (WMEventPtr *) xalloc (sizeof (WMEventPtr)); pHead = (WMEventPtr *) xalloc (sizeof (WMEventPtr));
if (!pHead || if (!pHead ||
@ -309,7 +310,7 @@ ProcAppleWMSelectInput (register ClientPtr client)
updateEventMask (pHead); updateEventMask (pHead);
} else if (stuff->mask == 0) { } else if (stuff->mask == 0) {
/* delete the interest */ /* delete the interest */
if (pHead) { if (i == Success && pHead) {
pNewEvent = 0; pNewEvent = 0;
for (pEvent = *pHead; pEvent; pEvent = pEvent->next) { for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
if (pEvent->client == client) if (pEvent->client == client)
@ -342,9 +343,10 @@ AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {
WMEventPtr *pHead, pEvent; WMEventPtr *pHead, pEvent;
ClientPtr client; ClientPtr client;
xAppleWMNotifyEvent se; xAppleWMNotifyEvent se;
int i;
pHead = (WMEventPtr *) LookupIDByType(eventResource, EventType); i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess);
if (!pHead) if (i != Success || !pHead)
return; return;
for (pEvent = *pHead; pEvent; pEvent = pEvent->next) { for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
client = pEvent->client; client = pEvent->client;