xserver libX11 mesa git updaet 17 Mar 2011

5 files changed, 401 insertions, 362 deletions

diff --git a/xorg-server/hw/xfree86/man/xorg.conf.man b/xorg-server/hw/xfree86/man/xorg.conf.man
index e3fd0eadf..4bec31695 100644
--- a/xorg-server/hw/xfree86/man/xorg.conf.man
+++ b/xorg-server/hw/xfree86/man/xorg.conf.man
@@ -814,11 +814,18 @@ Example: the MIT-SHM extension can be disabled with the following entry:
 The config file may have multiple
 .B InputDevice
 sections.
-Recent X servers employ input hotplugging to add input devices, with the HAL
-backend being the default backend for X servers since 1.4. It is usually not
+Recent X servers employ HAL or udev backends for input device enumeration
+and input hotplugging. It is usually not
 necessary to provide
 .B InputDevice
-sections in the xorg.conf if hotplugging is enabled.
+sections in the xorg.conf if hotplugging is in use. If hotplugging is
+enabled,
+.B InputDevice
+sections using the
+.B mouse, kbd
+and
+.B vmmouse
+driver will be ignored.
 .PP
 If hotplugging is disabled, there will normally
 be at least two: one for the core (primary) keyboard
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h
index 422bae014..c6f86f544 100644
--- a/xorg-server/include/xkbsrv.h
+++ b/xorg-server/include/xkbsrv.h
@@ -447,6 +447,11 @@ extern _X_EXPORT void	XkbFreeKeyboard(
 	Bool			/* freeDesc */
 );
 
