svn merge ^/branches/released .

12 files changed, 306 insertions, 267 deletions

diff --git a/xorg-server/damageext/damageext.c b/xorg-server/damageext/damageext.c
index 2b1514872..dfd8ebfd0 100644
--- a/xorg-server/damageext/damageext.c
+++ b/xorg-server/damageext/damageext.c
@@ -223,7 +223,7 @@ ProcDamageCreate (ClientPtr client)
     if (pDrawable->type == DRAWABLE_WINDOW)

     {

 	pRegion = &((WindowPtr) pDrawable)->borderClip;

-	DamageDamageRegion(pDrawable, pRegion);

+	DamageReportDamage(pDamageExt->pDamage, pRegion);

     }

 

     return Success;

diff --git a/xorg-server/dix/cursor.c b/xorg-server/dix/cursor.c
index acd118a1c..4d5d51619 100644
--- a/xorg-server/dix/cursor.c
+++ b/xorg-server/dix/cursor.c
@@ -241,11 +241,8 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
     *ppCurs = NULL;

     pCurs = (CursorPtr)calloc(CURSOR_REC_SIZE + CURSOR_BITS_SIZE, 1);

     if (!pCurs)

-    {

-	free(psrcbits);

-	free(pmaskbits);

 	return BadAlloc;

-    }

+

     bits = (CursorBitsPtr)((char *)pCurs + CURSOR_REC_SIZE);

     dixInitPrivates(pCurs, pCurs + 1, PRIVATE_CURSOR);

     dixInitPrivates(bits, bits + 1, PRIVATE_CURSOR_BITS)

diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 5e1c858b6..14775c35c 100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -3017,11 +3017,17 @@ ProcCreateCursor (ClientPtr client)
 			 &pCursor, client, stuff->cid);

 

     if (rc != Success)

-	return rc;

-    if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))

-	return BadAlloc;

+	goto bail;

+    if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) {

+	rc = BadAlloc;

+	goto bail;

+    }

 

     return Success;

+bail:

+    free(srcbits);

+    free(mskbits);

+    return rc;

 }

 

 int

diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c
index 8115075b3..416842473 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.c
+++ b/xorg-server/hw/xfree86/common/xf86xv.c
@@ -313,6 +313,7 @@ xf86XVFreeAdaptor(XvAdaptorPtr pAdaptor)
    int i;

 

    free(pAdaptor->name);

+   pAdaptor->name = NULL;

 

    if(pAdaptor->pEncodings) {

       XvEncodingPtr pEncode = pAdaptor->pEncodings;

@@ -320,9 +321,11 @@ xf86XVFreeAdaptor(XvAdaptorPtr pAdaptor)
       for(i = 0; i < pAdaptor->nEncodings; i++, pEncode++)

 	  free(pEncode->name);

       free(pAdaptor->pEncodings);

+      pAdaptor->pEncodings = NULL;

    }

 

    free(pAdaptor->pFormats);

+   pAdaptor->pFormats = NULL;

 

    if(pAdaptor->pPorts) {

       XvPortPtr pPort = pAdaptor->pPorts;

@@ -341,18 +344,22 @@ xf86XVFreeAdaptor(XvAdaptorPtr pAdaptor)
 	  }

       }

       free(pAdaptor->pPorts);

+      pAdaptor->pPorts = NULL;

    }

 

-   if(pAdaptor->nAttributes) {

+   if(pAdaptor->pAttributes) {

       XvAttributePtr pAttribute = pAdaptor->pAttributes;

 

       for(i = 0; i < pAdaptor->nAttributes; i++, pAttribute++)

 	  free(pAttribute->name);

       free(pAdaptor->pAttributes);

+      pAdaptor->pAttributes = NULL;

    }

 

    free(pAdaptor->pImages);

    free(pAdaptor->devPriv.ptr);

+   pAdaptor->pImages = NULL;

+   pAdaptor->devPriv.ptr = NULL;

 }

 

 static Bool

diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 3e59887db..cf231c1f0 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -483,19 +483,15 @@ LoaderListDirs(const char **subdirlist, const char **patternlist)
     char *fp;

     char **listing = NULL;

     char **save;

+    char **ret = NULL;

     int n = 0;

 

     if (!(pathlist = InitPathList(NULL)))

 	return NULL;

-    if (!(subdirs = InitSubdirs(subdirlist))) {

-	FreePathList(pathlist);

-	return NULL;

-    }

-    if (!(patterns = InitPatterns(patternlist))) {

-	FreePathList(pathlist);

-	FreeSubdirs(subdirs);

-	return NULL;

-    }

+    if (!(subdirs = InitSubdirs(subdirlist)))

+	goto bail;

+    if (!(patterns = InitPatterns(patternlist)))

+	goto bail;

 

     for (elem = pathlist; *elem; elem++) {

 	for (s = subdirs; *s; s++) {

@@ -529,20 +525,14 @@ LoaderListDirs(const char **subdirlist, const char **patternlist)
 				    save[n] = NULL;

 				    FreeStringList(save);

 				}

-				FreePathList(pathlist);

-				FreeSubdirs(subdirs);

-				FreePatterns(patterns);

 				closedir(d);

-				return NULL;

+				goto bail;

 			    }

 			    listing[n] = malloc(len + 1);

 			    if (!listing[n]) {

 				FreeStringList(listing);

-				FreePathList(pathlist);

-				FreeSubdirs(subdirs);

-				FreePatterns(patterns);

 				closedir(d);

-				return NULL;

+				goto bail;

 			    }

 			    strncpy(listing[n], dp->d_name + match[1].rm_so,

 				    len);

@@ -558,11 +548,13 @@ LoaderListDirs(const char **subdirlist, const char **patternlist)
     }

     if (listing)

 	listing[n] = NULL;

+    ret = listing;

 

-    FreePathList(pathlist);

-    FreeSubdirs(subdirs);

+bail:

     FreePatterns(patterns);

-    return listing;

+    FreeSubdirs(subdirs);

+    FreePathList(pathlist);

+    return ret;

 }

 

 void

diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c
index d7c244e21..de7b53543 100644
--- a/xorg-server/miext/damage/damage.c
+++ b/xorg-server/miext/damage/damage.c
@@ -121,54 +121,6 @@ getDrawableDamageRef (DrawablePtr pDrawable)
 	dixLookupPrivateAddr(&(pWindow)->devPrivates, damageWinPrivateKey)

 

 static void

-damageReportDamage (DamagePtr pDamage, RegionPtr pDamageRegion)

-{

-    BoxRec tmpBox;

-    RegionRec tmpRegion;

-    Bool was_empty;

-

-    switch (pDamage->damageLevel) {

-    case DamageReportRawRegion:

-	RegionUnion(&pDamage->damage, &pDamage->damage,

-			 pDamageRegion);

-	(*pDamage->damageReport) (pDamage, pDamageRegion, pDamage->closure);

-	break;

-    case DamageReportDeltaRegion:

-	RegionNull(&tmpRegion);

-	RegionSubtract(&tmpRegion, pDamageRegion, &pDamage->damage);

-	if (RegionNotEmpty(&tmpRegion)) {

-	    RegionUnion(&pDamage->damage, &pDamage->damage,

-			 pDamageRegion);

-	    (*pDamage->damageReport) (pDamage, &tmpRegion, pDamage->closure);

-	}

-	RegionUninit(&tmpRegion);

-	break;

-    case DamageReportBoundingBox:

-	tmpBox = *RegionExtents(&pDamage->damage);

-	RegionUnion(&pDamage->damage, &pDamage->damage,

-		     pDamageRegion);

-	if (!BOX_SAME (&tmpBox, RegionExtents(&pDamage->damage))) {

-	    (*pDamage->damageReport) (pDamage, &pDamage->damage,

-				      pDamage->closure);

-	}

-	break;

-    case DamageReportNonEmpty:

-	was_empty = !RegionNotEmpty(&pDamage->damage);

-	RegionUnion(&pDamage->damage, &pDamage->damage,

-		     pDamageRegion);

-	if (was_empty && RegionNotEmpty(&pDamage->damage)) {

-	    (*pDamage->damageReport) (pDamage, &pDamage->damage,

-				      pDamage->closure);

-	}

-	break;

-    case DamageReportNone:

-	RegionUnion(&pDamage->damage, &pDamage->damage,

-		     pDamageRegion);

-	break;

-    }

-}

-

