From d45aeab1b6f348d91bd30f96734650cfa3491959 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 2 Dec 2025 19:12:55 +0100
Subject: [PATCH] dix: inline ProcQueryExtension()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 dix/extension.c | 5 +++++
 dix/swapreq.c   | 9 ---------
 dix/swapreq.h   | 1 -
 dix/tables.c    | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/dix/extension.c b/dix/extension.c
index 821330f484..73b0e51f74 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -292,6 +292,11 @@ int
 ProcQueryExtension(ClientPtr client)
 {
     REQUEST(xQueryExtensionReq);
+    REQUEST_AT_LEAST_SIZE(xQueryExtensionReq);
+
+    if (client->swapped)
+        swaps(&stuff->nbytes);
+
     REQUEST_FIXED_SIZE(xQueryExtensionReq, stuff->nbytes);
 
     xQueryExtensionReply reply = { 0 };
diff --git a/dix/swapreq.c b/dix/swapreq.c
index a6a5d837f7..8f661d7888 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -668,15 +668,6 @@ SProcQueryBestSize(ClientPtr client)
     return ((*ProcVector[X_QueryBestSize]) (client));
 }
 
-int _X_COLD
-SProcQueryExtension(ClientPtr client)
-{
-    REQUEST(xQueryExtensionReq);
-    REQUEST_AT_LEAST_SIZE(xQueryExtensionReq);
-    swaps(&stuff->nbytes);
-    return ((*ProcVector[X_QueryExtension]) (client));
-}
-
 int _X_COLD
 SProcChangeKeyboardMapping(ClientPtr client)
 {
diff --git a/dix/swapreq.h b/dix/swapreq.h
index 36bce581f1..4abe6a175a 100644
--- a/dix/swapreq.h
+++ b/dix/swapreq.h
@@ -62,7 +62,6 @@ int SProcOpenFont(ClientPtr client);
 int SProcPutImage(ClientPtr client);
 int SProcQueryBestSize(ClientPtr client);
 int SProcQueryColors(ClientPtr client);
-int SProcQueryExtension(ClientPtr client);
 int SProcReparentWindow(ClientPtr client);
 int SProcSetClipRectangles(ClientPtr client);
 int SProcSetDashes(ClientPtr client);
diff --git a/dix/tables.c b/dix/tables.c
index 302e02dac5..93b636faa9 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -430,7 +430,7 @@ int (*SwappedProcVector[256]) (ClientPtr /* client */) = {
     ProcFreeCursor,                     /* 95 */
     SProcRecolorCursor,
     SProcQueryBestSize,
-    SProcQueryExtension,
+    ProcQueryExtension,
     ProcListExtensions,
     SProcChangeKeyboardMapping,         /* 100 */
     ProcGetKeyboardMapping,