XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 10:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: use x_rpcbuf_t in ProcQueryTree()

Browse Source 
Use x_rpcbuf_t for reply payload assembly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-13 16:44:24 +02:00
committed by Enrico Weigelt
parent e93dd75dd8
commit eb04c7a1b3
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dix/dispatch.c
View File

@@ -1019,9 +1019,8 @@ ProcGetGeometry(ClientPtr client)
int
ProcQueryTree(ClientPtr client)
{
int rc, numChildren = 0;
int rc;
WindowPtr pWin, pHead;
Window *childIDs = (Window *) NULL;
REQUEST(xResourceReq);
@@ -1031,39 +1030,37 @@ ProcQueryTree(ClientPtr client)
return rc;
pHead = RealChildHead(pWin);
for (WindowPtr pChild = pWin->lastChild; pChild != pHead; pChild = pChild->prevSib)
numChildren++;
if (numChildren) {
int curChild = 0;
childIDs = calloc(numChildren, sizeof(Window));
if (!childIDs)
return BadAlloc;
for (WindowPtr pChild = pWin->lastChild; pChild != pHead;
pChild = pChild->prevSib)
childIDs[curChild++] = pChild->drawable.id;
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
CARD32 numChildren = 0;
for (WindowPtr pChild = pWin->lastChild; pChild != pHead; pChild = pChild->prevSib) {
x_rpcbuf_write_CARD32(&rpcbuf, pChild->drawable.id);
numChildren++;
}
if (rpcbuf.error)
return BadAlloc;
xQueryTreeReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
.root = pWin->drawable.pScreen->root->drawable.id,
.parent = (pWin->parent) ? pWin->parent->drawable.id : (Window) None,
.nChildren = numChildren,
.length = bytes_to_int32(numChildren * sizeof(Window)),
.length = x_rpcbuf_wsize_units(&rpcbuf)
};
if (client->swapped) {
SwapLongs(childIDs, rep.length);
swaps(&rep.sequenceNumber);
swapl(&rep.length);
swapl(&rep.root);
swapl(&rep.parent);
swaps(&rep.nChildren);
}
WriteToClient(client, sizeof(rep), &rep);
WriteToClient(client, numChildren * sizeof(Window), childIDs);
free(childIDs);
WriteRpcbufToClient(client, &rpcbuf);
return Success;
}