Commit ab58e578 authored by Aaron Plattner's avatar Aaron Plattner Committed by Mihai Moldovan

nx-X11: Backport: randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch

ProcRRGetScreenSizeRange uses REQUEST(xRRGetScreenSizeRangeReq) followed by REQUEST_SIZE_MATCH(xRRGetScreenInfoReq). This happens to work out because both requests have the same size, so this is not a functional change, just a cosmetic one. Signed-off-by: 's avatarAaron Plattner <aplattner@nvidia.com> Reviewed-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: 's avatarKeith Packard <keithp@keithp.com> Backported from Arctica GH 3.6.x branch. v2: backport to nx-libs 3.6.x (Ulrich Sibiller) v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
parent f3079bef
...@@ -305,6 +305,12 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low ...@@ -305,6 +305,12 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
Adds: Adds:
- 1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch - 1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch
* nx-X11: randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch
Backported from Arctica GH 3.6.x branch.
v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
Adds:
- 1257_nx-X11_randr-Fix-REQUEST-vs-REQUEST_SIZE_MATCH-.full.patch
-- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100 -- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100
......
commit 9e2ac01a4e9bd39e5127b35bc263d5544c6de7a2
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jun 29 13:33:58 2012 -0700
Backport: randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch
ProcRRGetScreenSizeRange uses REQUEST(xRRGetScreenSizeRangeReq) followed by
REQUEST_SIZE_MATCH(xRRGetScreenInfoReq). This happens to work out because both
requests have the same size, so this is not a functional change, just a cosmetic
one.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Backported from Arctica GH 3.6.x branch.
v2: backport to nx-libs 3.6.x (Ulrich Sibiller)
v3: backport to nx-libs 3.5.0.x (Mihai Moldovan)
diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c
index 011b97f..e0eb076 100644
--- a/nx-X11/programs/Xserver/randr/rrscreen.c
+++ b/nx-X11/programs/Xserver/randr/rrscreen.c
@@ -228,7 +228,7 @@ ProcRRGetScreenSizeRange (ClientPtr client)
rrScrPrivPtr pScrPriv;
int rc;
- REQUEST_SIZE_MATCH(xRRGetScreenInfoReq);
+ REQUEST_SIZE_MATCH(xRRGetScreenSizeRangeReq);
#ifndef NXAGENT_SERVER
rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
#else
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
1254_nx-X11_randr-fix-server-crash-in-RRGetScreenInf.full.patch 1254_nx-X11_randr-fix-server-crash-in-RRGetScreenInf.full.patch
1255_nx-X11_RRModeCreate-plug-memory-leak-of-newMode.full.patch 1255_nx-X11_RRModeCreate-plug-memory-leak-of-newMode.full.patch
1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch 1256_nx-X11_ProcRRGetScreenInfo-swap-configTimestamp.full.patch
1257_nx-X11_randr-Fix-REQUEST-vs-REQUEST_SIZE_MATCH-.full.patch
9900-dxpc-license-history.full+lite.patch 9900-dxpc-license-history.full+lite.patch
0016_nx-X11_install-location.debian.patch 0016_nx-X11_install-location.debian.patch
0102_xserver-xext_set-securitypolicy-path.debian.patch 0102_xserver-xext_set-securitypolicy-path.debian.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment