svn merge ^/branches/released .

4 files changed, 6 insertions, 5 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
index 384f08103..1b9253269 100644
--- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c
+++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
@@ -120,7 +120,7 @@ FreeList(const char ***list, int *lines)
     int i;

 

     for (i = 0; i < *lines; i++) {

-	free((*list)[i]);

+	free((char *)((*list)[i]));

     }

     free(*list);

     *list = NULL;

diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index fb6f9673d..0e7be4dd7 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -83,7 +83,7 @@ typedef enum {
  */

 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)

 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(9, 0)

-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 0)

+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 1)

 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)

 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)

 

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index 50ea6ca9e..0aa6f2cf4 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -325,13 +325,14 @@ VGAarbiterGetSpans (
 static void

 VGAarbiterSourceValidate (

     DrawablePtr pDrawable,

-    int x, int y, int width, int height )

+    int x, int y, int width, int height,

+    unsigned int subWindowMode )

 {

     ScreenPtr   pScreen = pDrawable->pScreen;

     SCREEN_PROLOG (SourceValidate);

     VGAGet(pScreen);

     if (pScreen->SourceValidate)

-    (*pScreen->SourceValidate) (pDrawable, x, y, width, height);

+    (*pScreen->SourceValidate) (pDrawable, x, y, width, height, subWindowMode);

     VGAPut();

     SCREEN_EPILOG (SourceValidate, VGAarbiterSourceValidate);

 }

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index 0107a4952..13fde5e79 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -149,7 +149,7 @@ static void VGAarbiterGetImage (DrawablePtr pDrawable, int sx, int sy, int w,
 static void VGAarbiterGetSpans (DrawablePtr pDrawable, int wMax, DDXPointPtr

     ppt, int *pwidth, int nspans, char  *pdstStart);

 static void VGAarbiterSourceValidate (DrawablePtr pDrawable, int x, int y,

-    int width, int height);

+    int width, int height, unsigned int subWindowMode);

 static void VGAarbiterCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,

     RegionPtr prgnSrc);

 static void VGAarbiterClearToBackground (WindowPtr pWin, int x, int y, int w,