XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

randr: ProcRRGetScreenInfo(): use x_rpcbuf_t

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-01 18:48:12 +02:00
committed by Enrico Weigelt
parent d0e24582a0
commit 86755b09be
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
randr/rrscreen.c
View File

@@ -754,11 +754,11 @@ ProcRRGetScreenInfo(ClientPtr client)
output = RRFirstOutput(pScreen);
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
if (!pScrPriv || !output) {
rep = (xRRGetScreenInfoReply) {
.type = X_Reply,
.setOfRotations = RR_Rotate_0,
.sequenceNumber = client->sequence,
.root = pWin->drawable.pScreen->root->drawable.id,
.timestamp = currentTime.milliseconds,
.configTimestamp = currentTime.milliseconds,
@@ -777,9 +777,7 @@ ProcRRGetScreenInfo(ClientPtr client)
return BadAlloc;
rep = (xRRGetScreenInfoReply) {
.type = X_Reply,
.setOfRotations = output->crtc->rotations,
.sequenceNumber = client->sequence,
.root = pWin->drawable.pScreen->root->drawable.id,
.timestamp = pScrPriv->lastSetTime.milliseconds,
.configTimestamp = pScrPriv->lastConfigTime.milliseconds,
@@ -797,7 +795,7 @@ ProcRRGetScreenInfo(ClientPtr client)
if (!extraLen)
goto finish; // no extra payload
extra = calloc(1, extraLen);
extra = x_rpcbuf_reserve(&rpcbuf, extraLen);
if (!extra) {
free(pData);
return BadAlloc;
@@ -842,14 +840,11 @@ ProcRRGetScreenInfo(ClientPtr client)
if (data8 - (CARD8 *) extra != extraLen)
FatalError("RRGetScreenInfo bad extra len %ld != %ld\n",
(unsigned long) (data8 - (CARD8 *) extra), extraLen);
rep.length = bytes_to_int32(extraLen);
finish:
free(pData);
}
if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swapl(&rep.timestamp);
swapl(&rep.configTimestamp);
swaps(&rep.rotation);
@@ -858,12 +853,7 @@ finish:
swaps(&rep.rate);
swaps(&rep.nrateEnts);
}
WriteToClient(client, sizeof(xRRGetScreenInfoReply), &rep);
if (extraLen) {
WriteToClient(client, extraLen, extra);
free(extra);
}
return Success;
return X_SEND_REPLY_WITH_RPCBUF(client, rep, rpcbuf);
}
int