-static void

 damageReportDamagePostRendering (DamagePtr pDamage, RegionPtr pOldDamage, RegionPtr pDamageRegion)

 {

     BoxRec tmpBox;

@@ -360,7 +312,7 @@ damageRegionAppend (DrawablePtr pDrawable, RegionPtr pRegion, Bool clip,
 	/* Report damage now, if desired. */

 	if (!pDamage->reportAfter) {

 	    if (pDamage->damageReport)

-		damageReportDamage (pDamage, pDamageRegion);

+		DamageReportDamage (pDamage, pDamageRegion);

 	    else

 		RegionUnion(&pDamage->damage,

 			 &pDamage->damage, pDamageRegion);

@@ -393,7 +345,7 @@ damageRegionProcessPending (DrawablePtr pDrawable)
 	if (pDamage->reportAfter) {

 	    /* It's possible that there is only interest in postRendering reporting. */

 	    if (pDamage->damageReport)

-		damageReportDamage (pDamage, &pDamage->pendingDamage);

+		DamageReportDamage (pDamage, &pDamage->pendingDamage);

 	    else

 		RegionUnion(&pDamage->damage, &pDamage->damage,

 			&pDamage->pendingDamage);

@@ -2125,3 +2077,52 @@ DamageGetScreenFuncs (ScreenPtr pScreen)
     damageScrPriv(pScreen);

     return &pScrPriv->funcs;

 }

+

+void

+DamageReportDamage (DamagePtr pDamage, RegionPtr pDamageRegion)

+{

+    BoxRec tmpBox;

+    RegionRec tmpRegion;

+    Bool was_empty;

+

+    switch (pDamage->damageLevel) {

+    case DamageReportRawRegion:

+	RegionUnion(&pDamage->damage, &pDamage->damage,

+			 pDamageRegion);

+	(*pDamage->damageReport) (pDamage, pDamageRegion, pDamage->closure);

+	break;

+    case DamageReportDeltaRegion:

+	RegionNull(&tmpRegion);

+	RegionSubtract(&tmpRegion, pDamageRegion, &pDamage->damage);

+	if (RegionNotEmpty(&tmpRegion)) {

+	    RegionUnion(&pDamage->damage, &pDamage->damage,

+			 pDamageRegion);

+	    (*pDamage->damageReport) (pDamage, &tmpRegion, pDamage->closure);

+	}

+	RegionUninit(&tmpRegion);

+	break;

+    case DamageReportBoundingBox:

+	tmpBox = *RegionExtents(&pDamage->damage);

+	RegionUnion(&pDamage->damage, &pDamage->damage,

+		     pDamageRegion);

+	if (!BOX_SAME (&tmpBox, RegionExtents(&pDamage->damage))) {

+	    (*pDamage->damageReport) (pDamage, &pDamage->damage,

+				      pDamage->closure);

+	}

+	break;

+    case DamageReportNonEmpty:

+	was_empty = !RegionNotEmpty(&pDamage->damage);

+	RegionUnion(&pDamage->damage, &pDamage->damage,

+		     pDamageRegion);

+	if (was_empty && RegionNotEmpty(&pDamage->damage)) {

+	    (*pDamage->damageReport) (pDamage, &pDamage->damage,

+				      pDamage->closure);

+	}

+	break;

+    case DamageReportNone:

+	RegionUnion(&pDamage->damage, &pDamage->damage,

+		     pDamageRegion);

+	break;

+    }

+}

+

diff --git a/xorg-server/miext/damage/damage.h b/xorg-server/miext/damage/damage.h
index 067016f38..d2a032986 100644
--- a/xorg-server/miext/damage/damage.h
+++ b/xorg-server/miext/damage/damage.h
@@ -1,128 +1,132 @@
-/*
- * Copyright © 2003 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, 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 Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD 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
-
-#ifndef _DAMAGE_H_
-#define _DAMAGE_H_
-
-typedef struct _damage	*DamagePtr;
-
-typedef enum _damageReportLevel {
-    DamageReportRawRegion,
-    DamageReportDeltaRegion,
-    DamageReportBoundingBox,
-    DamageReportNonEmpty,
-    DamageReportNone
-} DamageReportLevel;
-
-typedef void (*DamageReportFunc) (DamagePtr pDamage, RegionPtr pRegion, void *closure);
-typedef void (*DamageDestroyFunc) (DamagePtr pDamage, void *closure);
-/* It's the responsibility of the driver to duplicate both regions. */
-/* At some point DamageRegionRendered() must be called. */
-typedef void (*DamageMarkerFunc) (DrawablePtr pDrawable, DamagePtr pDamage, RegionPtr pOldDamage, RegionPtr pRegion, void *closure);
-
-typedef void (*DamageScreenCreateFunc) (DamagePtr);
-typedef void (*DamageScreenRegisterFunc) (DrawablePtr, DamagePtr);
-typedef void (*DamageScreenUnregisterFunc) (DrawablePtr, DamagePtr);
-typedef void (*DamageScreenDestroyFunc) (DamagePtr);
-
-typedef struct _damageScreenFuncs {
-    DamageScreenCreateFunc      Create;
-    DamageScreenRegisterFunc    Register;
-    DamageScreenUnregisterFunc  Unregister;
-    DamageScreenDestroyFunc     Destroy;
-} DamageScreenFuncsRec, *DamageScreenFuncsPtr;
-
-extern _X_EXPORT void miDamageCreate (DamagePtr);
-extern _X_EXPORT void miDamageRegister (DrawablePtr, DamagePtr);
-extern _X_EXPORT void miDamageUnregister (DrawablePtr, DamagePtr);
-extern _X_EXPORT void miDamageDestroy (DamagePtr);
-
-extern _X_EXPORT Bool
-DamageSetup (ScreenPtr pScreen);
-    
-extern _X_EXPORT DamagePtr
-DamageCreate (DamageReportFunc  damageReport,
-	      DamageDestroyFunc	damageDestroy,
-	      DamageReportLevel damageLevel,
-	      Bool		isInternal,
-	      ScreenPtr		pScreen,
-	      void *		closure);
-
-extern _X_EXPORT void
-DamageDrawInternal (ScreenPtr pScreen, Bool enable);
-
-extern _X_EXPORT void
-DamageRegister (DrawablePtr	pDrawable,
-		DamagePtr	pDamage);
-
-extern _X_EXPORT void
-DamageUnregister (DrawablePtr	pDrawable,
-		  DamagePtr	pDamage);
-
-extern _X_EXPORT void
-DamageDestroy (DamagePtr pDamage);
-
-extern _X_EXPORT Bool
-DamageSubtract (DamagePtr	    pDamage,
-		const RegionPtr	    pRegion);
-
-extern _X_EXPORT void
-DamageEmpty (DamagePtr pDamage);
-
-extern _X_EXPORT RegionPtr
-DamageRegion (DamagePtr		    pDamage);
-
-extern _X_EXPORT RegionPtr
-DamagePendingRegion (DamagePtr	    pDamage);
-
-/* In case of rendering, call this before the submitting the commands. */
-extern _X_EXPORT void
-DamageRegionAppend (DrawablePtr pDrawable, RegionPtr pRegion);
-
-/* Call this directly after the rendering operation has been submitted. */
-extern _X_EXPORT void
-DamageRegionProcessPending (DrawablePtr pDrawable);
-
-/* Call this some time after rendering is done, only relevant when a damageMarker is provided. */
-extern _X_EXPORT void
-DamageRegionRendered (DrawablePtr pDrawable, DamagePtr pDamage, RegionPtr pOldDamage, RegionPtr pRegion);
-
-/* Avoid using this call, it only exists for API compatibility. */
-extern _X_EXPORT void
-DamageDamageRegion (DrawablePtr	    pDrawable,
-		    const RegionPtr pRegion);
-
-extern _X_EXPORT void
-DamageSetReportAfterOp (DamagePtr pDamage, Bool reportAfter);
-
-extern _X_EXPORT void
-DamageSetPostRenderingFunctions(DamagePtr pDamage, DamageReportFunc damageReportPostRendering,
-				DamageMarkerFunc damageMarker);
-
-extern _X_EXPORT DamageScreenFuncsPtr
-DamageGetScreenFuncs (ScreenPtr);
-
-#endif /* _DAMAGE_H_ */
+/*

+ * Copyright © 2003 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, 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 Keith Packard not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Keith Packard makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL KEITH PACKARD 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

+

+#ifndef _DAMAGE_H_

+#define _DAMAGE_H_

+

+typedef struct _damage	*DamagePtr;

+

+typedef enum _damageReportLevel {

+    DamageReportRawRegion,

+    DamageReportDeltaRegion,

+    DamageReportBoundingBox,

+    DamageReportNonEmpty,

+    DamageReportNone

+} DamageReportLevel;

+

+typedef void (*DamageReportFunc) (DamagePtr pDamage, RegionPtr pRegion, void *closure);

+typedef void (*DamageDestroyFunc) (DamagePtr pDamage, void *closure);

+/* It's the responsibility of the driver to duplicate both regions. */

+/* At some point DamageRegionRendered() must be called. */

+typedef void (*DamageMarkerFunc) (DrawablePtr pDrawable, DamagePtr pDamage, RegionPtr pOldDamage, RegionPtr pRegion, void *closure);

+

+typedef void (*DamageScreenCreateFunc) (DamagePtr);

+typedef void (*DamageScreenRegisterFunc) (DrawablePtr, DamagePtr);

+typedef void (*DamageScreenUnregisterFunc) (DrawablePtr, DamagePtr);

+typedef void (*DamageScreenDestroyFunc) (DamagePtr);

+

+typedef struct _damageScreenFuncs {

+    DamageScreenCreateFunc      Create;

+    DamageScreenRegisterFunc    Register;

+    DamageScreenUnregisterFunc  Unregister;

+    DamageScreenDestroyFunc     Destroy;

+} DamageScreenFuncsRec, *DamageScreenFuncsPtr;

+

+extern _X_EXPORT void miDamageCreate (DamagePtr);

+extern _X_EXPORT void miDamageRegister (DrawablePtr, DamagePtr);

+extern _X_EXPORT void miDamageUnregister (DrawablePtr, DamagePtr);

+extern _X_EXPORT void miDamageDestroy (DamagePtr);

+

+extern _X_EXPORT Bool

+DamageSetup (ScreenPtr pScreen);

+    

+extern _X_EXPORT DamagePtr

+DamageCreate (DamageReportFunc  damageReport,

+	      DamageDestroyFunc	damageDestroy,

+	      DamageReportLevel damageLevel,

+	      Bool		isInternal,

+	      ScreenPtr		pScreen,

+	      void *		closure);

+

+extern _X_EXPORT void

+DamageDrawInternal (ScreenPtr pScreen, Bool enable);

+

+extern _X_EXPORT void

+DamageRegister (DrawablePtr	pDrawable,

+		DamagePtr	pDamage);

+

+extern _X_EXPORT void

+DamageUnregister (DrawablePtr	pDrawable,

+		  DamagePtr	pDamage);

+

+extern _X_EXPORT void

+DamageDestroy (DamagePtr pDamage);

+

+extern _X_EXPORT Bool

+DamageSubtract (DamagePtr	    pDamage,

+		const RegionPtr	    pRegion);

+

+extern _X_EXPORT void

+DamageEmpty (DamagePtr pDamage);

+

+extern _X_EXPORT RegionPtr

+DamageRegion (DamagePtr		    pDamage);

+

+extern _X_EXPORT RegionPtr

+DamagePendingRegion (DamagePtr	    pDamage);

+

+/* In case of rendering, call this before the submitting the commands. */

+extern _X_EXPORT void

+DamageRegionAppend (DrawablePtr pDrawable, RegionPtr pRegion);

+

+/* Call this directly after the rendering operation has been submitted. */

+extern _X_EXPORT void

+DamageRegionProcessPending (DrawablePtr pDrawable);

+

+/* Call this some time after rendering is done, only relevant when a damageMarker is provided. */

+extern _X_EXPORT void

+DamageRegionRendered (DrawablePtr pDrawable, DamagePtr pDamage, RegionPtr pOldDamage, RegionPtr pRegion);

+

+/* Call this when you create a new Damage and you wish to send an initial damage message (to it). */

+extern _X_EXPORT void

+DamageReportDamage (DamagePtr pDamage, RegionPtr pDamageRegion);

+

+/* Avoid using this call, it only exists for API compatibility. */

+extern _X_EXPORT void

+DamageDamageRegion (DrawablePtr	    pDrawable,

+		    const RegionPtr pRegion);

+

+extern _X_EXPORT void

+DamageSetReportAfterOp (DamagePtr pDamage, Bool reportAfter);

+

+extern _X_EXPORT void

+DamageSetPostRenderingFunctions(DamagePtr pDamage, DamageReportFunc damageReportPostRendering,

+				DamageMarkerFunc damageMarker);

+

+extern _X_EXPORT DamageScreenFuncsPtr

+DamageGetScreenFuncs (ScreenPtr);

+

+#endif /* _DAMAGE_H_ */

diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index da195df39..6e6f9fc33 100644
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -881,15 +881,14 @@ EstablishNewConnections(ClientPtr clientUnused, pointer closure)
 

 	_XSERVTransSetOption(new_trans_conn, TRANS_NONBLOCKING, 1);

 

+	if(trans_conn->flags & TRANS_NOXAUTH)

+	    new_trans_conn->flags = new_trans_conn->flags | TRANS_NOXAUTH;

+

 	if (!AllocNewConnection (new_trans_conn, newconn, connect_time))

 	{

 	    ErrorConnMax(new_trans_conn);

 	    _XSERVTransClose(new_trans_conn);

 	}

-

-	if(trans_conn->flags & TRANS_NOXAUTH)

-	    new_trans_conn->flags = new_trans_conn->flags | TRANS_NOXAUTH;

-

       }

 #ifndef WIN32

     }

diff --git a/xorg-server/randr/rrdispatch.c b/xorg-server/randr/rrdispatch.c
index a4927bd14..272bbc4df 100644
--- a/xorg-server/randr/rrdispatch.c
+++ b/xorg-server/randr/rrdispatch.c
@@ -146,7 +146,7 @@ ProcRRSelectInput (ClientPtr client)
 	/*

 	 * Now see if the client needs an event

 	 */

-	if (pScrPriv && (pRREvent->mask & RRScreenChangeNotifyMask))

+	if (pScrPriv)

 	{

 	    pTimes = &((RRTimesPtr) (pRRClient + 1))[pScreen->myNum];

 	    if (CompareTimeStamps (pTimes->setTime, 

@@ -154,7 +154,35 @@ ProcRRSelectInput (ClientPtr client)
 		CompareTimeStamps (pTimes->configTime, 

 				   pScrPriv->lastConfigTime) != 0)

 	    {

-		RRDeliverScreenEvent (client, pWin, pScreen);

+		if (pRREvent->mask & RRScreenChangeNotifyMask)

+		{

+		    RRDeliverScreenEvent (client, pWin, pScreen);

+		}

+

+		if (pRREvent->mask & RRCrtcChangeNotifyMask)

+		{

+		    int i;

+

+		    for (i = 0; i < pScrPriv->numCrtcs; i++)

+		    {

+			RRDeliverCrtcEvent (client, pWin, pScrPriv->crtcs[i]);

+		    }

+		}

+

+		if (pRREvent->mask & RROutputChangeNotifyMask)

+		{

+		    int i;

+

+		    for (i = 0; i < pScrPriv->numOutputs; i++)

+		    {

+			RRDeliverOutputEvent (client, pWin, pScrPriv->outputs[i]);

+		    }

+		}

+

+		/* We don't check for RROutputPropertyNotifyMask, as randrproto.txt doesn't

+		 * say if there ought to be notifications of changes to output properties

+		 * if those changes occurred before the time RRSelectInput is called.

+		 */

 	    }

 	}

     }

diff --git a/xorg-server/render/render.c b/xorg-server/render/render.c
index 5ba661da0..33fcc1562 100644
--- a/xorg-server/render/render.c
+++ b/xorg-server/render/render.c
@@ -1705,11 +1705,17 @@ ProcRenderCreateCursor (ClientPtr client)
 			 GetColor(twocolor[1], 0),

 			 &pCursor, client, stuff->cid);

     if (rc != Success)

-	return rc;

-    if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))

-	return BadAlloc;

+	goto bail;

+    if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) {

+	rc = BadAlloc;

+	goto bail;

+    }

 

     return Success;

+bail:

+    free(srcbits);

+    free(mskbits);

+    return rc;

 }

 

 static int

diff --git a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
index be2a2bc40..0a976c233 100644
--- a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
+++ b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
@@ -1,50 +1,49 @@
-ben	basic		in	ben
-ben	probhat		in	ben_probhat	
-dev	basic		in	deva
-dvorak	$dvoraklayouts	%v	dvorak
-dvorak	basic		us	dvorak
-dvorak	pl_basic	pl	dvorak
-dvorak	pl		pl	dvorak_quotes
-dvorak	pl_altquotes	pl	dvorak_altquotes
-dzdwi	basic		bt	basic
-fi	basic		fi	classic
-ge	azerty_tskapo	fr	geo
-guj	basic		in	guj
-gur	basic		in	guru
-ie	laptop		ie	basic
-ie	CloGaelachLaptop	ie	CloGaelach
-il	si1452		ie	basic
-in	urd		in	urd-phonetic
-iu	basic		ca	ike
-lo	basic		la	basic
-kan	basic		in	kan
-mal	basic		in	mal
-mal	mlplusnum	in	mal
-ogham	basic		ie	ogam
-ogham	laptop		ie	ogam
-ogham	is434		ie	ogam_is434
-ogham	is434laptop	ie	ogam_is434
-ori	basic		in	ori
-ro	de		ro	winkeys
-ro	us		ro	std
-ro	academic	ro	std
-ro	std_comma	ro	std
-ro	comma		ro	basic	
-ru	os		ru	os_legacy
-pk	urd		pk	urd-phonetic
-sapmi	basic		no	smi
-sapmi	nodeadkeys	no	smi_nodeadkeys
-sapmi	sefi		fi	smi
-sin	phonetic-static	in	sin_phonetic	
-syr	basic		sy	syc
-syr	phonetic	sy	syc_phonetic
-tam	INSCRIPT	in	tam
-tam	UNI		in	tam_unicode
-tam     NUMERAL-KEYBOARD    in      tam_keyboard_with_numerals
-tam	TAB		in	tam_TAB
-tam	TSCII		in	tam_TSCII
-tel	basic		in	tel
-yu	basic		srp	latin
-yu	unicode		srp	latinunicode
-yu	yz		srp	latinyz
-yu	unicodeyz	srp	latinunicodeyz
+ben	basic		in	ben

