xserver: Branch 'xorg-server-1.4-apple' - 2 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Wed Apr 1 13:07:35 PDT 2009
hw/xquartz/applewm.c | 11 ++++++-----
hw/xquartz/xpr/appledristr.h | 5 ++++-
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 49871e99179d5176a1ec516c8f449e2dc219faea
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Wed Apr 1 13:07:15 2009 -0700
XQuartz: Return BadRequest when SendPSN isn't implemented rather than success
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index ae1f876..70cd47c 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -512,11 +512,12 @@ ProcAppleWMSendPSN(register ClientPtr client)
REQUEST_SIZE_MATCH(xAppleWMSendPSNReq);
- if(appleWMProcs->SendPSN) {
- err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);
- if (err != Success) {
- return err;
- }
+ if(!appleWMProcs->SendPSN)
+ return BadRequest;
+
+ err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);
+ if (err != Success) {
+ return err;
}
return (client->noClientException);
commit 276ee3bb087c772f57a987519aa4d94afeceadaa
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Wed Apr 1 12:46:51 2009 -0700
XQuartz: Pad xAppleDRINotifyEvent to 32bytes to match sizeof(xEvent)
diff --git a/hw/xquartz/xpr/appledristr.h b/hw/xquartz/xpr/appledristr.h
index a3844f0..c569719 100644
--- a/hw/xquartz/xpr/appledristr.h
+++ b/hw/xquartz/xpr/appledristr.h
@@ -157,8 +157,11 @@ typedef struct _AppleDRINotify {
CARD32 pad1 B32;
CARD32 arg B32;
CARD32 pad3 B32;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
} xAppleDRINotifyEvent;
-#define sz_xAppleDRINotifyEvent 20
+#define sz_xAppleDRINotifyEvent 32
typedef struct {
More information about the xorg-commit
mailing list