diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 07:42:31 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 07:42:31 +0100 |
| commit | 528f5bd58a139174170c4130c67dca30193c9057 (patch) | |
| tree | 550c818095dbc607deaddf166c77116ccd91ef54 /xorg-server/Xext | |
| parent | 2cfebffb491807a465a8e5f7daca582d8aefb829 (diff) | |
| download | vcxsrv-528f5bd58a139174170c4130c67dca30193c9057.tar.gz vcxsrv-528f5bd58a139174170c4130c67dca30193c9057.tar.bz2 vcxsrv-528f5bd58a139174170c4130c67dca30193c9057.zip | |
xserver xkeyboard-config mesa git update 5 dec 2011
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/security.c | 4 | ||||
| -rw-r--r-- | xorg-server/Xext/shm.c | 2 | ||||
| -rw-r--r-- | xorg-server/Xext/xselinux_hooks.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c index 0a63aa280..6fc1eafdd 100644 --- a/xorg-server/Xext/security.c +++ b/xorg-server/Xext/security.c @@ -148,9 +148,7 @@ SecurityLabelInitial(void) static _X_INLINE const char * SecurityLookupRequestName(ClientPtr client) { - int major = ((xReq *)client->requestBuffer)->reqType; - int minor = MinorOpcodeOfRequest(client); - return LookupRequestName(major, minor); + return LookupRequestName(client->majorOp, client->minorOp); } diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index 9c8beb27c..7ca027a90 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -481,7 +481,7 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC, { PixmapPtr pPixmap; - if (format == ZPixmap || depth == 1) { + if (format == ZPixmap || (format == XYPixmap && depth == 1)) { pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth, BitsPerPixel(depth), PixmapBytePad(w, depth), diff --git a/xorg-server/Xext/xselinux_hooks.c b/xorg-server/Xext/xselinux_hooks.c index f1d8e5d2f..0d4c9ab11 100644 --- a/xorg-server/Xext/xselinux_hooks.c +++ b/xorg-server/Xext/xselinux_hooks.c @@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata, if (client) { REQUEST(xReq); if (stuff) { - major = stuff->reqType; - minor = MinorOpcodeOfRequest(client); + major = client->majorOp; + minor = client->minorOp; } } if (audit->id) |