xserver git update 15/5/2010

1 files changed, 217 insertions, 217 deletions

diff --git a/xorg-server/Xext/xcmisc.c b/xorg-server/Xext/xcmisc.c
index 39079a294..625351f51 100644
--- a/xorg-server/Xext/xcmisc.c
+++ b/xorg-server/Xext/xcmisc.c
@@ -1,217 +1,217 @@
-/*
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include "misc.h"
-#include "os.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include "swaprep.h"
-#include <X11/extensions/xcmiscproto.h>
-#include "modinit.h"
-
-#if HAVE_STDINT_H
-#include <stdint.h>
-#elif !defined(UINT32_MAX)
-#define UINT32_MAX 0xffffffffU
-#endif
-
-static DISPATCH_PROC(ProcXCMiscDispatch);
-static DISPATCH_PROC(ProcXCMiscGetVersion);
-static DISPATCH_PROC(ProcXCMiscGetXIDList);
-static DISPATCH_PROC(ProcXCMiscGetXIDRange);
-static DISPATCH_PROC(SProcXCMiscDispatch);
-static DISPATCH_PROC(SProcXCMiscGetVersion);
-static DISPATCH_PROC(SProcXCMiscGetXIDList);
-static DISPATCH_PROC(SProcXCMiscGetXIDRange);
-
-void XCMiscExtensionInit(INITARGS);
-
-void
-XCMiscExtensionInit(INITARGS)
-{
-    AddExtension(XCMiscExtensionName, 0, 0,
-		 ProcXCMiscDispatch, SProcXCMiscDispatch,
-		 NULL, StandardMinorOpcode);
-}
-
-static int
-ProcXCMiscGetVersion(ClientPtr client)
-{
-    xXCMiscGetVersionReply rep;
-    int n;
-
-    REQUEST_SIZE_MATCH(xXCMiscGetVersionReq);
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.majorVersion = XCMiscMajorVersion;
-    rep.minorVersion = XCMiscMinorVersion;
-    if (client->swapped) {
-    	swaps(&rep.sequenceNumber, n);
-	swaps(&rep.majorVersion, n);
-	swaps(&rep.minorVersion, n);
-    }
-    WriteToClient(client, sizeof(xXCMiscGetVersionReply), (char *)&rep);
-    return(client->noClientException);
-}
-
-static int
-ProcXCMiscGetXIDRange(ClientPtr client)
-{
-    xXCMiscGetXIDRangeReply rep;
-    int n;
-    XID min_id, max_id;
-
-    REQUEST_SIZE_MATCH(xXCMiscGetXIDRangeReq);
-    GetXIDRange(client->index, FALSE, &min_id, &max_id);
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.start_id = min_id;
-    rep.count = max_id - min_id + 1;
-    if (client->swapped) {
-    	swaps(&rep.sequenceNumber, n);
-	swapl(&rep.start_id, n);
-	swapl(&rep.count, n);
-    }
-    WriteToClient(client, sizeof(xXCMiscGetXIDRangeReply), (char *)&rep);
-    return(client->noClientException);
-}
-
-static int
-ProcXCMiscGetXIDList(ClientPtr client)
-{
-    REQUEST(xXCMiscGetXIDListReq);
-    xXCMiscGetXIDListReply rep;
-    int n;
-    XID *pids;
-    unsigned int count;
-
-    REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
-
-    if (stuff->count > UINT32_MAX / sizeof(XID))
-	    return BadAlloc;
-
-    pids = (XID *)Xalloc(stuff->count * sizeof(XID));
-    if (!pids)
-    {
-	return BadAlloc;
-    }
-    count = GetXIDList(client, stuff->count, pids);
-    rep.type = X_Reply;
-    rep.sequenceNumber = client->sequence;
-    rep.length = count;
-    rep.count = count;
-    if (client->swapped) {
-    	swaps(&rep.sequenceNumber, n);
-	swapl(&rep.length, n);
-	swapl(&rep.count, n);
-    }
-    WriteToClient(client, sizeof(xXCMiscGetXIDListReply), (char *)&rep);
-    if (count)
-    {
-    	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
-	WriteSwappedDataToClient(client, count * sizeof(XID), pids);
-    }
-    Xfree(pids);
-    return(client->noClientException);
-}
-
-static int
-ProcXCMiscDispatch (ClientPtr client)
-{
-    REQUEST(xReq);
-    switch (stuff->data)
-    {
-    case X_XCMiscGetVersion:
-	return ProcXCMiscGetVersion(client);
-    case X_XCMiscGetXIDRange:
-	return ProcXCMiscGetXIDRange(client);
-    case X_XCMiscGetXIDList:
-	return ProcXCMiscGetXIDList(client);
-    default:
-	return BadRequest;
-    }
-}
-
-static int
-SProcXCMiscGetVersion(ClientPtr client)
-{
-    int n;
-    REQUEST(xXCMiscGetVersionReq);
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH(xXCMiscGetVersionReq);
-    swaps(&stuff->majorVersion, n);
-    swaps(&stuff->minorVersion, n);
-    return ProcXCMiscGetVersion(client);
-}
-
-static int
-SProcXCMiscGetXIDRange(ClientPtr client)
-{
-    int n;
-    REQUEST(xReq);
-
-    swaps(&stuff->length, n);
-    return ProcXCMiscGetXIDRange(client);
-}
-
-static int
-SProcXCMiscGetXIDList(ClientPtr client)
-{
-    int n;
-    REQUEST(xXCMiscGetXIDListReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->count, n);
-    return ProcXCMiscGetXIDList(client);
-}
-
-static int
-SProcXCMiscDispatch (ClientPtr client)
-{
-    REQUEST(xReq);
-    switch (stuff->data)
-    {
-    case X_XCMiscGetVersion:
-	return SProcXCMiscGetVersion(client);
-    case X_XCMiscGetXIDRange:
-	return SProcXCMiscGetXIDRange(client);
-    case X_XCMiscGetXIDList:
-	return SProcXCMiscGetXIDList(client);
-    default:
-	return BadRequest;
-    }
-}
+/*

+

+Copyright 1993, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall

+not be used in advertising or otherwise to promote the sale, use or

+other dealings in this Software without prior written authorization

+from The Open Group.

+

+*/

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include "misc.h"