+extern _X_EXPORT void	XkbFreeComponentNames(
+	XkbComponentNamesPtr	/* names */,
+	Bool			/* freeNames */
+);
+
 extern _X_EXPORT  void XkbSetActionKeyMods(
 	XkbDescPtr		/* xkb */,
 	XkbAction *		/* act */,
diff --git a/xorg-server/xkb/XKBAlloc.c b/xorg-server/xkb/XKBAlloc.c
index 8c439ba0b..b70ac1705 100644
--- a/xorg-server/xkb/XKBAlloc.c
+++ b/xorg-server/xkb/XKBAlloc.c
@@ -1,335 +1,354 @@
-/************************************************************

-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.

-

-Permission to use, copy, modify, and distribute this

-software and its documentation for any purpose and without

-fee is hereby granted, provided that the above copyright

-notice appear in all copies and that both that copyright

-notice and this permission notice appear in supporting

-documentation, and that the name of Silicon Graphics not be 

-used in advertising or publicity pertaining to distribution 

-of the software without specific prior written permission.

-Silicon Graphics makes no representation about the suitability 

-of this software for any purpose. It is provided "as is"

-without any express or implied warranty.

-

-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 

-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 

-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 

-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 

-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH

-THE USE OR PERFORMANCE OF THIS SOFTWARE.

-

-********************************************************/

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <stdio.h>

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "misc.h"

-#include "inputstr.h"

-#include <xkbsrv.h>

-#include "xkbgeom.h"

-#include <os.h>

-#include <string.h>

-

-/***===================================================================***/

-

-/*ARGSUSED*/

-Status

-XkbAllocCompatMap(XkbDescPtr xkb,unsigned which,unsigned nSI)

-{

-XkbCompatMapPtr	compat;

-XkbSymInterpretRec *prev_interpret;

-

-    if (!xkb)

-	return BadMatch;

-    if (xkb->compat) {

-	if (xkb->compat->size_si>=nSI)

-	    return Success;

-	compat= xkb->compat;

-	compat->size_si= nSI;

-	if (compat->sym_interpret==NULL)

-	    compat->num_si= 0;

-	prev_interpret = compat->sym_interpret;

-	compat->sym_interpret= realloc(compat->sym_interpret,

-					nSI * sizeof(XkbSymInterpretRec));

-	if (compat->sym_interpret==NULL) {

-	    free(prev_interpret);

-	    compat->size_si= compat->num_si= 0;

-	    return BadAlloc;

-	}

-	if (compat->num_si!=0) {

-	    memset(&compat->sym_interpret[compat->num_si], 0,

-		   (compat->size_si - compat->num_si) * sizeof(XkbSymInterpretRec));

-	}

-	return Success;

-    }

-   compat= calloc(1, sizeof(XkbCompatMapRec));

-    if (compat==NULL)

-	return BadAlloc;

-    if (nSI>0) {

-	compat->sym_interpret= calloc(nSI, sizeof(XkbSymInterpretRec));

-	if (!compat->sym_interpret) {

-	    free(compat);

-	    return BadAlloc;

-	}

-    }

-    compat->size_si= nSI;

-    compat->num_si= 0;

-    memset((char *)&compat->groups[0], 0, XkbNumKbdGroups*sizeof(XkbModsRec));

-    xkb->compat= compat;

-    return Success;

-}

-

-

-void

-XkbFreeCompatMap(XkbDescPtr xkb,unsigned which,Bool freeMap)

-{

-register XkbCompatMapPtr compat;

-

-    if ((xkb==NULL)||(xkb->compat==NULL))

-	return;

-    compat= xkb->compat;

-    if (freeMap)

-	which= XkbAllCompatMask;

-    if (which&XkbGroupCompatMask)

-	memset((char *)&compat->groups[0], 0, XkbNumKbdGroups*sizeof(XkbModsRec));

-    if (which&XkbSymInterpMask) {

-	if ((compat->sym_interpret)&&(compat->size_si>0))

-	    free(compat->sym_interpret);

-	compat->size_si= compat->num_si= 0;

-	compat->sym_interpret= NULL;

-    }

-    if (freeMap) {

-	free(compat);

-	xkb->compat= NULL;

-    }

-    return;

-}

-

-/***===================================================================***/

-

-Status

-XkbAllocNames(XkbDescPtr xkb,unsigned which,int nTotalRG,int nTotalAliases)

-{

-XkbNamesPtr	names;

-

-    if (xkb==NULL)

-	return BadMatch;

-    if (xkb->names==NULL) {

-	xkb->names = calloc(1, sizeof(XkbNamesRec));

-	if (xkb->names==NULL)

-	    return BadAlloc;

-    }

-    names= xkb->names;

-    if ((which&XkbKTLevelNamesMask)&&(xkb->map!=NULL)&&(xkb->map->types!=NULL)){

-	register int	i;

-	XkbKeyTypePtr	type;

-

-	type= xkb->map->types;

-	for (i=0;i<xkb->map->num_types;i++,type++) {

-	    if (type->level_names==NULL) {

-		type->level_names= calloc(type->num_levels, sizeof(Atom));

-		if (type->level_names==NULL)

-		    return BadAlloc;

-	    }

-	}

-    }

-    if ((which&XkbKeyNamesMask)&&(names->keys==NULL)) {

-	if ((!XkbIsLegalKeycode(xkb->min_key_code))||

-	    (!XkbIsLegalKeycode(xkb->max_key_code))||

-	    (xkb->max_key_code<xkb->min_key_code)) 

-	    return BadValue;

-	names->keys= calloc((xkb->max_key_code+1), sizeof(XkbKeyNameRec));

-	if (names->keys==NULL)

-	    return BadAlloc;

-    }

-    if ((which&XkbKeyAliasesMask)&&(nTotalAliases>0)) {

-	if (names->key_aliases==NULL) {

-	    names->key_aliases= calloc(nTotalAliases, sizeof(XkbKeyAliasRec));

-	}

-	else if (nTotalAliases>names->num_key_aliases) {

-	    XkbKeyAliasRec *prev_aliases = names->key_aliases;

-

-	    names->key_aliases= realloc(names->key_aliases,

-					 nTotalAliases * sizeof(XkbKeyAliasRec));

-	    if (names->key_aliases!=NULL) {

-		memset(&names->key_aliases[names->num_key_aliases], 0,

-			(nTotalAliases - names->num_key_aliases) * sizeof(XkbKeyAliasRec));

-	    } else {

-		free(prev_aliases);

-	    }

-	}

-	if (names->key_aliases==NULL) {

-	    names->num_key_aliases= 0;

-	    return BadAlloc;

-	}

-	names->num_key_aliases= nTotalAliases;

-    }

-    if ((which&XkbRGNamesMask)&&(nTotalRG>0)) {

-	if (names->radio_groups==NULL) {

-	    names->radio_groups= calloc(nTotalRG, sizeof(Atom));

-	}

-	else if (nTotalRG>names->num_rg) {

-	    Atom *prev_radio_groups = names->radio_groups;

-

-	    names->radio_groups= realloc(names->radio_groups,

-					  nTotalRG * sizeof(Atom));

-	    if (names->radio_groups!=NULL) {

-		memset(&names->radio_groups[names->num_rg], 0,

-			(nTotalRG - names->num_rg) * sizeof(Atom));

-	    } else {

-		free(prev_radio_groups);

-	    }

-	}

-	if (names->radio_groups==NULL)

-	    return BadAlloc;

-	names->num_rg= nTotalRG;

-    }

-    return Success;

-}

-

-void

-XkbFreeNames(XkbDescPtr xkb,unsigned which,Bool freeMap)

-{

-XkbNamesPtr	names;

-

-    if ((xkb==NULL)||(xkb->names==NULL))

-	return;

-    names= xkb->names;

-    if (freeMap)

-	which= XkbAllNamesMask; 

-    if (which&XkbKTLevelNamesMask) {

-	XkbClientMapPtr	map= xkb->map;

-	if ((map!=NULL)&&(map->types!=NULL)) {

-	    register int 		i;

-	    register XkbKeyTypePtr	type;

-	    type= map->types;

-	    for (i=0;i<map->num_types;i++,type++) {

-		free(type->level_names);

-		type->level_names = NULL;

-	    }

-	}

-    }

-    if ((which&XkbKeyNamesMask)&&(names->keys!=NULL)) {

-	free(names->keys);

-	names->keys= NULL;

-	names->num_keys= 0;

-    }

-    if ((which&XkbKeyAliasesMask)&&(names->key_aliases)){

-	free(names->key_aliases);

-	names->key_aliases=NULL;

-	names->num_key_aliases=0;

-    }

-    if ((which&XkbRGNamesMask)&&(names->radio_groups)) {

-	free(names->radio_groups);

-	names->radio_groups= NULL;

-	names->num_rg= 0;

-    }

-    if (freeMap) {

-	free(names);

-	xkb->names= NULL;

-    }

-    return;

-}

-

-/***===================================================================***/

-

-/*ARGSUSED*/

-Status

-XkbAllocControls(XkbDescPtr xkb,unsigned which)

-{

-    if (xkb==NULL)

-	return BadMatch;

-

-    if (xkb->ctrls==NULL) {

-	xkb->ctrls= calloc(1, sizeof(XkbControlsRec));

-	if (!xkb->ctrls)

-	    return BadAlloc;

-    }

-    return Success;

-}

-

-/*ARGSUSED*/

-static void

-XkbFreeControls(XkbDescPtr xkb,unsigned which,Bool freeMap)

-{

-    if (freeMap && (xkb!=NULL) && (xkb->ctrls!=NULL)) {

-	free(xkb->ctrls);

-	xkb->ctrls= NULL;

-    }

-    return;

-}

-

-/***===================================================================***/

-

-Status

-XkbAllocIndicatorMaps(XkbDescPtr xkb)

-{

-    if (xkb==NULL)

-	return BadMatch;

-    if (xkb->indicators==NULL) {

-	xkb->indicators= calloc(1, sizeof(XkbIndicatorRec));

-	if (!xkb->indicators)

-	    return BadAlloc;

-    }

-    return Success;

-}

-

-static void

-XkbFreeIndicatorMaps(XkbDescPtr xkb)

-{

-    if ((xkb!=NULL)&&(xkb->indicators!=NULL)) {

-	free(xkb->indicators);

-	xkb->indicators= NULL;

-    }

-    return;

-}

-

-/***====================================================================***/

-

-XkbDescRec	*

-XkbAllocKeyboard(void)

-{

-XkbDescRec *xkb;

-

-    xkb = calloc(1, sizeof(XkbDescRec));

-    if (xkb)

-	xkb->device_spec= XkbUseCoreKbd;

-    return xkb;

-}

-

-void

-XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll)

