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/record | |
| 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/record')
| -rw-r--r-- | xorg-server/record/record.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c index db77b64f5..b956b4ab8 100644 --- a/xorg-server/record/record.c +++ b/xorg-server/record/record.c @@ -552,7 +552,7 @@ RecordARequest(ClientPtr client) } else /* extension, check minor opcode */ { - int minorop = MinorOpcodeOfRequest(client); + int minorop = client->minorOp; int numMinOpInfo; RecordMinorOpPtr pMinorOpInfo = pRCAP->pRequestMinOpInfo; @@ -609,12 +609,9 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) RecordContextPtr pContext; RecordClientsAndProtocolPtr pRCAP; int eci; - int majorop; ReplyInfoRec *pri = (ReplyInfoRec *)calldata; ClientPtr client = pri->client; - REQUEST(xReq); - majorop = stuff->reqType; for (eci = 0; eci < numEnabledContexts; eci++) { pContext = ppAllContexts[eci]; @@ -622,6 +619,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) NULL); if (pRCAP) { + int majorop = client->majorOp; if (pContext->continuedReply) { RecordAProtocolElement(pContext, client, XRecordFromServer, @@ -642,7 +640,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) } else /* extension, check minor opcode */ { - int minorop = MinorOpcodeOfRequest(client); + int minorop = client->minorOp; int numMinOpInfo; RecordMinorOpPtr pMinorOpInfo = pRCAP->pReplyMinOpInfo; assert (pMinorOpInfo); |