diff options
author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-09-20 19:41:46 -0700 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-09-21 17:40:42 -0700 |
commit | af0d5e2ef7b1b3f42e3522568c5f56850823c102 (patch) | |
tree | 5573b49814726c9b832a9e72caba7d057a29306b /hw | |
parent | 852a0b0dde34e7179394d96d09122b99bf7fe904 (diff) |
XQuartz: 64bit crash fix ... don't pass pointers through xe.
(cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)
Diffstat (limited to 'hw')
-rw-r--r-- | hw/xquartz/xpr/xprEvent.c | 2 | ||||
-rw-r--r-- | 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; |