On Thu, Nov 27, 2008 at 10:02:53 -0800, Keith Packard wrote:
> On Wed, 2008-11-26 at 22:14 +0100, Julien Cristau wrote:
>
> > + SwapLongs((CARD32 *)&stuff->transform, (sizeof xRenderTransform) >> 2);
> > + swaps(&stuff->nbytesFilter);
>
> Please try compiling patches before submitting them. Testing would be a
> nice bonus too.
>
Sorry about that. The attached patches actually build, and quick
testing of XRRGetCrtcTransform seems to work, once I applied the second
patch to fix libXrandr, which didn't set the pendingNparams field in the
returned structure.
Cheers,
Julien
>From 5e2ce5ee7773a0b0b32c96212d9a50b67e3f7657 Mon Sep 17 00:00:00 2001
From: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed, 26 Nov 2008 21:19:55 +0100
Subject: [PATCH] randr: add swapped dispatch for RR[GS]etCrtcTransform
Fix a memory leak in ProcRRGetCrtcTransform() while I'm at it.
Signed-off-by: Julien Cristau <[EMAIL PROTECTED]>
Cc: Keith Packard <[EMAIL PROTECTED]>
---
randr/rrcrtc.c | 6 +++---
randr/rrsdispatch.c | 29 ++++++++++++++++++++++-------
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 5d270ce..90d93b5 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -1150,8 +1150,7 @@ transform_filter_encode (ClientPtr client, char *output,
if (client->swapped) {
swaps (nbytesFilter, n);
swaps (nparamsFilter, n);
- SwapLongs ((CARD32 *) (output + nbytes),
- nparams * sizeof (xFixed));
+ SwapLongs ((CARD32 *) (output + nbytes), nparams);
}
nbytes += nparams * sizeof (xFixed);
return nbytes;
@@ -1162,7 +1161,7 @@ transform_encode (ClientPtr client, xRenderTransform *wire, PictTransform *pict)
{
xRenderTransform_from_PictTransform (wire, pict);
if (client->swapped)
- SwapLongs ((CARD32 *) wire, sizeof (xRenderTransform));
+ SwapLongs ((CARD32 *) wire, sizeof (xRenderTransform) >> 2);
}
int
@@ -1214,5 +1213,6 @@ ProcRRGetCrtcTransform (ClientPtr client)
swapl (&reply->length, n);
}
WriteToClient (client, sizeof (xRRGetCrtcTransformReply) + nextra, (char *) reply);
+ xfree(reply);
return client->noClientException;
}
diff --git a/randr/rrsdispatch.c b/randr/rrsdispatch.c
index 5a6dab5..d356ab0 100644
--- a/randr/rrsdispatch.c
+++ b/randr/rrsdispatch.c
@@ -367,21 +367,36 @@ SProcRRSetCrtcGamma (ClientPtr client)
static int
SProcRRSetCrtcTransform (ClientPtr client)
{
+ int n, nparams;
+ char *filter;
+ CARD32 *params;
REQUEST(xRRSetCrtcTransformReq);
-
- REQUEST_SIZE_MATCH(xRRSetCrtcTransformReq);
- (void) stuff;
- return BadImplementation;
+
+ REQUEST_AT_LEAST_SIZE(xRRSetCrtcTransformReq);
+ swaps(&stuff->length, n);
+ swapl(&stuff->crtc, n);
+ SwapLongs((CARD32 *)&stuff->transform, (sizeof(xRenderTransform)) >> 2);
+ swaps(&stuff->nbytesFilter, n);
+ filter = (char *)(stuff + 1);
+ params = (CARD32 *) (filter + ((stuff->nbytesFilter + 3) & ~3));
+ nparams = ((CARD32 *) stuff + client->req_len) - params;
+ if (nparams < 0)
+ return BadLength;
+
+ SwapLongs(params, nparams);
+ return (*ProcRandrVector[stuff->randrReqType]) (client);
}
static int
SProcRRGetCrtcTransform (ClientPtr client)
{
+ int n;
REQUEST(xRRGetCrtcTransformReq);
-
+
REQUEST_SIZE_MATCH(xRRGetCrtcTransformReq);
- (void) stuff;
- return BadImplementation;
+ swaps(&stuff->length, n);
+ swapl(&stuff->crtc, n);
+ return (*ProcRandrVector[stuff->randrReqType]) (client);
}
int (*SProcRandrVector[RRNumberRequests])(ClientPtr) = {
--
1.5.6.5
>From 00f2e30d0b8296668776d62a4c47f96bf95faa08 Mon Sep 17 00:00:00 2001
From: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri, 28 Nov 2008 16:16:22 +0100
Subject: [PATCH] Set attr->pendingNparams in XRRGetCrtcTransform()
---
src/XrrCrtc.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c
index f4d9322..66dbc67 100644
--- a/src/XrrCrtc.c
+++ b/src/XrrCrtc.c
@@ -444,6 +444,7 @@ XRRGetCrtcTransform (Display *dpy,
e += 4;
attr->pendingParams[p] = (XFixed) f;
}
+ attr->pendingNparams = rep.pendingNparamsFilter;
memcpy (attr->currentFilter, e, rep.currentNbytesFilter);
attr->currentFilter[rep.currentNbytesFilter] = '\0';
--
1.5.6.5
_______________________________________________
xorg mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xorg
