From 372977354c3a09ca77ca13ba0aec00a61046f60d Mon Sep 17 00:00:00 2001 From: George Staplin Date: Wed, 18 Feb 2009 21:43:19 -0700 Subject: [PATCH] XQuartz: Fix the new ProcAppleDRIDestroyPixmap code REQUEST_SIZE_MATCH. It had a copy and paste mistake that I didn't notice. :/ It was using the CreatePixmapReq. Also add a missing B16 to the end of the length for the DestroyPixmapReq struct. Now the AppleDRIDestroyPixmap request seem to work. (cherry picked from commit 295fe25bd8fa2d141291a9d9b6ef7b75fcccb4dd) --- hw/xquartz/xpr/appledri.c | 2 +- hw/xquartz/xpr/appledristr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c index a57f2802a..4d1a82fcc 100644 --- a/hw/xquartz/xpr/appledri.c +++ b/hw/xquartz/xpr/appledri.c @@ -331,7 +331,7 @@ ProcAppleDRIDestroyPixmap(ClientPtr client) DrawablePtr pDrawable; int rc; REQUEST(xAppleDRIDestroyPixmapReq); - REQUEST_SIZE_MATCH(xAppleDRICreatePixmapReq); + REQUEST_SIZE_MATCH(xAppleDRIDestroyPixmapReq); rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0, DixReadAccess); diff --git a/hw/xquartz/xpr/appledristr.h b/hw/xquartz/xpr/appledristr.h index bcac03a3b..a3844f090 100644 --- a/hw/xquartz/xpr/appledristr.h +++ b/hw/xquartz/xpr/appledristr.h @@ -226,7 +226,7 @@ typedef struct { typedef struct { CARD8 reqType; /*1*/ CARD8 driReqType; /*2*/ - CARD16 length; /*4*/ + CARD16 length B16; /*4*/ CARD32 drawable B32; /*8*/ } xAppleDRIDestroyPixmapReq;