+#include "os.h"

+#include "dixstruct.h"

+#include "extnsionst.h"

+#include "swaprep.h"

+#include <X11/extensions/xcmiscproto.h>

+#include "modinit.h"

+

+#if HAVE_STDINT_H

+#include <stdint.h>

+#elif !defined(UINT32_MAX)

+#define UINT32_MAX 0xffffffffU

+#endif

+

+static DISPATCH_PROC(ProcXCMiscDispatch);

+static DISPATCH_PROC(ProcXCMiscGetVersion);

+static DISPATCH_PROC(ProcXCMiscGetXIDList);

+static DISPATCH_PROC(ProcXCMiscGetXIDRange);

+static DISPATCH_PROC(SProcXCMiscDispatch);

+static DISPATCH_PROC(SProcXCMiscGetVersion);

+static DISPATCH_PROC(SProcXCMiscGetXIDList);

+static DISPATCH_PROC(SProcXCMiscGetXIDRange);

+

+void XCMiscExtensionInit(INITARGS);

+

+void

+XCMiscExtensionInit(INITARGS)

+{

+    AddExtension(XCMiscExtensionName, 0, 0,

+		 ProcXCMiscDispatch, SProcXCMiscDispatch,

+		 NULL, StandardMinorOpcode);

+}

+

+static int

+ProcXCMiscGetVersion(ClientPtr client)

+{

+    xXCMiscGetVersionReply rep;

+    int n;

+

+    REQUEST_SIZE_MATCH(xXCMiscGetVersionReq);

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    rep.majorVersion = XCMiscMajorVersion;

+    rep.minorVersion = XCMiscMinorVersion;

+    if (client->swapped) {

+    	swaps(&rep.sequenceNumber, n);

+	swaps(&rep.majorVersion, n);

+	swaps(&rep.minorVersion, n);

+    }

+    WriteToClient(client, sizeof(xXCMiscGetVersionReply), (char *)&rep);

+    return Success;

+}

