From 048d15192af39ba5111882d18a957b6ff4e34cad Mon Sep 17 00:00:00 2001
From: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu, 22 Apr 2010 10:29:44 +0300
Subject: x-list.c: null-returning function malloc() was called without
 checking

Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 hw/xquartz/xpr/x-list.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/xquartz/xpr/x-list.c b/hw/xquartz/xpr/x-list.c
index 3596dd355..77c9309aa 100644
--- a/hw/xquartz/xpr/x-list.c
+++ b/hw/xquartz/xpr/x-list.c
@@ -97,6 +97,7 @@ X_PFX (list_prepend) (x_list *lst, void *data)
         int i;
 
         b = malloc (sizeof (x_list_block));
+        assert(b != NULL);
 
         for (i = 0; i < NODES_PER_BLOCK - 1; i++)
             b->l[i].next = &(b->l[i+1]);
-- 
cgit v1.2.3


From 4d3789c9b3fbe6aad32fcacd964353b612640f27 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun, 18 Apr 2010 01:22:27 -0700
Subject: rootless: Remove an unneeded comment

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 miext/rootless/rootlessWindow.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index e78e2c8f1..55c7b9689 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -1553,10 +1553,6 @@ RootlessDisableRoot (ScreenPtr pScreen)
 	return;
            
     RootlessDestroyFrame (pRoot, winRec);
-    /* 
-     * gstaplin: I fixed the usage of this DeleteProperty so that it would compile.
-     * QUESTION: Where is this xa_native_window_id set?
-     */
     DeleteProperty (serverClient, pRoot, xa_native_window_id ());
 }
 
-- 
cgit v1.2.3


From 7b506fdc840aebed6b5acb91437a2cb620b5bddc Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed, 21 Apr 2010 08:38:53 -0700
Subject: rootless: Add some sanity checking to miPaintWindow

This avoids painting the root window when it isn't actually drawable.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 mi/miexpose.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mi/miexpose.c b/mi/miexpose.c
index 1c9c3a436..f52b49211 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -552,6 +552,9 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
     DrawablePtr	drawable = &pWin->drawable;
 
 #ifdef ROOTLESS
+    if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
+	return;
+
     if(IsFramedWindow(pWin)) {
         RootlessStartDrawing(pWin);
         RootlessDamageRegion(pWin, prgn);
-- 
cgit v1.2.3


From 0efd7b8d82a48793341e27d4c224986e0971687c Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue, 27 Apr 2010 13:14:47 -0700
Subject: XQuartz GLX: Change around includes for better compatability with
 different OS versions

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 hw/xquartz/GL/indirect.c      | 2 ++
 hw/xquartz/GL/visualConfigs.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 70558ed20..ad9ebbdac 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -42,6 +42,8 @@
 #define GL_GLEXT_WUNDEF_SUPPORT
 
 #include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
 #include <OpenGL/CGLContext.h>
 
 /* These next few GL_EXT pre-processing blocks are to explicitly define 
diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
index bef27f048..cecc90265 100644
--- a/hw/xquartz/GL/visualConfigs.c
+++ b/hw/xquartz/GL/visualConfigs.c
@@ -35,9 +35,10 @@
 #include "dri.h"
 
 #include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
 #include <OpenGL/CGLContext.h>
 
-#include <GL/gl.h>
 #include <GL/glxproto.h>
 #include <windowstr.h>
 #include <resource.h>
-- 
cgit v1.2.3