From af0d5e2ef7b1b3f42e3522568c5f56850823c102 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat, 20 Sep 2008 19:41:46 -0700
Subject: [PATCH] XQuartz: 64bit crash fix ... don't pass pointers through xe.
 (cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)

---
 hw/xquartz/xpr/xprEvent.c  | 2 +-
 hw/xquartz/xpr/xprScreen.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/xquartz/xpr/xprEvent.c b/hw/xquartz/xpr/xprEvent.c
index 617d6e146..08581c0e3 100644
--- a/hw/xquartz/xpr/xprEvent.c
+++ b/hw/xquartz/xpr/xprEvent.c
@@ -73,7 +73,7 @@ static void xprEventHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int n
                 
             case kXquartzWindowMoved:
                 DEBUG_LOG("kXquartzWindowMoved\n");
-                RootlessNativeWindowMoved ((WindowPtr)xe[i].u.clientMessage.u.l.longs0);
+                RootlessNativeWindowMoved(xprGetXWindow(xe[i].u.clientMessage.u.l.longs0));
                 break;
                 
             case kXquartzBringAllToFront:
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index d8eb72a48..7d5303bdb 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -88,8 +88,7 @@ static void eventHandler(unsigned int type, const void *arg,
             DEBUG_LOG("XP_EVENT_WINDOW_MOVED\n");
             if (arg_size == sizeof(xp_window_id))  {
                 xp_window_id id = * (xp_window_id *) arg;
-                WindowPtr pWin = xprGetXWindow(id);
-                DarwinSendDDXEvent(kXquartzWindowMoved, 1, pWin);
+                DarwinSendDDXEvent(kXquartzWindowMoved, 1, id);
             }
             break;