+ben	probhat		in	ben_probhat	

+dev	basic		in	deva

+dvorak	$dvoraklayouts	%v	dvorak

+dvorak	basic		us	dvorak

+dvorak	pl_basic	pl	dvorak

+dvorak	pl		pl	dvorak_quotes

+dvorak	pl_altquotes	pl	dvorak_altquotes

+dzdwi	basic		bt	basic

+fi	basic		fi	classic

+ge	azerty_tskapo	fr	geo

+guj	basic		in	guj

+gur	basic		in	guru

+ie	laptop		ie	basic

+ie	CloGaelachLaptop	ie	CloGaelach

+in	urd		in	urd-phonetic

+iu	basic		ca	ike

+lo	basic		la	basic

+kan	basic		in	kan

+mal	basic		in	mal

+mal	mlplusnum	in	mal

+ogham	basic		ie	ogam

+ogham	laptop		ie	ogam

+ogham	is434		ie	ogam_is434

+ogham	is434laptop	ie	ogam_is434

+ori	basic		in	ori

+ro	de		ro	winkeys

+ro	us		ro	std

+ro	academic	ro	std

+ro	std_comma	ro	std

+ro	comma		ro	basic	

+ru	os		ru	os_legacy

+pk	urd		pk	urd-phonetic

+sapmi	basic		no	smi

