xserver: Branch 'master' - 2 commits
Alan Coopersmith
alanc at kemper.freedesktop.org
Wed Mar 19 16:04:42 PDT 2008
Xext/xevie.c | 122 ++++++++++++++++++++++++++++++++---------------------------
1 file changed, 68 insertions(+), 54 deletions(-)
New commits:
commit 060a99444ee25a684b0ab9b4819bf8e855aea2d8
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Wed Mar 19 16:04:16 2008 -0700
Make Xevie private symbol names less generic
Makes it easier to figure out what you're seeing in the stack trace
instead of wondering where in the server "ProcSend" is.
diff --git a/Xext/xevie.c b/Xext/xevie.c
index f36ead4..5e20bd9 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -63,11 +63,13 @@ extern Bool noXkbExtension;
#endif
extern int xeviegrabState;
-static int ProcDispatch (register ClientPtr client), SProcDispatch (register ClientPtr client);
-static void ResetProc (ExtensionEntry *extEntry);
+static DISPATCH_PROC(ProcXevieDispatch);
+static DISPATCH_PROC(SProcXevieDispatch);
-static unsigned char ReqCode = 0;
-static int ErrorBase;
+static void XevieResetProc (ExtensionEntry *extEntry);
+
+static unsigned char XevieReqCode = 0;
+static int XevieErrorBase;
int xevieFlag = 0;
int xevieClientIndex = 0;
@@ -77,7 +79,7 @@ Mask xevieMask = 0;
int xevieEventSent = 0;
int xevieKBEventSent = 0;
static DevPrivateKey xevieDevicePrivateKey = &xevieDevicePrivateKey;
-static Bool xevieModifiersOn = FALSE;
+static Bool xevieModifiersOn = FALSE;
#define XEVIEINFO(dev) ((xevieDeviceInfoPtr) \
dixLookupPrivate(&(dev)->devPrivates, xevieDevicePrivateKey))
@@ -108,11 +110,6 @@ typedef struct {
static xevieKeycQueueRec keycq[KEYC_QUEUE_SIZE] = {{0, NULL}};
static int keycqHead = 0, keycqTail = 0;
-static int ProcDispatch (ClientPtr), SProcDispatch (ClientPtr);
-static void ResetProc (ExtensionEntry*);
-
-static int ErrorBase;
-
static Bool XevieStart(void);
static void XevieEnd(int clientIndex);
static void XevieClientStateCallback(CallbackListPtr *pcbl, pointer nulldata,
@@ -140,23 +137,23 @@ XevieExtensionInit (void)
if ((extEntry = AddExtension (XEVIENAME,
0,
XevieNumberErrors,
- ProcDispatch,
- SProcDispatch,
- ResetProc,
+ ProcXevieDispatch,
+ SProcXevieDispatch,
+ XevieResetProc,
StandardMinorOpcode))) {
- ReqCode = (unsigned char)extEntry->base;
- ErrorBase = extEntry->errorBase;
+ XevieReqCode = (unsigned char)extEntry->base;
+ XevieErrorBase = extEntry->errorBase;
}
}
/*ARGSUSED*/
static
-void ResetProc (ExtensionEntry *extEntry)
+void XevieResetProc (ExtensionEntry *extEntry)
{
}
static
-int ProcQueryVersion (register ClientPtr client)
+int ProcXevieQueryVersion (register ClientPtr client)
{
xXevieQueryVersionReply rep;
@@ -171,7 +168,7 @@ int ProcQueryVersion (register ClientPtr client)
}
static
-int ProcStart (register ClientPtr client)
+int ProcXevieStart (register ClientPtr client)
{
xXevieStartReply rep;
@@ -212,7 +209,7 @@ int ProcStart (register ClientPtr client)
}
static
-int ProcEnd (register ClientPtr client)
+int ProcXevieEnd (register ClientPtr client)
{
xXevieEndReply rep;
@@ -233,7 +230,7 @@ int ProcEnd (register ClientPtr client)
}
static
-int ProcSend (register ClientPtr client)
+int ProcXevieSend (register ClientPtr client)
{
REQUEST (xXevieSendReq);
xXevieSendReply rep;
@@ -281,7 +278,7 @@ int ProcSend (register ClientPtr client)
}
static
-int ProcSelectInput (register ClientPtr client)
+int ProcXevieSelectInput (register ClientPtr client)
{
REQUEST (xXevieSelectInputReq);
xXevieSelectInputReply rep;
@@ -299,28 +296,28 @@ int ProcSelectInput (register ClientPtr client)
}
static
-int ProcDispatch (register ClientPtr client)
+int ProcXevieDispatch (register ClientPtr client)
{
REQUEST (xReq);
switch (stuff->data)
{
case X_XevieQueryVersion:
- return ProcQueryVersion (client);
+ return ProcXevieQueryVersion (client);
case X_XevieStart:
- return ProcStart (client);
+ return ProcXevieStart (client);
case X_XevieEnd:
- return ProcEnd (client);
+ return ProcXevieEnd (client);
case X_XevieSend:
- return ProcSend (client);
+ return ProcXevieSend (client);
case X_XevieSelectInput:
- return ProcSelectInput(client);
+ return ProcXevieSelectInput(client);
default:
return BadRequest;
}
}
static
-int SProcQueryVersion (register ClientPtr client)
+int SProcXevieQueryVersion (register ClientPtr client)
{
register int n;
@@ -329,11 +326,11 @@ int SProcQueryVersion (register ClientPtr client)
REQUEST_SIZE_MATCH (xXevieQueryVersionReq);
swaps (&stuff->client_major_version, n);
swaps (&stuff->client_minor_version, n);
- return ProcQueryVersion(client);
+ return ProcXevieQueryVersion(client);
}
static
-int SProcStart (ClientPtr client)
+int SProcXevieStart (ClientPtr client)
{
register int n;
@@ -341,11 +338,11 @@ int SProcStart (ClientPtr client)
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH (xXevieStartReq);
swapl (&stuff->screen, n);
- return ProcStart (client);
+ return ProcXevieStart (client);
}
static
-int SProcEnd (ClientPtr client)
+int SProcXevieEnd (ClientPtr client)
{
register int n;
@@ -353,11 +350,11 @@ int SProcEnd (ClientPtr client)
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH (xXevieEndReq);
swapl (&stuff->cmap, n);
- return ProcEnd (client);
+ return ProcXevieEnd (client);
}
static
-int SProcSend (ClientPtr client)
+int SProcXevieSend (ClientPtr client)
{
register int n;
xEvent eventT;
@@ -375,11 +372,11 @@ int SProcSend (ClientPtr client)
(*proc)(&stuff->event, &eventT);
stuff->event = eventT;
- return ProcSend (client);
+ return ProcXevieSend (client);
}
static
-int SProcSelectInput (ClientPtr client)
+int SProcXevieSelectInput (ClientPtr client)
{
register int n;
@@ -387,26 +384,26 @@ int SProcSelectInput (ClientPtr client)
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH (xXevieSelectInputReq);
swapl (&stuff->event_mask, n);
- return ProcSelectInput (client);
+ return ProcXevieSelectInput (client);
}
static
-int SProcDispatch (register ClientPtr client)
+int SProcXevieDispatch (register ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
{
case X_XevieQueryVersion:
- return SProcQueryVersion (client);
+ return SProcXevieQueryVersion (client);
case X_XevieStart:
- return SProcStart (client);
+ return SProcXevieStart (client);
case X_XevieEnd:
- return SProcEnd (client);
+ return SProcXevieEnd (client);
case X_XevieSend:
- return SProcSend (client);
+ return SProcXevieSend (client);
case X_XevieSelectInput:
- return SProcSelectInput(client);
+ return SProcXevieSelectInput(client);
default:
return BadRequest;
}
commit f37046984d7839faefa4d716624e4a85ddde9634
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Wed Mar 19 14:06:53 2008 -0700
Xevie cleanups, byteswapping fixes & request length check fixes
diff --git a/Xext/xevie.c b/Xext/xevie.c
index ea409f1..f36ead4 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -147,8 +147,6 @@ XevieExtensionInit (void)
ReqCode = (unsigned char)extEntry->base;
ErrorBase = extEntry->errorBase;
}
-
- /* PC servers initialize the desktop colors (citems) here! */
}
/*ARGSUSED*/
@@ -218,6 +216,8 @@ int ProcEnd (register ClientPtr client)
{
xXevieEndReply rep;
+ REQUEST_SIZE_MATCH (xXevieEndReq);
+
if (xevieFlag) {
if (client->index != xevieClientIndex)
return BadAccess;
@@ -240,6 +240,8 @@ int ProcSend (register ClientPtr client)
xEvent *xE;
static unsigned char lastDetail = 0, lastType = 0;
+ REQUEST_SIZE_MATCH (xXevieSendReq);
+
if (client->index != xevieClientIndex)
return BadAccess;
@@ -284,10 +286,12 @@ int ProcSelectInput (register ClientPtr client)
REQUEST (xXevieSelectInputReq);
xXevieSelectInputReply rep;
+ REQUEST_SIZE_MATCH (xXevieSelectInputReq);
+
if (client->index != xevieClientIndex)
return BadAccess;
- xevieMask = (long)stuff->event_mask;
+ xevieMask = stuff->event_mask;
rep.type = X_Reply;
rep.sequence_number = client->sequence;
WriteToClient (client, sizeof (xXevieSelectInputReply), (char *)&rep);
@@ -321,7 +325,10 @@ int SProcQueryVersion (register ClientPtr client)
register int n;
REQUEST(xXevieQueryVersionReq);
- swaps(&stuff->length, n);
+ swaps (&stuff->length, n);
+ REQUEST_SIZE_MATCH (xXevieQueryVersionReq);
+ swaps (&stuff->client_major_version, n);
+ swaps (&stuff->client_minor_version, n);
return ProcQueryVersion(client);
}
@@ -332,8 +339,8 @@ int SProcStart (ClientPtr client)
REQUEST (xXevieStartReq);
swaps (&stuff->length, n);
+ REQUEST_SIZE_MATCH (xXevieStartReq);
swapl (&stuff->screen, n);
- REQUEST_AT_LEAST_SIZE (xXevieStartReq);
return ProcStart (client);
}
@@ -344,8 +351,8 @@ int SProcEnd (ClientPtr client)
REQUEST (xXevieEndReq);
swaps (&stuff->length, n);
- REQUEST_AT_LEAST_SIZE (xXevieEndReq);
- swapl(&stuff->cmap, n);
+ REQUEST_SIZE_MATCH (xXevieEndReq);
+ swapl (&stuff->cmap, n);
return ProcEnd (client);
}
@@ -353,11 +360,21 @@ static
int SProcSend (ClientPtr client)
{
register int n;
+ xEvent eventT;
+ EventSwapPtr proc;
REQUEST (xXevieSendReq);
swaps (&stuff->length, n);
- REQUEST_AT_LEAST_SIZE (xXevieSendReq);
- swapl(&stuff->event, n);
+ REQUEST_SIZE_MATCH (xXevieSendReq);
+ swapl (&stuff->dataType, n);
+
+ /* Swap event */
+ proc = EventSwapVector[stuff->event.u.u.type & 0177];
+ if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */
+ return (BadValue);
+ (*proc)(&stuff->event, &eventT);
+ stuff->event = eventT;
+
return ProcSend (client);
}
@@ -368,8 +385,8 @@ int SProcSelectInput (ClientPtr client)
REQUEST (xXevieSelectInputReq);
swaps (&stuff->length, n);
- REQUEST_AT_LEAST_SIZE (xXevieSelectInputReq);
- swapl(&stuff->event_mask, n);
+ REQUEST_SIZE_MATCH (xXevieSelectInputReq);
+ swapl (&stuff->event_mask, n);
return ProcSelectInput (client);
}
More information about the xorg-commit
mailing list