+

+static int

+ProcXCMiscGetXIDRange(ClientPtr client)

+{

+    xXCMiscGetXIDRangeReply rep;

+    int n;

+    XID min_id, max_id;

+

+    REQUEST_SIZE_MATCH(xXCMiscGetXIDRangeReq);

+    GetXIDRange(client->index, FALSE, &min_id, &max_id);

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    rep.start_id = min_id;

+    rep.count = max_id - min_id + 1;

+    if (client->swapped) {

+    	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.start_id, n);

+	swapl(&rep.count, n);

+    }

+    WriteToClient(client, sizeof(xXCMiscGetXIDRangeReply), (char *)&rep);

+    return Success;

+}

+

+static int

+ProcXCMiscGetXIDList(ClientPtr client)

+{

+    REQUEST(xXCMiscGetXIDListReq);

+    xXCMiscGetXIDListReply rep;

+    int n;

+    XID *pids;

+    unsigned int count;

+

+    REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);

+

+    if (stuff->count > UINT32_MAX / sizeof(XID))

+	    return BadAlloc;

+

+    pids = (XID *)malloc(stuff->count * sizeof(XID));

+    if (!pids)

+    {

+	return BadAlloc;

+    }

+    count = GetXIDList(client, stuff->count, pids);

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.length = count;

+    rep.count = count;

+    if (client->swapped) {

+    	swaps(&rep.sequenceNumber, n);

+	swapl(&rep.length, n);

+	swapl(&rep.count, n);

+    }

+    WriteToClient(client, sizeof(xXCMiscGetXIDListReply), (char *)&rep);

+    if (count)

+    {

+    	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;

+	WriteSwappedDataToClient(client, count * sizeof(XID), pids);

+    }

+    free(pids);

+    return Success;

+}

+

+static int

+ProcXCMiscDispatch (ClientPtr client)

+{

+    REQUEST(xReq);

+    switch (stuff->data)

+    {

+    case X_XCMiscGetVersion:

+	return ProcXCMiscGetVersion(client);

+    case X_XCMiscGetXIDRange:

+	return ProcXCMiscGetXIDRange(client);

+    case X_XCMiscGetXIDList:

+	return ProcXCMiscGetXIDList(client);

+    default:

+	return BadRequest;

+    }

+}

+

+static int

+SProcXCMiscGetVersion(ClientPtr client)

+{

+    int n;

+    REQUEST(xXCMiscGetVersionReq);

+

+    swaps(&stuff->length, n);

+    REQUEST_SIZE_MATCH(xXCMiscGetVersionReq);

+    swaps(&stuff->majorVersion, n);

+    swaps(&stuff->minorVersion, n);

+    return ProcXCMiscGetVersion(client);

+}

+

+static int

+SProcXCMiscGetXIDRange(ClientPtr client)

+{

+    int n;

+    REQUEST(xReq);

+

+    swaps(&stuff->length, n);

+    return ProcXCMiscGetXIDRange(client);

+}

+

+static int

+SProcXCMiscGetXIDList(ClientPtr client)

+{

+    int n;

+    REQUEST(xXCMiscGetXIDListReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->count, n);

+    return ProcXCMiscGetXIDList(client);

+}

+

+static int

+SProcXCMiscDispatch (ClientPtr client)

+{

+    REQUEST(xReq);

+    switch (stuff->data)

+    {

+    case X_XCMiscGetVersion:

+	return SProcXCMiscGetVersion(client);

+    case X_XCMiscGetXIDRange:

+	return SProcXCMiscGetXIDRange(client);

+    case X_XCMiscGetXIDList:

+	return SProcXCMiscGetXIDList(client);

+    default:

+	return BadRequest;

+    }

+}