HACK

This reverts commit 912c0c1f76d6cf54864bdd9eda872a19281f65d6.

Xext/meson.build

@@ -58,13 +58,13 @@ if build_xv
     hdrs_xext += ['xvdix.h', 'xvmcext.h']
 endif
 
-libxserver_xext = static_library('xserver_xext',
+libxserver_xext = static_library('libxserver_xext',
     srcs_xext,
     include_directories: inc,
     dependencies: common_dep,
 )
 
-libxserver_xext_vidmode = static_library('xserver_xext_vidmode',
+libxserver_xext_vidmode = static_library('libxserver_xext_vidmode',
     'vidmode.c',
     include_directories: inc,
     dependencies: common_dep,

Xext/namespace/hook-windowproperty.c

@@ -11,6 +11,14 @@
 #include "namespace.h"
 #include "hooks.h"
 
+static inline Bool winIsRoot(WindowPtr pWin) {
+    if (!pWin)
+        return FALSE;
+    if (pWin->drawable.pScreen->root == pWin)
+        return TRUE;
+    return FALSE;
+}
+
 void hookWindowProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
 {
     XNS_HOOK_HEAD(PropertyFilterParam);

Xext/namespace/meson.build

@@ -1,5 +1,5 @@
 libxserver_namespace = static_library(
-	'xserver_namespace',
+	'libxserver_namespace',
 	[
 		'config.c',
 		'hook-client.c',

Xext/xselinux_ext.c

@@ -261,10 +261,9 @@ ProcSELinuxGetPropertyContext(ClientPtr client, void *privKey)
     if (rc != Success)
         return rc;
 
-    rc = dixLookupProperty(&pProp, pWin, stuff->property, client,
-                           DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
+    pProp = dixLookupProperty(pWin, stuff->property, client, DixGetAttrAccess);
+    if (!pProp)
+        return BadMatch;
 
     obj = dixLookupPrivate(&pProp->devPrivates, privKey);
     return SELinuxSendContextReply(client, obj->sid);

Xi/meson.build

@@ -53,14 +53,14 @@ srcs_xi = [
     'xiwarppointer.c',
 ]
 
-libxserver_xi = static_library('xserver_xi',
+libxserver_xi = static_library('libxserver_xi',
     srcs_xi,
     include_directories: inc,
     dependencies: common_dep,
 )
 
 srcs_xi_stubs = ['stubs.c']
-libxserver_xi_stubs = static_library('xserver_xi_stubs',
+libxserver_xi_stubs = static_library('libxserver_xi_stubs',
     srcs_xi_stubs,
     include_directories: inc,
     dependencies: common_dep,

composite/meson.build

@@ -10,7 +10,7 @@ hdrs_composite = [
 	'compositeext.h',
 ]
 
-libxserver_composite = static_library('xserver_composite',
+libxserver_composite = static_library('libxserver_composite',
 	srcs_composite,
 	include_directories: inc,
 	dependencies: common_dep,

config/meson.build

@@ -28,7 +28,7 @@ if build_xorg
                  install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'))
 endif
 
-libxserver_config = static_library('xserver_config',
+libxserver_config = static_library('libxserver_config',
     srcs_config,
     include_directories: inc,
     dependencies: config_dep,

damageext/meson.build

@@ -2,7 +2,7 @@ srcs_damageext = [
 	'damageext.c',
 ]
 
-libxserver_damageext = static_library('xserver_damageext',
+libxserver_damageext = static_library('libxserver_damageext',
 	srcs_damageext,
 	include_directories: inc,
 	dependencies: common_dep,

dbe/meson.build

@@ -3,7 +3,7 @@ srcs_dbe = [
 	'midbe.c',
 ]
 
-libxserver_dbe = static_library('xserver_dbe',
+libxserver_dbe = static_library('libxserver_dbe',
 	srcs_dbe,
 	include_directories: inc,
 	dependencies: common_dep,

dix/dix_priv.h

@@ -689,4 +689,6 @@ static inline ClientPtr dixLookupXIDOwner(XID xid)
     return NullClient;
 }
 
+void dixFreeAllScreens(void);
+
 #endif /* _XSERVER_DIX_PRIV_H */

dix/main.c

@@ -317,20 +317,8 @@ dix_main(int argc, char *argv[], char *envp[])
             screenInfo.screens[i]->root = NullWindow;
 
         CloseDownDevices();
-
         CloseDownEvents();
-
-        for (i = screenInfo.numGPUScreens - 1; i >= 0; i--) {
-            dixFreeScreen(screenInfo.gpuscreens[i]);
-            screenInfo.numGPUScreens = i;
-        }
-        memset(&screenInfo.numGPUScreens, 0, sizeof(screenInfo.numGPUScreens));
-
-        for (i = screenInfo.numScreens - 1; i >= 0; i--) {
-            dixFreeScreen(screenInfo.screens[i]);
-            screenInfo.numScreens = i;
-        }
-        memset(&screenInfo.screens, 0, sizeof(screenInfo.numGPUScreens));
+        dixFreeAllScreens();
 
         ReleaseClientIds(serverClient);
         dixFreePrivates(serverClient->devPrivates, PRIVATE_CLIENT);

dix/meson.build

@@ -57,13 +57,13 @@ endif
 
 dtrace_dep = declare_dependency(sources: [dtrace_src, dtrace_hdr])
 
-libxserver_dix = static_library('xserver_dix',
+libxserver_dix = static_library('libxserver_dix',
     [ srcs_dix, builtinatoms_src ],
     include_directories: inc,
     dependencies: [ dtrace_dep, common_dep, ]
 )
 
-libxserver_main = static_library('xserver_main',
+libxserver_main = static_library('libxserver_main',
     'stubmain.c',
     include_directories: inc,
     dependencies: common_dep,

dix/property.c

@@ -92,8 +92,7 @@ PrintPropertys(WindowPtr pWin)
 }
 #endif
 
-int
-dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom propertyName,
+PropertyPtr dixLookupProperty(WindowPtr pWin, Atom propertyName,
                               ClientPtr client, Mask access_mode)
 {
     PropertyPtr pProp;
@@ -101,14 +100,14 @@ dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom propertyName,
 
     client->errorValue = propertyName;
 
-    for (pProp = pWin->properties; pProp; pProp = pProp->next)
-        if (pProp->propertyName == propertyName)
-            break;
+    for (pProp = wUserProps(pWin); pProp; pProp = pProp->next)
+        if (pProp->propertyName == propertyName) {
+            if (XaceHookPropertyAccess(client, pWin, &pProp, access_mode) != Success)
+                return NULL;
+            return pProp;
+        }
 
-    if (pProp)
-        rc = XaceHookPropertyAccess(client, pWin, &pProp, access_mode);
-    *result = pProp;
-    return rc;
+    return NULL;
 }
 
 static void
@@ -223,6 +222,7 @@ ProcRotateProperties(ClientPtr client)
 
         if (rc != Success)
             goto out;
+        }
 
         props[i] = pProp;
         saved[i] = *pProp;
@@ -333,7 +333,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
     access_mode = (mode == PropModeReplace) ? DixWriteAccess : DixBlendAccess;
 
     /* first see if property already exists */
-    rc = dixLookupProperty(&pProp, pWin, property, pClient, access_mode);
+    pProp = dixLookupProperty(pWin, property, pClient, access_mode);
 
     if (rc == BadMatch) {       /* just add to list */
         if (!MakeWindowOptional(pWin))
@@ -365,7 +365,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
         pProp->next = pWin->properties;
         pWin->properties = pProp;
     }
-    else if (rc == Success) {
+    else {
         /* To append or prepend to a property the request format and type
            must match those of the already defined property.  The
            existing format and type are irrelevant when using the mode
@@ -427,8 +427,6 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
             return rc;
         }
     }
-    else
-        return rc;
 
     if (sendevent) {
         deliverPropertyNotifyEvent(pWin, PropertyNewValue, pProp);
@@ -444,8 +442,8 @@ DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName)
     PropertyPtr pProp, prevProp;
     int rc;
 
-    rc = dixLookupProperty(&pProp, pWin, propName, client, DixDestroyAccess);
-    if (rc == BadMatch)
+    pProp = dixLookupProperty(pWin, propName, client, DixDestroyAccess);
+    if (!pProp)
         return Success;         /* Succeed if property does not exist */
 
     if (rc == Success) {
@@ -467,7 +465,19 @@ DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName)
         free(pProp->data);
         dixFreeObjectWithPrivates(pProp, PRIVATE_PROPERTY);
     }
-    return rc;
+    else {
+        /* Need to traverse to find the previous element */
+        prevProp = pWin->optional->userProps;
+        while (prevProp->next != pProp)
+            prevProp = prevProp->next;
+        prevProp->next = pProp->next;
+    }
+
+    deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp);
+    free(pProp->data);
+    dixFreeObjectWithPrivates(pProp, PRIVATE_PROPERTY);
+
+    return Success;
 }
 
 void

dix/property_priv.h

@@ -94,7 +94,7 @@ typedef struct _PropertyFilterParam {
 
 extern CallbackListPtr PropertyFilterCallback;
 
-int dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom proprty,
+PropertyPtr dixLookupProperty(WindowPtr pWin, Atom proprty,
                               ClientPtr pClient, Mask access_mode);
 
 void DeleteAllWindowProperties(WindowPtr pWin);

dix/screen.c

@@ -10,7 +10,7 @@
 #include "include/screenint.h"
 #include "include/scrnintstr.h"
 
-void dixFreeScreen(ScreenPtr pScreen)
+static void dixFreeScreen(ScreenPtr pScreen)
 {
     if (!pScreen)
         return;
@@ -27,3 +27,18 @@ void dixFreeScreen(ScreenPtr pScreen)
     DeleteCallbackList(&pScreen->hookPixmapDestroy);
     free(pScreen);
 }
+
+void dixFreeAllScreens(void)
+{
+    for (int i = screenInfo.numGPUScreens - 1; i >= 0; i--) {
+        dixFreeScreen(screenInfo.gpuscreens[i]);
+        screenInfo.numGPUScreens = i;
+    }
+    memset(&screenInfo.numGPUScreens, 0, sizeof(screenInfo.numGPUScreens));
+
+    for (int i = screenInfo.numScreens - 1; i >= 0; i--) {
+        dixFreeScreen(screenInfo.screens[i]);
+        screenInfo.numScreens = i;
+    }
+    memset(&screenInfo.screens, 0, sizeof(screenInfo.numGPUScreens));
+}

dri3/meson.build

@@ -10,7 +10,7 @@ hdrs_dri3 = [
 
 libxserver_dri3 = []
 if build_dri3
-    libxserver_dri3 = static_library('xserver_dri3',
+    libxserver_dri3 = static_library('libxserver_dri3',
         srcs_dri3,
         include_directories: inc,
         dependencies: [ common_dep, libdrm_dep ],

exa/meson.build

@@ -12,7 +12,7 @@ srcs_exa = [
     'exa_unaccel.c',
 ]
 
-libxserver_exa = static_library('xserver_exa',
+libxserver_exa = static_library('libxserver_exa',
     srcs_exa,
     include_directories: inc,
     dependencies: common_dep,

fb/meson.build

@@ -37,7 +37,7 @@ hdrs_fb = [
 	'wfbrename.h'
 ]
 
-libxserver_fb = static_library('xserver_fb',
+libxserver_fb = static_library('libxserver_fb',
 	srcs_fb,
 	include_directories: inc,
 	dependencies: common_dep,
@@ -46,7 +46,7 @@ libxserver_fb = static_library('xserver_fb',
 
 wfb_args = '-DFB_ACCESS_WRAPPER'
 
-libxserver_wfb = static_library('xserver_wfb',
+libxserver_wfb = static_library('libxserver_wfb',
 	srcs_fb,
 	c_args: wfb_args,
 	include_directories: inc,

glx/indirect_util.c

@@ -128,10 +128,13 @@ __glXSendReply(ClientPtr client, const void *data, size_t elements,
         .retval = retval,
     };
 
-    /* Single element goes in reply padding; don't leak uninitialized data. */
-    if (elements == 1) {
-        (void) memcpy(&reply.pad3, data, element_size);
-    }
+    /* It is faster on almost always every architecture to just copy the 8
+     * bytes, even when not necessary, than check to see of the value of
+     * elements requires it.  Copying the data when not needed will do no
+     * harm.
+     */
+
+    (void) memcpy(&reply.pad3, data, 8);
     WriteToClient(client, sizeof(xGLXSingleReply), &reply);
 
     if (reply_ints != 0) {
@@ -173,10 +176,13 @@ __glXSendReplySwap(ClientPtr client, const void *data, size_t elements,
         .retval = bswap_32(retval),
     };
 
-    /* Single element goes in reply padding; don't leak uninitialized data. */
-    if (elements == 1) {
-        (void) memcpy(&reply.pad3, data, element_size);
-    }
+    /* It is faster on almost always every architecture to just copy the 8
+     * bytes, even when not necessary, than check to see of the value of
+     * elements requires it.  Copying the data when not needed will do no
+     * harm.
+     */
+
+    (void) memcpy(&reply.pad3, data, 8);
     WriteToClient(client, sizeof(xGLXSingleReply), &reply);
 
     if (reply_ints != 0) {

glx/meson.build

@@ -32,7 +32,7 @@ srcs_glx = [
 
 libxserver_glx = []
 if build_glx
-    libxserver_glx = static_library('xserver_glx',
+    libxserver_glx = static_library('libxserver_glx',
         srcs_glx,
         include_directories: inc,
         dependencies: [
@@ -68,7 +68,7 @@ hdrs_vnd = [
 
 libglxvnd = []
 if build_glx
-    libglxvnd = static_library('glxvnd',
+    libglxvnd = static_library('libglxvnd',
     srcs_vnd,
     include_directories: inc,
         dependencies: [

glx/singlesize.c

@@ -105,7 +105,7 @@ __glGetMap_size(GLenum target, GLenum query)
         }
         break;
     }
-    return 0;
+    return -1;
 }
 
 GLint
@@ -164,7 +164,7 @@ __glGetPixelMap_size(GLenum map)
         query = GL_PIXEL_MAP_A_TO_A_SIZE;
         break;
     default:
-        return 0;
+        return -1;
     }
     glGetIntegerv(query, &size);
     return size;

hw/vfb/InitOutput.c

@@ -259,6 +259,13 @@ ddxGiveUp(enum ExitCode error)
     }
 }
 
+#ifdef __APPLE__
+void
+DarwinHandleGUI(int argc, char *argv[])
+{
+}
+#endif
+
 void
 OsVendorInit(void)
 {

hw/xfree86/compat/log.c

@@ -39,12 +39,7 @@ _X_EXPORT void xf86MsgVerb(MessageType type, int verb, const char *format, ...)
 void
 xf86MsgVerb(MessageType type, int verb, const char *format, ...)
 {
-    static char reportxf86MsgVerb = 1;
-
-    if (reportxf86MsgVerb) {
     xf86NVidiaBugInternalFunc("xf86MsgVerb()");
-        reportxf86MsgVerb = 0;
-    }
 
     va_list ap;
     va_start(ap, format);

hw/xnest/Init.c

@@ -154,6 +154,13 @@ ddxGiveUp(enum ExitCode error)
     xnestCloseDisplay();
 }
 
+#ifdef __APPLE__
+void
+DarwinHandleGUI(int argc, char *argv[])
+{
+}
+#endif
+
 void
 OsVendorInit(void)
 {

hw/xquartz/applewm.c

@@ -690,6 +690,7 @@ SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to)
 static int
 SProcAppleWMQueryVersion(register ClientPtr client)
 {
+    REQUEST(xAppleWMQueryVersionReq);
     return ProcAppleWMQueryVersion(client);
 }
 

hw/xquartz/mach-startup/bundle_trampoline.c

@@ -50,7 +50,7 @@
  * needs and simply execs the startup script which then execs the main binary.
  */
 
-static char *executable_path(void) {
+static char *executable_path() {
     uint32_t bufsize = PATH_MAX;
     char *buf = calloc(1, bufsize);
 

hw/xquartz/xpr/appledri.c

@@ -394,6 +394,7 @@ SNotifyEvent(xAppleDRINotifyEvent *from,
 static int
 SProcAppleDRIQueryVersion(register ClientPtr client)
 {
+    REQUEST(xAppleDRIQueryVersionReq);
     return ProcAppleDRIQueryVersion(client);
 }
 

meson.build

@@ -3,10 +3,10 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '25.0.0.4',
+        version: '25.0.0.2',
         meson_version: '>= 0.58.0',
 )
-release_date = '2025-07-04'
+release_date = '2025-06-30'
 
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')
@@ -777,8 +777,7 @@ endif
 
 subdir('hw')
 
-build_tests = get_option('tests') and host_machine.system() != 'windows'
-if build_tests
+if host_machine.system() != 'windows'
     subdir('test')
 endif
 

meson_options.txt

@@ -110,8 +110,6 @@ option('sha1', type: 'combo', choices: ['libc', 'CommonCrypto', 'CryptoAPI', 'li
        description: 'SHA1 implementation')
 option('xf86-input-inputtest', type: 'boolean', value: true,
        description: 'Test input driver support on Xorg')
-option('tests', type: 'boolean', value: true,
-       description: 'Build tests for the X server on platforms that support it')
 
 option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
 option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')

mi/meson.build

@@ -40,7 +40,7 @@ hdrs_mi = [
   'mizerarc.h',
 ]
 
-libxserver_mi = static_library('xserver_mi',
+libxserver_mi = static_library('libxserver_mi',
     srcs_mi,
     include_directories: inc,
     dependencies: [

mi/mipointer.c

@@ -141,7 +141,7 @@ miPointerInitialize(ScreenPtr pScreen,
     pScreenPriv->screenFuncs = screenFuncs;
     pScreenPriv->waitForUpdate = waitForUpdate;
     pScreenPriv->showTransparent = FALSE;
-    dixScreenHookPostClose(pScreen, miPointerCloseScreen);
+    dixScreenHookClose(pScreen, miPointerCloseScreen);
     dixSetPrivate(&pScreen->devPrivates, miPointerScreenKey, pScreenPriv);
     /*
      * set up screen cursor method table
@@ -169,7 +169,7 @@ static void miPointerCloseScreen(CallbackListPtr *pcbl, ScreenPtr pScreen, void
 {
     SetupScreen(pScreen);
 
-    dixScreenUnhookPostClose(pScreen, miPointerCloseScreen);
+    dixScreenUnhookClose(pScreen, miPointerCloseScreen);
     free((void *) pScreenPriv);
     dixSetPrivate(&pScreen->devPrivates, miPointerScreenKey, NULL);
     FreeEventList(mipointermove_events, GetMaximumEventsNum());

miext/damage/meson.build

@@ -7,7 +7,7 @@ hdrs_miext_damage = [
 	'damagestr.h',
 ]
 
-libxserver_miext_damage = static_library('xserver_miext_damage',
+libxserver_miext_damage = static_library('libxserver_miext_damage',
 	srcs_miext_damage,
 	include_directories: inc,
 	dependencies: common_dep,

miext/rootless/meson.build

@@ -6,7 +6,7 @@ srcs_miext_rootless = [
         'rootlessWindow.c',
 ]
 
-libxserver_miext_rootless = static_library('xserver_miext_rootless',
+libxserver_miext_rootless = static_library('libxserver_miext_rootless',
         srcs_miext_rootless,
         include_directories: inc,
         dependencies: common_dep,

miext/shadow/meson.build

@@ -29,7 +29,7 @@ hdrs_miext_shadow = [
     'shadow.h',
 ]
 
-libxserver_miext_shadow = static_library('xserver_miext_shadow',
+libxserver_miext_shadow = static_library('libxserver_miext_shadow',
     srcs_miext_shadow,
     include_directories: inc,
     dependencies: common_dep,

miext/sync/meson.build

@@ -14,7 +14,7 @@ if build_dri3
     srcs_miext_sync += 'misyncshm.c'
 endif
 
-libxserver_miext_sync = static_library('xserver_miext_sync',
+libxserver_miext_sync = static_library('libxserver_miext_sync',
     srcs_miext_sync,
     include_directories: inc,
     dependencies: [

os/meson.build

@@ -79,7 +79,7 @@ endif
 
 libxlibc = []
 if srcs_libc.length() > 0
-    libxlibc = static_library('xlibc',
+    libxlibc = static_library('libxlibc',
         srcs_libc,
         include_directories: inc,
         dependencies: [
@@ -92,7 +92,7 @@ if enable_input_thread
     os_dep += cc.find_library('pthread')
 endif
 
-libxserver_os = static_library('xserver_os',
+libxserver_os = static_library('libxserver_os',
     srcs_os,
     include_directories: inc,
     dependencies: [

present/meson.build

@@ -15,7 +15,7 @@ hdrs_present = [
     'present.h',
 ]
 
-libxserver_present = static_library('xserver_present',
+libxserver_present = static_library('libxserver_present',
     srcs_present,
     include_directories: inc,
     dependencies: [

pseudoramiX/meson.build

@@ -1,4 +1,4 @@
-libxserver_pseudoramix = static_library('xserver_pseudoramiX',
+libxserver_pseudoramix = static_library('libxserver_pseudoramiX',
     'pseudoramiX.c',
     include_directories: inc,
     dependencies: common_dep,

randr/meson.build

@@ -25,7 +25,7 @@ if build_xinerama
     srcs_randr += 'rrxinerama.c'
 endif
 
-libxserver_randr = static_library('xserver_randr',
+libxserver_randr = static_library('libxserver_randr',
     srcs_randr,
     include_directories: inc,
     dependencies: common_dep,

record/meson.build

@@ -3,7 +3,7 @@ srcs_record = [
 	'set.c',
 ]
 
-libxserver_record = static_library('xserver_record',
+libxserver_record = static_library('libxserver_record',
 	srcs_record,
 	include_directories: inc,
 	dependencies: common_dep,

render/meson.build

@@ -19,7 +19,7 @@ hdrs_render = [
     'picturestr.h',
 ]
 
-libxserver_render = static_library('xserver_render',
+libxserver_render = static_library('libxserver_render',
     srcs_render,
     include_directories: inc,
     dependencies: common_dep,

xfixes/meson.build

@@ -7,7 +7,7 @@ srcs_xfixes = [
     'xfixes.c',
 ]
 
-libxserver_xfixes = static_library('xserver_xfixes',
+libxserver_xfixes = static_library('libxserver_xfixes',
     srcs_xfixes,
     include_directories: inc,
     dependencies: common_dep,

xkb/meson.build

@@ -23,7 +23,7 @@ srcs_xkb = [
     'XKBMAlloc.c',
 ]
 
-libxserver_xkb = static_library('xserver_xkb',
+libxserver_xkb = static_library('libxserver_xkb',
     srcs_xkb,
     include_directories: inc,
     dependencies: common_dep,
@@ -35,7 +35,7 @@ srcs_xkb_stubs = [
     'ddxVT.c',
 ]
 
-libxserver_xkb_stubs = static_library('xserver_xkb_stubs',
+libxserver_xkb_stubs = static_library('libxserver_xkb_stubs',
     srcs_xkb_stubs,
     include_directories: inc,
     dependencies: common_dep,