fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-30 03:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

XQuartz: appledri: Allow byte swapped requests

Browse source 
Even though it's only valid when local, it is possible for a local
client and the server to not match endianness, such as when running
a ppc application under Rosetta.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 1c8bda798b)
This commit is contained in:
Jeremy Huddleston 2011-10-21 10:27:16 -07:00
parent 0ad049706d
commit 7be5492bcf
1 changed files with 98 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
hw/xquartz/xpr/appledri.c
View file

@ -2,7 +2,7 @@
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
Copyright 2000 VA Linux Systems, Inc.
Copyright (c) 2002, 2009 Apple Computer, Inc.
Copyright (c) 2002, 2009-2011 Apple Inc.
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@ -415,6 +415,83 @@ SProcAppleDRIQueryVersion(
return ProcAppleDRIQueryVersion(client);
}
static int
SProcAppleDRIQueryDirectRenderingCapable(
register ClientPtr client
)
{
register int n;
REQUEST(xAppleDRIQueryDirectRenderingCapableReq);
swaps(&stuff->length, n);
swapl(&stuff->screen, n);
return ProcAppleDRIQueryDirectRenderingCapable(client);
}
static int
SProcAppleDRIAuthConnection(
register ClientPtr client
)
{
register int n;
REQUEST(xAppleDRIAuthConnectionReq);
swaps(&stuff->length, n);
swapl(&stuff->screen, n);
swapl(&stuff->magic, n);
return ProcAppleDRIAuthConnection(client);
}
static int
SProcAppleDRICreateSurface(
register ClientPtr client
)
{
register int n;
REQUEST(xAppleDRICreateSurfaceReq);
swaps(&stuff->length, n);
swapl(&stuff->screen, n);
swapl(&stuff->drawable, n);
swapl(&stuff->client_id, n);
return ProcAppleDRICreateSurface(client);
}
static int
SProcAppleDRIDestroySurface(
register ClientPtr client
)
{
register int n;
REQUEST(xAppleDRIDestroySurfaceReq);
swaps(&stuff->length, n);
swapl(&stuff->screen, n);
swapl(&stuff->drawable, n);
return ProcAppleDRIDestroySurface(client);
}
static int
SProcAppleDRICreatePixmap(
register ClientPtr client
)
{
register int n;
REQUEST(xAppleDRICreatePixmapReq);
swaps(&stuff->length, n);
swapl(&stuff->screen, n);
swapl(&stuff->drawable, n);
return ProcAppleDRICreatePixmap(client);
}
static int
SProcAppleDRIDestroyPixmap(
register ClientPtr client
)
{
register int n;
REQUEST(xAppleDRIDestroyPixmapReq);
swaps(&stuff->length, n);
swapl(&stuff->drawable, n);
return ProcAppleDRIDestroyPixmap(client);
}
static int
SProcAppleDRIDispatch (
register ClientPtr client
@ -422,15 +499,30 @@ SProcAppleDRIDispatch (
{
REQUEST(xReq);
/* It is bound to be non-local when there is byte swapping */
if (!LocalClient(client))
return DRIErrorBase + AppleDRIClientNotLocal;
/* only local clients are allowed DRI access */
switch (stuff->data)
{
case X_AppleDRIQueryVersion:
return SProcAppleDRIQueryVersion(client);
case X_AppleDRIQueryDirectRenderingCapable:
return SProcAppleDRIQueryDirectRenderingCapable(client);
}
if (!LocalClient(client))
return DRIErrorBase + AppleDRIClientNotLocal;
switch (stuff->data)
{
case X_AppleDRIAuthConnection:
return SProcAppleDRIAuthConnection(client);
case X_AppleDRICreateSurface:
return SProcAppleDRICreateSurface(client);
case X_AppleDRIDestroySurface:
return SProcAppleDRIDestroySurface(client);
case X_AppleDRICreatePixmap:
return SProcAppleDRICreatePixmap(client);
case X_AppleDRIDestroyPixmap:
return SProcAppleDRIDestroyPixmap(client);
default:
return BadRequest;
}