diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-24 07:51:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-24 07:51:24 +0000 |
| commit | 81aeaf653a832c4054d9a40b1cc796911521a739 (patch) | |
| tree | cf49e5efe23001c76bee6fb625e26801bd7edff0 /xorg-server/Xext/shm.c | |
| parent | b63d68318fdce5002f42a818f3dd3dff126ec2c2 (diff) | |
| parent | b39f063f74bf0163eaf34db03134f226d18142ec (diff) | |
| download | vcxsrv-81aeaf653a832c4054d9a40b1cc796911521a739.tar.gz vcxsrv-81aeaf653a832c4054d9a40b1cc796911521a739.tar.bz2 vcxsrv-81aeaf653a832c4054d9a40b1cc796911521a739.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/Xext/shm.c')
| -rw-r--r-- | xorg-server/Xext/shm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index 7099e8f36..62d6ebe0c 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -867,7 +867,7 @@ ProcPanoramiXShmGetImage(ClientPtr client) return BadAlloc;
drawables[0] = pDraw;
- for(i = 1; i < PanoramiXNumScreens; i++) {
+ FOR_NSCREENS_FORWARD_SKIP(i) {
rc = dixLookupDrawable(drawables+i, draw->info[i].id, client, 0,
DixReadAccess);
if (rc != Success)
@@ -991,9 +991,7 @@ CreatePmap: newPix->type = XRT_PIXMAP;
newPix->u.pix.shared = TRUE;
- newPix->info[0].id = stuff->pid;
- for(j = 1; j < PanoramiXNumScreens; j++)
- newPix->info[j].id = FakeClientID(client->index);
+ panoramix_setup_ids(newPix, client, stuff->pid);
result = Success;
|