+sapmi	nodeadkeys	no	smi_nodeadkeys

+sapmi	sefi		fi	smi

+sin	phonetic-static	in	sin_phonetic	

+syr	basic		sy	syc

+syr	phonetic	sy	syc_phonetic

+tam	INSCRIPT	in	tam

+tam	UNI		in	tam_unicode

+tam     NUMERAL-KEYBOARD    in      tam_keyboard_with_numerals

+tam	TAB		in	tam_TAB

+tam	TSCII		in	tam_TSCII

+tel	basic		in	tel

+yu	basic		srp	latin

+yu	unicode		srp	latinunicode

+yu	yz		srp	latinyz

+yu	unicodeyz	srp	latinunicodeyz

diff --git a/xorg-server/xkeyboard-config/symbols/hu b/xorg-server/xkeyboard-config/symbols/hu
index 41ba681e8..842cc8402 100644
--- a/xorg-server/xkeyboard-config/symbols/hu
+++ b/xorg-server/xkeyboard-config/symbols/hu
@@ -425,7 +425,7 @@ xkb_symbols "def_common" {
     key <AB06>  { [            n,            N,        braceright                  ] };

     key <AB07>  { [            m,            M,              less                  ] };

     key <AB08>  { [        comma,     question,         semicolon                  ] };

-    key <AB09>  { [       period,        colon,          ellipsis                  ] };

+    key <AB09>  { [       period,        colon,           greater                  ] };

     key <AB10>  { [        minus,   underscore,          asterisk                  ] };

 

 };