xserver: Branch 'server-1.10-branch' - 3 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sat Oct 29 00:09:04 PDT 2011
hw/xquartz/applewm.c | 4 +++-
hw/xquartz/xpr/appledri.c | 4 +++-
hw/xwin/winwindowswm.c | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit e3a24febc4bb84b77aea14f8d7a174e5a8614d6c
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Tue Oct 25 23:53:43 2011 -0700
XWin: windowswm: Correct byte swapping in event notifications
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Jon TURNEY <jon.turney at dronecode.org.uk>
(cherry picked from commit 286fa9bf9b4ffb0f9dbd3f1cae46ddcb27ee9318)
diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index 7138409..f5d27e5 100644
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -629,9 +629,11 @@ winWindowsWMExtensionInit (void)
NULL,
StandardMinorOpcode)))
{
+ size_t i;
WMReqCode = (unsigned char)extEntry->base;
WMErrorBase = extEntry->errorBase;
WMEventBase = extEntry->eventBase;
- EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
+ for (i=0; i < WindowsWMNumberEvents; i++)
+ EventSwapVector[WMEventBase + i] = (EventSwapPtr) SNotifyEvent;
}
}
commit fa85f7811e8bd121eb91caa5cc4fcb7d38e93c16
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Tue Oct 25 23:49:33 2011 -0700
XQuartz: appledri: Correct byte swapping in event notifications
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
(cherry picked from commit dc054fefc586c5b404fe0f949dbd456e5267c647)
diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index 129fc78..80955fe 100644
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@@ -541,9 +541,11 @@ AppleDRIExtensionInit(void)
SProcAppleDRIDispatch,
AppleDRIResetProc,
StandardMinorOpcode))) {
+ size_t i;
DRIReqCode = (unsigned char)extEntry->base;
DRIErrorBase = extEntry->errorBase;
DRIEventBase = extEntry->eventBase;
- EventSwapVector[DRIEventBase] = (EventSwapPtr) SNotifyEvent;
+ for (i=0; i < AppleDRINumberEvents; i++)
+ EventSwapVector[DRIEventBase + i] = (EventSwapPtr) SNotifyEvent;
}
}
commit 1a9346f62ca5c6af81bb32aadefd3c97125ae1da
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Tue Oct 25 23:48:16 2011 -0700
XQuartz: applewm: Correct byte swapping in event notifications
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
(cherry picked from commit d5fee2b638fabeb8bec31a24e57d5c2a232d0893)
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index ec20534..e52094b 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -727,10 +727,12 @@ AppleWMExtensionInit(
NULL,
StandardMinorOpcode)))
{
+ size_t i;
WMReqCode = (unsigned char)extEntry->base;
WMErrorBase = extEntry->errorBase;
WMEventBase = extEntry->eventBase;
- EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
+ for (i=0; i < AppleWMNumberEvents; i++)
+ EventSwapVector[WMEventBase + i] = (EventSwapPtr) SNotifyEvent;
appleWMProcs = procsPtr;
}
}
More information about the xorg-commit
mailing list