-{

-    if (xkb==NULL)

-	return;

-    if (freeAll)

-	which= XkbAllComponentsMask;

-    if (which&XkbClientMapMask)

-	XkbFreeClientMap(xkb,XkbAllClientInfoMask,TRUE);

-    if (which&XkbServerMapMask)

-	XkbFreeServerMap(xkb,XkbAllServerInfoMask,TRUE);

-    if (which&XkbCompatMapMask)

-	XkbFreeCompatMap(xkb,XkbAllCompatMask,TRUE);

-    if (which&XkbIndicatorMapMask)

-	XkbFreeIndicatorMaps(xkb);

-    if (which&XkbNamesMask)

-	XkbFreeNames(xkb,XkbAllNamesMask,TRUE);

-    if ((which&XkbGeometryMask) && (xkb->geom!=NULL)) {

-	XkbFreeGeometry(xkb->geom,XkbGeomAllMask,TRUE);

-        /* PERHAPS BONGHITS etc */

-        xkb->geom = NULL;

-    }

-    if (which&XkbControlsMask)

-	XkbFreeControls(xkb,XkbAllControlsMask,TRUE);

-    if (freeAll)

-	free(xkb);

-    return;

-}

+/************************************************************
+Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be 
+used in advertising or publicity pertaining to distribution 
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability 
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdio.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "misc.h"
+#include "inputstr.h"
+#include <xkbsrv.h>
+#include "xkbgeom.h"
+#include <os.h>
+#include <string.h>
+
+/***===================================================================***/
+
+/*ARGSUSED*/
+Status
+XkbAllocCompatMap(XkbDescPtr xkb,unsigned which,unsigned nSI)
+{
+XkbCompatMapPtr	compat;
+XkbSymInterpretRec *prev_interpret;
+
+    if (!xkb)
+	return BadMatch;
+    if (xkb->compat) {
+	if (xkb->compat->size_si>=nSI)
+	    return Success;
+	compat= xkb->compat;
+	compat->size_si= nSI;
+	if (compat->sym_interpret==NULL)
+	    compat->num_si= 0;
+	prev_interpret = compat->sym_interpret;
+	compat->sym_interpret= realloc(compat->sym_interpret,
+					nSI * sizeof(XkbSymInterpretRec));
+	if (compat->sym_interpret==NULL) {
+	    free(prev_interpret);
+	    compat->size_si= compat->num_si= 0;
+	    return BadAlloc;
+	}
+	if (compat->num_si!=0) {
+	    memset(&compat->sym_interpret[compat->num_si], 0,
+		   (compat->size_si - compat->num_si) * sizeof(XkbSymInterpretRec));
+	}
+	return Success;
+    }
+   compat= calloc(1, sizeof(XkbCompatMapRec));
+    if (compat==NULL)
+	return BadAlloc;
+    if (nSI>0) {
+	compat->sym_interpret= calloc(nSI, sizeof(XkbSymInterpretRec));
+	if (!compat->sym_interpret) {
+	    free(compat);
+	    return BadAlloc;
+	}
+    }
+    compat->size_si= nSI;
+    compat->num_si= 0;
+    memset((char *)&compat->groups[0], 0, XkbNumKbdGroups*sizeof(XkbModsRec));
+    xkb->compat= compat;
+    return Success;
+}
+
+
+void
+XkbFreeCompatMap(XkbDescPtr xkb,unsigned which,Bool freeMap)
+{
+register XkbCompatMapPtr compat;
+
+    if ((xkb==NULL)||(xkb->compat==NULL))
+	return;
+    compat= xkb->compat;
+    if (freeMap)
+	which= XkbAllCompatMask;
+    if (which&XkbGroupCompatMask)
+	memset((char *)&compat->groups[0], 0, XkbNumKbdGroups*sizeof(XkbModsRec));
+    if (which&XkbSymInterpMask) {
+	if ((compat->sym_interpret)&&(compat->size_si>0))
+	    free(compat->sym_interpret);
+	compat->size_si= compat->num_si= 0;
+	compat->sym_interpret= NULL;
+    }
+    if (freeMap) {
+	free(compat);
+	xkb->compat= NULL;
+    }
+    return;
+}
+
+/***===================================================================***/
+
+Status
+XkbAllocNames(XkbDescPtr xkb,unsigned which,int nTotalRG,int nTotalAliases)
+{
+XkbNamesPtr	names;
+
+    if (xkb==NULL)
+	return BadMatch;
+    if (xkb->names==NULL) {
+	xkb->names = calloc(1, sizeof(XkbNamesRec));
+	if (xkb->names==NULL)
+	    return BadAlloc;
+    }
+    names= xkb->names;
+    if ((which&XkbKTLevelNamesMask)&&(xkb->map!=NULL)&&(xkb->map->types!=NULL)){
+	register int	i;
+	XkbKeyTypePtr	type;
+
+	type= xkb->map->types;
+	for (i=0;i<xkb->map->num_types;i++,type++) {
+	    if (type->level_names==NULL) {
+		type->level_names= calloc(type->num_levels, sizeof(Atom));
+		if (type->level_names==NULL)
+		    return BadAlloc;
+	    }
+	}
+    }
+    if ((which&XkbKeyNamesMask)&&(names->keys==NULL)) {
+	if ((!XkbIsLegalKeycode(xkb->min_key_code))||
+	    (!XkbIsLegalKeycode(xkb->max_key_code))||
+	    (xkb->max_key_code<xkb->min_key_code)) 
+	    return BadValue;
+	names->keys= calloc((xkb->max_key_code+1), sizeof(XkbKeyNameRec));
+	if (names->keys==NULL)
+	    return BadAlloc;
+    }
+    if ((which&XkbKeyAliasesMask)&&(nTotalAliases>0)) {
+	if (names->key_aliases==NULL) {
+	    names->key_aliases= calloc(nTotalAliases, sizeof(XkbKeyAliasRec));
+	}
+	else if (nTotalAliases>names->num_key_aliases) {
+	    XkbKeyAliasRec *prev_aliases = names->key_aliases;
+
+	    names->key_aliases= realloc(names->key_aliases,
+					 nTotalAliases * sizeof(XkbKeyAliasRec));
+	    if (names->key_aliases!=NULL) {
+		memset(&names->key_aliases[names->num_key_aliases], 0,
+			(nTotalAliases - names->num_key_aliases) * sizeof(XkbKeyAliasRec));
+	    } else {
+		free(prev_aliases);
+	    }
+	}
+	if (names->key_aliases==NULL) {
+	    names->num_key_aliases= 0;
+	    return BadAlloc;
+	}
+	names->num_key_aliases= nTotalAliases;
+    }
+    if ((which&XkbRGNamesMask)&&(nTotalRG>0)) {
+	if (names->radio_groups==NULL) {
+	    names->radio_groups= calloc(nTotalRG, sizeof(Atom));
+	}
+	else if (nTotalRG>names->num_rg) {
+	    Atom *prev_radio_groups = names->radio_groups;
+
+	    names->radio_groups= realloc(names->radio_groups,
+					  nTotalRG * sizeof(Atom));
+	    if (names->radio_groups!=NULL) {
+		memset(&names->radio_groups[names->num_rg], 0,
+			(nTotalRG - names->num_rg) * sizeof(Atom));
+	    } else {
+		free(prev_radio_groups);
+	    }
+	}
+	if (names->radio_groups==NULL)
+	    return BadAlloc;
+	names->num_rg= nTotalRG;
+    }
+    return Success;
+}
+
+void
+XkbFreeNames(XkbDescPtr xkb,unsigned which,Bool freeMap)
+{
+XkbNamesPtr	names;
+
+    if ((xkb==NULL)||(xkb->names==NULL))
+	return;
+    names= xkb->names;
+    if (freeMap)
+	which= XkbAllNamesMask; 
+    if (which&XkbKTLevelNamesMask) {
+	XkbClientMapPtr	map= xkb->map;
+	if ((map!=NULL)&&(map->types!=NULL)) {
+	    register int 		i;
+	    register XkbKeyTypePtr	type;
+	    type= map->types;
+	    for (i=0;i<map->num_types;i++,type++) {
+		free(type->level_names);
+		type->level_names = NULL;
+	    }
+	}
+    }
+    if ((which&XkbKeyNamesMask)&&(names->keys!=NULL)) {
+	free(names->keys);
+	names->keys= NULL;
+	names->num_keys= 0;
+    }
+    if ((which&XkbKeyAliasesMask)&&(names->key_aliases)){
+	free(names->key_aliases);
+	names->key_aliases=NULL;
+	names->num_key_aliases=0;
+    }
+    if ((which&XkbRGNamesMask)&&(names->radio_groups)) {
+	free(names->radio_groups);
+	names->radio_groups= NULL;
+	names->num_rg= 0;
+    }
+    if (freeMap) {
+	free(names);
+	xkb->names= NULL;
+    }
+    return;
+}
+
+/***===================================================================***/
+
+/*ARGSUSED*/
+Status
+XkbAllocControls(XkbDescPtr xkb,unsigned which)
+{
+    if (xkb==NULL)
+	return BadMatch;
+
+    if (xkb->ctrls==NULL) {
+	xkb->ctrls= calloc(1, sizeof(XkbControlsRec));
+	if (!xkb->ctrls)
+	    return BadAlloc;
+    }
+    return Success;
+}
+
+/*ARGSUSED*/
+static void
+XkbFreeControls(XkbDescPtr xkb,unsigned which,Bool freeMap)
+{
+    if (freeMap && (xkb!=NULL) && (xkb->ctrls!=NULL)) {
+	free(xkb->ctrls);
+	xkb->ctrls= NULL;
+    }
+    return;
+}
+
+/***===================================================================***/
+
+Status
+XkbAllocIndicatorMaps(XkbDescPtr xkb)
+{
+    if (xkb==NULL)
+	return BadMatch;
+    if (xkb->indicators==NULL) {
+	xkb->indicators= calloc(1, sizeof(XkbIndicatorRec));
+	if (!xkb->indicators)
+	    return BadAlloc;
+    }
+    return Success;
+}
+
+static void
+XkbFreeIndicatorMaps(XkbDescPtr xkb)
+{
+    if ((xkb!=NULL)&&(xkb->indicators!=NULL)) {
+	free(xkb->indicators);
+	xkb->indicators= NULL;
+    }
+    return;
+}
+
+/***====================================================================***/
+
+XkbDescRec	*
+XkbAllocKeyboard(void)
+{
+XkbDescRec *xkb;
+
+    xkb = calloc(1, sizeof(XkbDescRec));
+    if (xkb)
+	xkb->device_spec= XkbUseCoreKbd;
+    return xkb;
+}
+
+void
+XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll)
+{
+    if (xkb==NULL)
+	return;
+    if (freeAll)
+	which= XkbAllComponentsMask;
+    if (which&XkbClientMapMask)
+	XkbFreeClientMap(xkb,XkbAllClientInfoMask,TRUE);
+    if (which&XkbServerMapMask)
+	XkbFreeServerMap(xkb,XkbAllServerInfoMask,TRUE);
+    if (which&XkbCompatMapMask)
+	XkbFreeCompatMap(xkb,XkbAllCompatMask,TRUE);
+    if (which&XkbIndicatorMapMask)
+	XkbFreeIndicatorMaps(xkb);
+    if (which&XkbNamesMask)
+	XkbFreeNames(xkb,XkbAllNamesMask,TRUE);
+    if ((which&XkbGeometryMask) && (xkb->geom!=NULL)) {
+	XkbFreeGeometry(xkb->geom,XkbGeomAllMask,TRUE);
+        /* PERHAPS BONGHITS etc */
+        xkb->geom = NULL;
+    }
+    if (which&XkbControlsMask)
+	XkbFreeControls(xkb,XkbAllControlsMask,TRUE);
+    if (freeAll)
+	free(xkb);
+    return;
+}
+
+
+/***====================================================================***/
+
+void
+XkbFreeComponentNames(XkbComponentNamesPtr names, Bool freeNames)
+{
+    if (names)
+    {
+        free(names->keycodes);
+        free(names->types);
+        free(names->compat);
+        free(names->symbols);
+        free(names->geometry);
+        memset(names, 0, sizeof(XkbComponentNamesRec));
+    }
+    if (freeNames)
+        free(names);
+}
diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c
index dc3c844c9..e1020358a 100644
--- a/xorg-server/xkb/ddxLoad.c
+++ b/xorg-server/xkb/ddxLoad.c
@@ -447,23 +447,23 @@ XkbRMLVOtoKcCGST(DeviceIntPtr dev, XkbRMLVOSet *rmlvo, XkbComponentNamesPtr kccg
 static XkbDescPtr
 XkbCompileKeymapForDevice(DeviceIntPtr dev, XkbRMLVOSet *rmlvo, int need)
 {
-    XkbDescPtr xkb;
+    XkbDescPtr xkb = NULL;
     unsigned int provided;
-    XkbComponentNamesRec kccgst;
+    XkbComponentNamesRec kccgst = {0};
     char name[PATH_MAX];
 
-    if (!XkbRMLVOtoKcCGST(dev, rmlvo, &kccgst))
-        return NULL;
-
-    provided = XkbDDXLoadKeymapByNames(dev, &kccgst, XkmAllIndicesMask, need,
-                                       &xkb, name, PATH_MAX);
-    if ((need & provided) != need) {
-        if (xkb) {
-            XkbFreeKeyboard(xkb, 0, TRUE);
-            xkb = NULL;
+    if (XkbRMLVOtoKcCGST(dev, rmlvo, &kccgst)) {
+        provided = XkbDDXLoadKeymapByNames(dev, &kccgst, XkmAllIndicesMask, need,
+                                           &xkb, name, PATH_MAX);
+        if ((need & provided) != need) {
+            if (xkb) {
+                XkbFreeKeyboard(xkb, 0, TRUE);
+                xkb = NULL;
+            }
         }
     }
 
+    XkbFreeComponentNames(&kccgst, FALSE);
     return xkb;
 }
 
diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index d701ea13c..4044d333d 100644
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -4307,10 +4307,21 @@ ProcXkbSetNames(ClientPtr client)
 
 #define	XkbSizeCountedString(s)  ((s)?((((2+strlen(s))+3)/4)*4):4)
 
+/**
+ * Write the zero-terminated string str into wire as a pascal string with a
+ * 16-bit length field prefixed before the actual string.
+ *
+ * @param wire The destination array, usually the wire struct
+ * @param str The source string as zero-terminated C string
+ * @param swap If TRUE, the length field is swapped.
+ *
+ * @return The input string in the format <string length><string> with a
+ * (swapped) 16 bit string length, non-zero terminated.
+ */
 static char *
 XkbWriteCountedString(char *wire,char *str,Bool swap)
 {
-    CARD16 len,*pLen;
+    CARD16 len,*pLen, paddedLen;
 
     if (!str)
         return wire;
@@ -4322,8 +4333,9 @@ XkbWriteCountedString(char *wire,char *str,Bool swap)
 	register int n;
 	swaps(pLen,n);
     }
-    memcpy(&wire[2],str,len);
-    wire+= ((2+len+3)/4)*4;
+    paddedLen= pad_to_int32(sizeof(len)+len)-sizeof(len);
+    strncpy(&wire[sizeof(len)],str,paddedLen);
+    wire+= sizeof(len)+paddedLen;
     return wire;
 }
 
@@ -4434,6 +4446,7 @@ xkbShapeWireDesc *	shapeWire;
 	if (shape->approx!=NULL)
 	     shapeWire->approxNdx= XkbOutlineIndex(shape,shape->approx);
 	else shapeWire->approxNdx= XkbNoShape;
+	shapeWire->pad= 0;
 	if (swap) {
 	    register int n;
 	    swapl(&shapeWire->name,n);
@@ -4446,6 +4459,7 @@ xkbShapeWireDesc *	shapeWire;
 	    olWire= (xkbOutlineWireDesc *)wire;
 	    olWire->nPoints= ol->num_points;
 	    olWire->cornerRadius= ol->corner_radius;
+	    olWire->pad= 0;
 	    wire= (char *)&olWire[1];
 	    ptWire= (xkbPointWireDesc *)wire;
 	    for (p=0,pt=ol->points;p<ol->num_points;p++,pt++) {
@@ -4559,6 +4573,8 @@ xkbOverlayWireDesc *	olWire;
    olWire= (xkbOverlayWireDesc *)wire;
    olWire->name= ol->name;
    olWire->nRows= ol->num_rows;
+   olWire->pad1= 0;
+   olWire->pad2= 0;
    if (swap) {
 	register int n;
 	swapl(&olWire->name,n);
@@ -4571,6 +4587,7 @@ xkbOverlayWireDesc *	olWire;
 	rowWire= (xkbOverlayRowWireDesc *)wire;
 	rowWire->rowUnder= row->row_under;
 	rowWire->nKeys= row->num_keys;
+	rowWire->pad1= 0;
 	wire= (char *)&rowWire[1];
 	for (k=0,key=row->keys;k<row->num_keys;k++,key++) {
 	    xkbOverlayKeyWireDesc *	keyWire;
@@ -5895,16 +5912,7 @@ ProcXkbGetKbdByName(ClientPtr client)
 	XkbFreeKeyboard(new,XkbAllComponentsMask,TRUE);
 	new= NULL;
     }
-    free(names.keycodes);
-    names.keycodes = NULL;
-    free(names.types);
-    names.types = NULL;
-    free(names.compat);
-    names.compat = NULL;
-    free(names.symbols);
-    names.symbols = NULL;
-    free(names.geometry);
-    names.geometry = NULL;
+    XkbFreeComponentNames(&names, FALSE);
     return Success;
 }