diff -uarN xaudio-0.6.1.orig/module/audio-extension.c xaudio-0.6.1/module/audio-extension.c --- xaudio-0.6.1.orig/module/audio-extension.c 2008-01-31 10:46:27.000000000 +0100 +++ xaudio-0.6.1/module/audio-extension.c 2008-07-02 14:44:41.000000000 +0200 @@ -71,7 +71,7 @@ cond_swap32(stuff->position); data->buffer=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->bufferid, RT_SampleBuffer, SecurityWriteAccess); + stuff->bufferid, RT_SampleBuffer, DixWriteAccess); if (!data->buffer) return BadSampleBuffer; if (SampleBufferReadOnly(data->buffer)) return BadSampleBuffer; SampleBufferReference(data->buffer); @@ -119,11 +119,11 @@ cond_swap32(stuff->count); data->dst=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->dst, RT_SampleBuffer, SecurityWriteAccess); + stuff->dst, RT_SampleBuffer, DixWriteAccess); if (!data->dst) return BadSampleBuffer; if (SampleBufferReadOnly(data->dst)) return BadSampleBuffer; data->src=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->src, RT_SampleBuffer, SecurityReadAccess); + stuff->src, RT_SampleBuffer, DixReadAccess); if (!data->src) return BadSampleBuffer; data->dst_offset=stuff->dst_offset; data->src_offset=stuff->src_offset; @@ -182,14 +182,14 @@ cond_swap32(stuff->count); data->dst=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->dst, RT_SampleBuffer, SecurityWriteAccess); + stuff->dst, RT_SampleBuffer, DixWriteAccess); if (!data->dst) return BadSampleBuffer; if (SampleBufferReadOnly(data->dst)) return BadSampleBuffer; data->src1=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->src1, RT_SampleBuffer, SecurityReadAccess); + stuff->src1, RT_SampleBuffer, DixReadAccess); if (!data->src1) return BadSampleBuffer; data->src2=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->src2, RT_SampleBuffer, SecurityReadAccess); + stuff->src2, RT_SampleBuffer, DixReadAccess); if (!data->src2) return BadSampleBuffer; data->dst_offset=stuff->dst_offset; data->src1_offset=stuff->src1_offset; @@ -259,14 +259,14 @@ return BadValue; data->dst=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->dst, RT_SampleBuffer, SecurityWriteAccess); + stuff->dst, RT_SampleBuffer, DixWriteAccess); if (!data->dst) return BadSampleBuffer; if (SampleBufferReadOnly(data->dst)) return BadSampleBuffer; data->src=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->src, RT_SampleBuffer, SecurityReadAccess); + stuff->src, RT_SampleBuffer, DixReadAccess); if (!data->src) return BadSampleBuffer; data->kern=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->kern, RT_SampleBuffer, SecurityReadAccess); + stuff->kern, RT_SampleBuffer, DixReadAccess); if (!data->kern) return BadSampleBuffer; data->dst_offset=stuff->dst_offset; data->dst_count=stuff->dst_count; @@ -338,11 +338,11 @@ cond_swap32(stuff->high); data->dst=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->dst, RT_SampleBuffer, SecurityWriteAccess); + stuff->dst, RT_SampleBuffer, DixWriteAccess); if (!data->dst) return BadSampleBuffer; if (SampleBufferReadOnly(data->dst)) return BadSampleBuffer; data->src=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->src, RT_SampleBuffer, SecurityReadAccess); + stuff->src, RT_SampleBuffer, DixReadAccess); if (!data->src) return BadSampleBuffer; data->dst_offset=stuff->dst_offset; data->src_offset=stuff->src_offset; @@ -646,7 +646,7 @@ REQUEST_SIZE_MATCH(xaudioShmDetachReq); client->errorValue = stuff->id; shmseg=(AudioShmSegment *)SecurityLookupIDByType(client, - stuff->id, RT_AudioShmSegment, SecurityDestroyAccess); + stuff->id, RT_AudioShmSegment, DixDestroyAccess); client->errorValue=stuff->id; if (!shmseg) return BadValue; @@ -751,11 +751,11 @@ REQUEST_SIZE_MATCH(xaudioSetDefaultPCMDeviceReq); pcmdev=(PCMDevice *)SecurityLookupIDByType(client, - stuff->pcmdev, RT_PCMDevice, SecurityReadAccess); + stuff->pcmdev, RT_PCMDevice, DixReadAccess); if (!pcmdev) return BadPCMDevice; window=(WindowPtr)SecurityLookupIDByType(client, - stuff->window, RT_WINDOW, SecurityReadAccess); + stuff->window, RT_WINDOW, DixReadAccess); if (!window) return BadWindow; SetDefaultPCMDevice(window, pcmdev); @@ -784,7 +784,7 @@ client->errorValue = stuff->new_id; LEGAL_NEW_RESOURCE(stuff->new_id, client); samplebuffer=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->old_id, RT_SampleBuffer, SecurityWriteAccess); + stuff->old_id, RT_SampleBuffer, DixWriteAccess); if (!samplebuffer) return BadSampleBuffer; SampleBufferReference(samplebuffer); @@ -815,7 +815,7 @@ REQUEST_SIZE_MATCH(xaudioFreeSampleBufferReq); samplebuffer=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->bufferid, RT_SampleBuffer, SecurityDestroyAccess); + stuff->bufferid, RT_SampleBuffer, DixDestroyAccess); client->errorValue=stuff->bufferid; if (!samplebuffer) return BadSampleBuffer; @@ -845,7 +845,7 @@ REQUEST_AT_LEAST_SIZE(xaudioPutSamplesReq); samplebuffer=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->bufferid, RT_SampleBuffer, SecurityWriteAccess); + stuff->bufferid, RT_SampleBuffer, DixWriteAccess); if (SampleBufferReadOnly(samplebuffer)) return BadSampleBuffer; client->errorValue=stuff->bufferid; if (!samplebuffer) return BadSampleBuffer; @@ -949,7 +949,7 @@ REQUEST_AT_LEAST_SIZE(xaudioGetSamplesReq); samplebuffer=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->bufferid, RT_SampleBuffer, SecurityReadAccess); + stuff->bufferid, RT_SampleBuffer, DixReadAccess); client->errorValue=stuff->bufferid; if (!samplebuffer) return BadSampleBuffer; @@ -1045,7 +1045,7 @@ REQUEST_SIZE_MATCH(xaudioSampleBufferGetInfoReq); samplebuffer=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->bufferid, RT_SampleBuffer, SecurityReadAccess); + stuff->bufferid, RT_SampleBuffer, DixReadAccess); client->errorValue=stuff->bufferid; if (!samplebuffer) return BadSampleBuffer; @@ -1090,7 +1090,7 @@ LEGAL_NEW_RESOURCE(stuff->bufferid, client); shmseg=(AudioShmSegment *)SecurityLookupIDByType(client, - stuff->shmseg, RT_AudioShmSegment, SecurityWriteAccess); + stuff->shmseg, RT_AudioShmSegment, DixWriteAccess); client->errorValue=stuff->shmseg; if (!shmseg) return BadValue; @@ -1329,7 +1329,7 @@ REQUEST_SIZE_MATCH(xaudioQueryPCMDeviceTypeReq); pcmdev=(PCMDevice *)SecurityLookupIDByType(client, - stuff->device, RT_PCMDevice, SecurityReadAccess); + stuff->device, RT_PCMDevice, DixReadAccess); if (!pcmdev) return BadPCMDevice; XID xid; @@ -1375,7 +1375,7 @@ REQUEST_SIZE_MATCH(xaudioGetDefaultPCMDeviceReq); window=(WindowPtr)SecurityLookupIDByType(client, - stuff->window, RT_WINDOW, SecurityReadAccess); + stuff->window, RT_WINDOW, DixReadAccess); if (!window) return BadPCMDevice; XID xid=GetDefaultPCMDevice(window, stuff->deviceType); @@ -1415,7 +1415,7 @@ REQUEST_SIZE_MATCH(xaudioListPCMDevicePropertiesReq); ctx=(PCMDevice *)SecurityLookupIDByType(client, - stuff->device, RT_PCMDevice, SecurityWriteAccess); + stuff->device, RT_PCMDevice, DixWriteAccess); if (!ctx) return BadPCMDevice; unsigned int nproperties; @@ -1467,7 +1467,7 @@ REQUEST_FIXED_SIZE(xaudioSetPCMDevicePropertyReq, (stuff->property_length+3)&~3); ctx=(PCMDevice *)SecurityLookupIDByType(client, - stuff->device, RT_PCMDevice, SecurityWriteAccess); + stuff->device, RT_PCMDevice, DixWriteAccess); if (!ctx) return BadPCMDevice; int result=SetPCMProperty(PCMDeviceGetProperties(ctx), stuff->property, @@ -1496,7 +1496,7 @@ REQUEST_SIZE_MATCH(xaudioGetPCMDevicePropertyReq); ctx=(PCMDevice *)SecurityLookupIDByType(client, - stuff->device, RT_PCMDevice, SecurityReadAccess); + stuff->device, RT_PCMDevice, DixReadAccess); if (!ctx) return BadPCMDevice; const char *property_value; @@ -1545,7 +1545,7 @@ REQUEST_AT_LEAST_SIZE(xaudioDeletePCMDevicePropertyReq); ctx=(PCMDevice *)SecurityLookupIDByType(client, - stuff->device, RT_PCMDevice, SecurityWriteAccess); + stuff->device, RT_PCMDevice, DixWriteAccess); if (!ctx) return BadPCMDevice; return DeletePCMProperty(PCMDeviceGetProperties(ctx), stuff->property); @@ -1572,7 +1572,7 @@ REQUEST_SIZE_MATCH(xaudioCreatePCMContextReq); pcmdev=(PCMDevice *)SecurityLookupIDByType(client, - stuff->pcmdev, RT_PCMDevice, SecurityReadAccess); + stuff->pcmdev, RT_PCMDevice, DixReadAccess); if (!pcmdev) return BadPCMDevice; client->errorValue = stuff->ctxid; @@ -1606,7 +1606,7 @@ REQUEST_SIZE_MATCH(xaudioFreePCMContextReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityDestroyAccess); + stuff->ctxid, RT_PCMContext, DixDestroyAccess); client->errorValue=stuff->ctxid; if (!ctx) return BadPCMContext; @@ -1638,7 +1638,7 @@ REQUEST_SIZE_MATCH(xaudioQueryChannelLayoutRangeReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityReadAccess); + stuff->ctxid, RT_PCMContext, DixReadAccess); if (!ctx) return BadPCMDevice; error=PCMContextQueryChannelLayoutRange(ctx, &nlayouts, &layouts); @@ -1685,7 +1685,7 @@ REQUEST_SIZE_MATCH(xaudioQuerySampleRateRangeReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityReadAccess); + stuff->ctxid, RT_PCMContext, DixReadAccess); if (!ctx) return BadPCMDevice; error=PCMContextQuerySampleRateRange(ctx, &nrate_stops, &rate_stops); @@ -1729,7 +1729,7 @@ REQUEST_SIZE_MATCH(xaudioQueryMinimumLatencyReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityReadAccess); + stuff->ctxid, RT_PCMContext, DixReadAccess); if (!ctx) return BadPCMDevice; memset(&rep, 0, sizeof(rep)); @@ -1767,7 +1767,7 @@ REQUEST_SIZE_MATCH(xaudioQueryMinimumTimeResolutionReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityReadAccess); + stuff->ctxid, RT_PCMContext, DixReadAccess); if (!ctx) return BadPCMDevice; memset(&rep, 0, sizeof(rep)); @@ -1804,7 +1804,7 @@ REQUEST_SIZE_MATCH(xaudioSetChannelLayoutReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityWriteAccess); + stuff->ctxid, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMDevice; return PCMContextSetChannelLayout(ctx, stuff->layout); @@ -1828,7 +1828,7 @@ REQUEST_SIZE_MATCH(xaudioSetSampleRateReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityWriteAccess); + stuff->ctxid, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMDevice; return PCMContextSetSampleRate(ctx, stuff->rate); @@ -1852,7 +1852,7 @@ REQUEST_SIZE_MATCH(xaudioSetLatencyReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityWriteAccess); + stuff->ctxid, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMDevice; return PCMContextSetLatency(ctx, stuff->latency); @@ -1876,7 +1876,7 @@ REQUEST_SIZE_MATCH(xaudioSetTimeResolutionReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityWriteAccess); + stuff->ctxid, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMDevice; return PCMContextSetTimeResolution(ctx, stuff->resolution); @@ -1901,7 +1901,7 @@ REQUEST_SIZE_MATCH(xaudioGetPCMContextConfigurationReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityReadAccess); + stuff->ctxid, RT_PCMContext, DixReadAccess); if (!ctx) return BadPCMDevice; memset(&rep, 0, sizeof(rep)); @@ -1959,15 +1959,15 @@ REQUEST_SIZE_MATCH(xaudioAssignChannelReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityWriteAccess); + stuff->ctxid, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMDevice; if (PCMContextIsCapture(ctx)) buffer=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->samplebuffer, RT_SampleBuffer, SecurityWriteAccess); + stuff->samplebuffer, RT_SampleBuffer, DixWriteAccess); else buffer=(SampleBuffer *)SecurityLookupIDByType(client, - stuff->samplebuffer, RT_SampleBuffer, SecurityReadAccess); + stuff->samplebuffer, RT_SampleBuffer, DixReadAccess); if (!buffer) return BadSampleBuffer; if (PCMContextIsCapture(ctx)) if (SampleBufferReadOnly(buffer)) return BadSampleBuffer; @@ -1995,7 +1995,7 @@ REQUEST_SIZE_MATCH(xaudioStartReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityWriteAccess); + stuff->ctxid, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMContext; return PCMContextStart(ctx, stuff->start_time, stuff->stop_time); @@ -2020,7 +2020,7 @@ REQUEST_SIZE_MATCH(xaudioStopReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->ctxid, RT_PCMContext, SecurityWriteAccess); + stuff->ctxid, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMDevice; PCMContextStop(ctx); @@ -2045,11 +2045,11 @@ REQUEST_SIZE_MATCH(xaudioBindVirtualPCMContextReq); master=(PCMContext *)SecurityLookupIDByType(client, - stuff->master, RT_PCMContext, SecurityWriteAccess); + stuff->master, RT_PCMContext, DixWriteAccess); if (!master) return BadPCMContext; slave=(PCMContext *)SecurityLookupIDByType(client, - stuff->slave, RT_PCMContext, SecurityWriteAccess); + stuff->slave, RT_PCMContext, DixWriteAccess); if (!slave) return BadPCMContext; if (!IsVirtualPCMContext(slave)) return BadPCMContext; @@ -2080,7 +2080,7 @@ REQUEST_SIZE_MATCH(xaudioDisconnectVirtualPCMContextReq); slave=(PCMContext *)SecurityLookupIDByType(client, - stuff->slave, RT_PCMContext, SecurityWriteAccess); + stuff->slave, RT_PCMContext, DixWriteAccess); if (!slave) return BadPCMContext; if (!IsVirtualPCMContext(slave)) return BadPCMContext; @@ -2104,7 +2104,7 @@ REQUEST_SIZE_MATCH(xaudioListPCMContextPropertiesReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->context, RT_PCMContext, SecurityWriteAccess); + stuff->context, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMContext; unsigned int nproperties; @@ -2156,7 +2156,7 @@ REQUEST_FIXED_SIZE(xaudioSetPCMContextPropertyReq, (stuff->property_length+3)&~3); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->context, RT_PCMContext, SecurityWriteAccess); + stuff->context, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMContext; int result=SetPCMProperty(PCMContextGetProperties(ctx), stuff->property, @@ -2185,7 +2185,7 @@ REQUEST_SIZE_MATCH(xaudioGetPCMContextPropertyReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->context, RT_PCMContext, SecurityReadAccess); + stuff->context, RT_PCMContext, DixReadAccess); if (!ctx) return BadPCMContext; const char *property_value; @@ -2234,7 +2234,7 @@ REQUEST_AT_LEAST_SIZE(xaudioDeletePCMContextPropertyReq); ctx=(PCMContext *)SecurityLookupIDByType(client, - stuff->context, RT_PCMContext, SecurityWriteAccess); + stuff->context, RT_PCMContext, DixWriteAccess); if (!ctx) return BadPCMContext; return DeletePCMProperty(PCMContextGetProperties(ctx), stuff->property); diff -uarN xaudio-0.6.1.orig/module/time-extension.c xaudio-0.6.1/module/time-extension.c --- xaudio-0.6.1.orig/module/time-extension.c 2008-01-31 10:45:58.000000000 +0100 +++ xaudio-0.6.1/module/time-extension.c 2008-07-02 14:47:59.000000000 +0200 @@ -123,7 +123,7 @@ REQUEST_SIZE_MATCH(xtimeFreeClockReq); clock=(TimeSource *)SecurityLookupIDByType(client, - stuff->clockid, RT_Clock, SecurityDestroyAccess); + stuff->clockid, RT_Clock, DixDestroyAccess); client->errorValue=stuff->clockid; if (!clock) return BadClock; @@ -152,7 +152,7 @@ REQUEST_SIZE_MATCH(xtimeStartClockReq); clock=(TimeSource *)SecurityLookupIDByType(client, - stuff->clockid, RT_Clock, SecurityWriteAccess); + stuff->clockid, RT_Clock, DixWriteAccess); client->errorValue=stuff->clockid; if (!clock) return BadClock; @@ -181,7 +181,7 @@ REQUEST_SIZE_MATCH(xtimeStopClockReq); clock=(TimeSource *)SecurityLookupIDByType(client, - stuff->clockid, RT_Clock, SecurityWriteAccess); + stuff->clockid, RT_Clock, DixWriteAccess); client->errorValue=stuff->clockid; if (!clock) return BadClock; @@ -211,7 +211,7 @@ REQUEST_SIZE_MATCH(xtimeGetTimeReq); clock=(TimeSource *)SecurityLookupIDByClass(client, - stuff->clockid, RC_TimeSource, SecurityReadAccess); + stuff->clockid, RC_TimeSource, DixReadAccess); client->errorValue=stuff->clockid; if (!clock) return BadClock; @@ -253,7 +253,7 @@ REQUEST_SIZE_MATCH(xtimeCreateSchedulerReq); timesrc=(TimeSource *)SecurityLookupIDByClass(client, - stuff->clockid, RC_TimeSource, SecurityReadAccess); + stuff->clockid, RC_TimeSource, DixReadAccess); client->errorValue=stuff->clockid; if (!timesrc) return BadClock; @@ -291,7 +291,7 @@ REQUEST_SIZE_MATCH(xtimeFreeSchedulerReq); sched=(Scheduler *)SecurityLookupIDByType(client, - stuff->schedulerid, RT_Scheduler, SecurityDestroyAccess); + stuff->schedulerid, RT_Scheduler, DixDestroyAccess); client->errorValue=stuff->schedulerid; if (!sched) return BadScheduler; @@ -321,7 +321,7 @@ REQUEST_AT_LEAST_SIZE(xtimeScheduleGroupReq); sched=(Scheduler *)SecurityLookupIDByType(client, - stuff->schedulerid, RT_Scheduler, SecurityWriteAccess); + stuff->schedulerid, RT_Scheduler, DixWriteAccess); client->errorValue=stuff->schedulerid; if (!sched) return BadScheduler; @@ -357,7 +357,7 @@ REQUEST_AT_LEAST_SIZE(xtimeReplaceGroupReq); sched=(Scheduler *)SecurityLookupIDByType(client, - stuff->schedulerid, RT_Scheduler, SecurityWriteAccess); + stuff->schedulerid, RT_Scheduler, DixWriteAccess); client->errorValue=stuff->schedulerid; if (!sched) return BadScheduler; @@ -388,7 +388,7 @@ REQUEST_SIZE_MATCH(xtimeCancelGroupReq); sched=(Scheduler *)SecurityLookupIDByType(client, - stuff->schedulerid, RT_Scheduler, SecurityWriteAccess); + stuff->schedulerid, RT_Scheduler, DixWriteAccess); client->errorValue=stuff->schedulerid; if (!sched) return BadScheduler;