diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
| commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
| tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /xorg-server/Xext | |
| parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
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 2aa46d137..680e53a31 100644 --- a/xorg-server/Xext/security.c +++ b/xorg-server/Xext/security.c @@ -150,9 +150,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 39916df60..7c9fbc7a9 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -500,7 +500,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) |