diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-16 13:46:01 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-16 13:46:01 +0000 |
| commit | 578938f1cdd5a06dd6fa28167d575ec980322a5d (patch) | |
| tree | e31cf77fab7cc6e005b0e726e7951d7eef79550f /xorg-server/hw/xwin/winwindowswm.c | |
| parent | 0032f9b66d63a4b1c5222edb8603fb60da379fb0 (diff) | |
| download | vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.tar.gz vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.tar.bz2 vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.zip | |
Update to git master branch of xserver.
Diffstat (limited to 'xorg-server/hw/xwin/winwindowswm.c')
| -rw-r--r-- | xorg-server/hw/xwin/winwindowswm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c index 5b164ea96..3d4d8c208 100644 --- a/xorg-server/hw/xwin/winwindowswm.c +++ b/xorg-server/hw/xwin/winwindowswm.c @@ -148,7 +148,8 @@ WMFreeClient (pointer data, XID id) WMEventPtr *pHead, pCur, pPrev; pEvent = (WMEventPtr) data; - pHead = (WMEventPtr *) LookupIDByType(eventResource, eventResourceType); + dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType, + NullClient, DixUnknownAccess); if (pHead) { pPrev = 0; @@ -193,8 +194,7 @@ ProcWindowsWMSelectInput (register ClientPtr client) XID clientResource; REQUEST_SIZE_MATCH (xWindowsWMSelectInputReq); - pHead = (WMEventPtr *)SecurityLookupIDByType(client, eventResource, - eventResourceType, DixWriteAccess); + dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType, client, DixWriteAccess); if (stuff->mask != 0) { if (pHead) @@ -294,7 +294,8 @@ winWindowsWMSendEvent (int type, unsigned int mask, int which, int arg, ErrorF ("winWindowsWMSendEvent %d %d %d %d, %d %d - %d %d\n", type, mask, which, arg, x, y, w, h); #endif - pHead = (WMEventPtr *) LookupIDByType(eventResource, eventResourceType); + dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType, + NullClient, DixUnknownAccess); if (!pHead) return; for (pEvent = *pHead; pEvent; pEvent = pEvent->next) |