From c529873d9e7265634fd5223e727f58eb2d0c1a27 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 Nov 2017 22:00:44 +0100 Subject: Lift dbe to xorg-xserver-7.1/1.1.0 state --- nx-X11/programs/Xserver/dbe/dbe.c | 4 ++-- nx-X11/programs/Xserver/dbe/midbe.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 85a22219f..0860801dd 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -228,7 +228,7 @@ DbeFallbackAllocWinPriv(pScreen) *****************************************************************************/ static int -DbeAllocWinPrivPrivIndex() +DbeAllocWinPrivPrivIndex(void) { return winPrivPrivCount++; @@ -1812,7 +1812,7 @@ DbeDestroyWindow(pWin) *****************************************************************************/ void -DbeExtensionInit() +DbeExtensionInit(void) { ExtensionEntry *extEntry; register int i, j; diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index e241e5f28..b0054201c 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -53,6 +53,7 @@ #include "regionstr.h" #include "gcstruct.h" #include "inputstr.h" +#include "midbe.h" #include @@ -780,6 +781,11 @@ miDbeResetProc(pScreen) } /* miDbeResetProc() */ +static void +miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer) +{ +} + /****************************************************************************** * @@ -840,7 +846,7 @@ miDbeInit(pScreen, pDbeScreenPriv) pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete; /* The mi implementation doesn't need buffer validation. */ - pDbeScreenPriv->ValidateBuffer = (void (*)())NoopDDA; + pDbeScreenPriv->ValidateBuffer = miDbeNopValidateBuffer; return(TRUE); -- cgit v1.2.3 From 4c5e9a295230362ef072132cdc0f5b92150fc2b9 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Feb 2018 06:11:56 +0100 Subject: Lift dbe to xorg-xserver-7.1/1.1.0 state - non-functional changes only --- nx-X11/programs/Xserver/dbe/dbe.c | 87 +++++++++++-------------------------- nx-X11/programs/Xserver/dbe/midbe.c | 33 ++++---------- 2 files changed, 34 insertions(+), 86 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 0860801dd..89df0889e 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -100,10 +100,7 @@ static Bool firstRegistrationPass = TRUE; *****************************************************************************/ void -DbeValidateBuffer(pWin, drawID, dstbuf) - WindowPtr pWin; - XID drawID; - Bool dstbuf; +DbeValidateBuffer(WindowPtr pWin, XID drawID, Bool dstbuf) { DbeScreenPrivPtr pDbeScreenPriv = DBE_SCREEN_PRIV_FROM_WINDOW(pWin); if (pDbeScreenPriv->ValidateBuffer) @@ -122,9 +119,7 @@ DbeValidateBuffer(pWin, drawID, dstbuf) *****************************************************************************/ void -DbeRegisterFunction(pScreen, funct) - ScreenPtr pScreen; - Bool (*funct)(); +DbeRegisterFunction(ScreenPtr pScreen, Bool (*funct) (/* ??? */)) { int i; @@ -158,8 +153,7 @@ DbeRegisterFunction(pScreen, funct) * *****************************************************************************/ static DbeWindowPrivPtr -DbeAllocWinPriv(pScreen) - ScreenPtr pScreen; +DbeAllocWinPriv(ScreenPtr pScreen) { DbeWindowPrivPtr pDbeWindowPriv; DbeScreenPrivPtr pDbeScreenPriv; @@ -248,10 +242,7 @@ DbeAllocWinPrivPrivIndex(void) *****************************************************************************/ static Bool -DbeAllocWinPrivPriv(pScreen, index, amount) - register ScreenPtr pScreen; - int index; - unsigned int amount; +DbeAllocWinPrivPriv(register ScreenPtr pScreen, int index, unsigned int amount) { DbeScreenPrivPtr pDbeScreenPriv; unsigned int oldamount; @@ -302,9 +293,7 @@ DbeAllocWinPrivPriv(pScreen, index, amount) *****************************************************************************/ static void -DbeStubScreen(pDbeScreenPriv, nStubbedScreens) - DbeScreenPrivPtr pDbeScreenPriv; - int *nStubbedScreens; +DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int *nStubbedScreens) { /* Stub DIX. */ pDbeScreenPriv->SetupBackgroundPainter = NULL; @@ -351,8 +340,7 @@ DbeStubScreen(pDbeScreenPriv, nStubbedScreens) *****************************************************************************/ static int -ProcDbeGetVersion(client) - ClientPtr client; +ProcDbeGetVersion(ClientPtr client) { /* REQUEST(xDbeGetVersionReq); */ xDbeGetVersionReply rep; @@ -401,8 +389,7 @@ ProcDbeGetVersion(client) *****************************************************************************/ static int -ProcDbeAllocateBackBufferName(client) - ClientPtr client; +ProcDbeAllocateBackBufferName(ClientPtr client) { REQUEST(xDbeAllocateBackBufferNameReq); WindowPtr pWin; @@ -636,8 +623,7 @@ ProcDbeAllocateBackBufferName(client) *****************************************************************************/ static int -ProcDbeDeallocateBackBufferName(client) - ClientPtr client; +ProcDbeDeallocateBackBufferName(ClientPtr client) { REQUEST(xDbeDeallocateBackBufferNameReq); DbeWindowPrivPtr pDbeWindowPriv; @@ -708,8 +694,7 @@ ProcDbeDeallocateBackBufferName(client) *****************************************************************************/ static int -ProcDbeSwapBuffers(client) - ClientPtr client; +ProcDbeSwapBuffers(ClientPtr client) { REQUEST(xDbeSwapBuffersReq); WindowPtr pWin; @@ -839,8 +824,7 @@ ProcDbeSwapBuffers(client) *****************************************************************************/ static int -ProcDbeBeginIdiom(client) - ClientPtr client; +ProcDbeBeginIdiom(ClientPtr client) { /* REQUEST(xDbeBeginIdiomReq); */ DbeScreenPrivPtr pDbeScreenPriv; @@ -883,8 +867,7 @@ ProcDbeBeginIdiom(client) *****************************************************************************/ static int -ProcDbeGetVisualInfo(client) - ClientPtr client; +ProcDbeGetVisualInfo(ClientPtr client) { REQUEST(xDbeGetVisualInfoReq); DbeScreenPrivPtr pDbeScreenPriv; @@ -1062,8 +1045,7 @@ ProcDbeGetVisualInfo(client) *****************************************************************************/ static int -ProcDbeGetBackBufferAttributes(client) - ClientPtr client; +ProcDbeGetBackBufferAttributes(ClientPtr client) { REQUEST(xDbeGetBackBufferAttributesReq); xDbeGetBackBufferAttributesReply rep; @@ -1110,8 +1092,7 @@ ProcDbeGetBackBufferAttributes(client) *****************************************************************************/ static int -ProcDbeDispatch(client) - ClientPtr client; +ProcDbeDispatch(ClientPtr client) { REQUEST(xReq); @@ -1166,8 +1147,7 @@ ProcDbeDispatch(client) *****************************************************************************/ static int -SProcDbeGetVersion(client) - ClientPtr client; +SProcDbeGetVersion(ClientPtr client) { REQUEST(xDbeGetVersionReq); @@ -1201,8 +1181,7 @@ SProcDbeGetVersion(client) *****************************************************************************/ static int -SProcDbeAllocateBackBufferName(client) - ClientPtr client; +SProcDbeAllocateBackBufferName(ClientPtr client) { REQUEST(xDbeAllocateBackBufferNameReq); @@ -1236,8 +1215,7 @@ SProcDbeAllocateBackBufferName(client) *****************************************************************************/ static int -SProcDbeDeallocateBackBufferName(client) - ClientPtr client; +SProcDbeDeallocateBackBufferName(ClientPtr client) { REQUEST (xDbeDeallocateBackBufferNameReq); @@ -1273,8 +1251,7 @@ SProcDbeDeallocateBackBufferName(client) *****************************************************************************/ static int -SProcDbeSwapBuffers(client) - ClientPtr client; +SProcDbeSwapBuffers(ClientPtr client) { REQUEST(xDbeSwapBuffersReq); unsigned int i; @@ -1325,8 +1302,7 @@ SProcDbeSwapBuffers(client) *****************************************************************************/ static int -SProcDbeBeginIdiom(client) - ClientPtr client; +SProcDbeBeginIdiom(ClientPtr client) { REQUEST(xDbeBeginIdiomReq); @@ -1354,8 +1330,7 @@ SProcDbeBeginIdiom(client) *****************************************************************************/ static int -SProcDbeGetVisualInfo(client) - ClientPtr client; +SProcDbeGetVisualInfo(ClientPtr client) { REQUEST(xDbeGetVisualInfoReq); @@ -1387,8 +1362,7 @@ SProcDbeGetVisualInfo(client) *****************************************************************************/ static int -SProcDbeGetBackBufferAttributes(client) - ClientPtr client; +SProcDbeGetBackBufferAttributes(ClientPtr client) { REQUEST (xDbeGetBackBufferAttributesReq); @@ -1413,8 +1387,7 @@ SProcDbeGetBackBufferAttributes(client) *****************************************************************************/ static int -SProcDbeDispatch(client) - ClientPtr client; +SProcDbeDispatch(ClientPtr client) { REQUEST(xReq); @@ -1468,9 +1441,7 @@ SProcDbeDispatch(client) *****************************************************************************/ static Bool -DbeSetupBackgroundPainter(pWin, pGC) - WindowPtr pWin; - GCPtr pGC; +DbeSetupBackgroundPainter(WindowPtr pWin, GCPtr pGC) { void *gcvalues[4]; int ts_x_origin, ts_y_origin; @@ -1543,9 +1514,7 @@ DbeSetupBackgroundPainter(pWin, pGC) * *****************************************************************************/ static int -DbeDrawableDelete(pDrawable, id) - void *pDrawable; - XID id; +DbeDrawableDelete(void * pDrawable, XID id) { return(Success); @@ -1564,9 +1533,7 @@ DbeDrawableDelete(pDrawable, id) * *****************************************************************************/ static int -DbeWindowPrivDelete(pDbeWinPriv, id) - void *pDbeWinPriv; - XID id; +DbeWindowPrivDelete(void * pDbeWinPriv, XID id) { DbeScreenPrivPtr pDbeScreenPriv; DbeWindowPrivPtr pDbeWindowPriv = (DbeWindowPrivPtr)pDbeWinPriv; @@ -1673,8 +1640,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id) * *****************************************************************************/ static void -DbeResetProc(extEntry) - ExtensionEntry *extEntry; +DbeResetProc(ExtensionEntry *extEntry) { int i; ScreenPtr pScreen; @@ -1729,8 +1695,7 @@ DbeResetProc(extEntry) *****************************************************************************/ static Bool -DbeDestroyWindow(pWin) - WindowPtr pWin; +DbeDestroyWindow(WindowPtr pWin) { DbeScreenPrivPtr pDbeScreenPriv; DbeWindowPrivPtr pDbeWindowPriv; diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index b0054201c..0c987314e 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -91,9 +91,7 @@ int dbeWindowPrivIndex = -1; *****************************************************************************/ static Bool -miDbeGetVisualInfo(pScreen, pScrVisInfo) - ScreenPtr pScreen; - XdbeScreenVisualInfo *pScrVisInfo; +miDbeGetVisualInfo(ScreenPtr pScreen, XdbeScreenVisualInfo *pScrVisInfo) { register int i, j, k; register int count; @@ -155,10 +153,7 @@ miDbeGetVisualInfo(pScreen, pScrVisInfo) *****************************************************************************/ static int -miDbeAllocBackBufferName(pWin, bufId, swapAction) - WindowPtr pWin; - XID bufId; - int swapAction; +miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction) { ScreenPtr pScreen; DbeWindowPrivPtr pDbeWindowPriv; @@ -269,8 +264,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction) *****************************************************************************/ static void -miDbeAliasBuffers(pDbeWindowPriv) - DbeWindowPrivPtr pDbeWindowPriv; +miDbeAliasBuffers(DbeWindowPrivPtr pDbeWindowPriv) { int i; MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv = @@ -296,10 +290,7 @@ miDbeAliasBuffers(pDbeWindowPriv) *****************************************************************************/ static int -miDbeSwapBuffers(client, pNumWindows, swapInfo) - ClientPtr client; - int *pNumWindows; - DbeSwapInfoPtr swapInfo; +miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo) { DbeScreenPrivPtr pDbeScreenPriv; GCPtr pGC; @@ -478,9 +469,7 @@ miDbeSwapBuffers(client, pNumWindows, swapInfo) *****************************************************************************/ static void -miDbeWinPrivDelete(pDbeWindowPriv, bufId) - DbeWindowPrivPtr pDbeWindowPriv; - XID bufId; +miDbeWinPrivDelete(DbeWindowPrivPtr pDbeWindowPriv, XID bufId) { MiDbeWindowPrivPrivPtr pDbeWindowPrivPriv; @@ -527,10 +516,7 @@ miDbeWinPrivDelete(pDbeWindowPriv, bufId) *****************************************************************************/ static Bool -miDbePositionWindow(pWin, x, y) - WindowPtr pWin; - int x; - int y; +miDbePositionWindow(WindowPtr pWin, int x, int y) { ScreenPtr pScreen; DbeScreenPrivPtr pDbeScreenPriv; @@ -768,8 +754,7 @@ miDbePositionWindow(pWin, x, y) *****************************************************************************/ static void -miDbeResetProc(pScreen) - ScreenPtr pScreen; +miDbeResetProc(ScreenPtr pScreen) { DbeScreenPrivPtr pDbeScreenPriv; @@ -798,9 +783,7 @@ miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer) *****************************************************************************/ Bool -miDbeInit(pScreen, pDbeScreenPriv) - ScreenPtr pScreen; - DbeScreenPrivPtr pDbeScreenPriv; +miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv) { /* Copy resource types created by DIX */ dbeDrawableResType = pDbeScreenPriv->dbeDrawableResType; -- cgit v1.2.3 From 95b5cf7954d8513cd0b33f032581df81416d2175 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 22 Jan 2018 22:26:59 +0100 Subject: Lift dbe to xorg-xserver-1.4.2 state --- nx-X11/programs/Xserver/dbe/dbe.c | 31 ------------------------------- nx-X11/programs/Xserver/dbe/dbestruct.h | 6 ------ nx-X11/programs/Xserver/dbe/midbe.c | 17 ++++------------- 3 files changed, 4 insertions(+), 50 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 89df0889e..702af85fd 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -77,36 +77,6 @@ static int dbeErrorBase; */ static Bool firstRegistrationPass = TRUE; - -/****************************************************************************** - * - * DBE DIX Procedure: DbeValidateBuffer - * - * Description: - * - * This function is called from VALIDATE_DRAWABLE_AND_GC and from - * various places in dispatch.c if the server has been compiled with - * the flags -DNEED_DBE_BUF_BITS and -DNEED_DBE_BUF_VALIDATE. - * When pWin->dstBuffer changes, this function will be called with pWin - * as the first argument, the drawable ID that was specified as the - * second argument (could be a back buffer id), and True for the third - * argument. - * When pWin->srcBuffer changes, the third argument will be False, and - * the first two arguments are as described for dstBuffer. - * - * This function should prepare the hardware to access the specified - * buffer for reads (if dstbuf is False) or writes (if dstbuf is True). - * - *****************************************************************************/ - -void -DbeValidateBuffer(WindowPtr pWin, XID drawID, Bool dstbuf) -{ - DbeScreenPrivPtr pDbeScreenPriv = DBE_SCREEN_PRIV_FROM_WINDOW(pWin); - if (pDbeScreenPriv->ValidateBuffer) - (*pDbeScreenPriv->ValidateBuffer)(pWin, drawID, dstbuf); -} - /****************************************************************************** * @@ -315,7 +285,6 @@ DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int *nStubbedScreens) pDbeScreenPriv->EndIdiom = NULL; pDbeScreenPriv->WinPrivDelete = NULL; pDbeScreenPriv->ResetProc = NULL; - pDbeScreenPriv->ValidateBuffer = NULL; (*nStubbedScreens)++; diff --git a/nx-X11/programs/Xserver/dbe/dbestruct.h b/nx-X11/programs/Xserver/dbe/dbestruct.h index 17690d5a3..3e5945bdb 100644 --- a/nx-X11/programs/Xserver/dbe/dbestruct.h +++ b/nx-X11/programs/Xserver/dbe/dbestruct.h @@ -36,7 +36,6 @@ /* INCLUDES */ -#define NEED_DBE_PROTOCOL #include #include "windowstr.h" @@ -220,11 +219,6 @@ typedef struct _DbeScreenPrivRec void (*ResetProc)( ScreenPtr /*pScreen*/ ); - void (*ValidateBuffer)( - WindowPtr /*pWin*/, - XID /*bufId*/, - Bool /*dstbuffer*/ -); /* Device-specific private information. */ diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index 0c987314e..9629456df 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -67,11 +67,10 @@ static int miDbePrivPrivGeneration = 0; static int miDbeWindowPrivPrivIndex = -1; -RESTYPE dbeDrawableResType; -RESTYPE dbeWindowPrivResType; -int dbeScreenPrivIndex = -1; -int dbeWindowPrivIndex = -1; - +static RESTYPE dbeDrawableResType; +static RESTYPE dbeWindowPrivResType; +static int dbeScreenPrivIndex = -1; +static int dbeWindowPrivIndex = -1; /****************************************************************************** @@ -766,11 +765,6 @@ miDbeResetProc(ScreenPtr pScreen) } /* miDbeResetProc() */ -static void -miDbeNopValidateBuffer(WindowPtr pWin, XID bufId, Bool dstbuffer) -{ -} - /****************************************************************************** * @@ -828,9 +822,6 @@ miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv) pDbeScreenPriv->ResetProc = miDbeResetProc; pDbeScreenPriv->WinPrivDelete = miDbeWinPrivDelete; - /* The mi implementation doesn't need buffer validation. */ - pDbeScreenPriv->ValidateBuffer = miDbeNopValidateBuffer; - return(TRUE); } /* miDbeInit() */ -- cgit v1.2.3 From d364ea933659c779124d7f3b6833f21968599de6 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 26 Feb 2018 06:15:49 +0100 Subject: Lift dbe to xorg-xserver-1.4.2 state - non-functional changes only --- nx-X11/programs/Xserver/dbe/midbe.c | 8 -------- nx-X11/programs/Xserver/dbe/midbe.h | 1 - 2 files changed, 9 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/dbe/midbe.c b/nx-X11/programs/Xserver/dbe/midbe.c index 9629456df..0cc838d80 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.c +++ b/nx-X11/programs/Xserver/dbe/midbe.c @@ -57,14 +57,6 @@ #include -/* DEFINES */ - - -/* TYPEDEFS */ - - -/* GLOBALS */ - static int miDbePrivPrivGeneration = 0; static int miDbeWindowPrivPrivIndex = -1; static RESTYPE dbeDrawableResType; diff --git a/nx-X11/programs/Xserver/dbe/midbe.h b/nx-X11/programs/Xserver/dbe/midbe.h index a21af12bb..007f2e37b 100644 --- a/nx-X11/programs/Xserver/dbe/midbe.h +++ b/nx-X11/programs/Xserver/dbe/midbe.h @@ -1,5 +1,4 @@ /****************************************************************************** - * * Copyright (c) 1994, 1995 Hewlett-Packard Company * * Permission is hereby granted, free of charge, to any person obtaining -- cgit v1.2.3 From f1f2a360fc2e2b57c7e090ef5536438d66c2e334 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 22 Jan 2018 22:44:54 +0100 Subject: dbe: add NXAGENT_SERVER guard for DixLookup --- nx-X11/programs/Xserver/dbe/Imakefile | 8 ++++++++ nx-X11/programs/Xserver/dbe/dbe.c | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/dbe/Imakefile b/nx-X11/programs/Xserver/dbe/Imakefile index 54ce471c5..3c4f40174 100644 --- a/nx-X11/programs/Xserver/dbe/Imakefile +++ b/nx-X11/programs/Xserver/dbe/Imakefile @@ -6,6 +6,14 @@ INCLUDES = -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(EXTRAINCLUDES) `pkg-config --cflags-only-I pixman-1` LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln +#if defined(NXAgentServer) && NXAgentServer + NX_DEFINES = -DNXAGENT_SERVER +#endif + + DEFINES = \ + $(NX_DEFINES) \ + $(NULL) + NormalLibraryObjectRule() NormalLibraryTarget(dbe,$(OBJS)) diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 702af85fd..588dd0582 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -375,11 +375,17 @@ ProcDbeAllocateBackBufferName(ClientPtr client) REQUEST_SIZE_MATCH(xDbeAllocateBackBufferNameReq); /* The window must be valid. */ +#ifndef NXAGENT_SERVER + status = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess); + if (status != Success) + return status; +#else if (!(pWin = SecurityLookupWindow(stuff->window, client, DixWriteAccess))) { return(BadWindow); } +#endif /* The window must be InputOutput. */ if (pWin->drawable.class != InputOutput) @@ -704,12 +710,21 @@ ProcDbeSwapBuffers(ClientPtr client) /* Check all windows to swap. */ /* Each window must be a valid window - BadWindow. */ +#ifndef NXAGENT_SERVER + error = dixLookupWindow(&pWin, dbeSwapInfo[i].window, client, + DixWriteAccess); + if (error != Success) { + free(swapInfo); + return error; + } +#else if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client, DixWriteAccess))) { free(swapInfo); return(BadWindow); } +#endif /* Each window must be double-buffered - BadMatch. */ if (DBE_WINDOW_PRIV(pWin) == NULL) @@ -867,12 +882,21 @@ ProcDbeGetVisualInfo(ClientPtr client) for (i = 0; i < stuff->n; i++) { +#ifndef NXAGENT_SERVER + register int rc = dixLookupDrawable(pDrawables+i, drawables[i], client, 0, + DixReadAccess); + if (rc != Success) { + free(pDrawables); + return rc; + } +#else if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable( drawables[i], client, DixReadAccess))) { free(pDrawables); return(BadDrawable); } +#endif } } -- cgit v1.2.3