summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
Diffstat (limited to 'hw')
-rw-r--r--hw/dmx/dmx.c28
-rw-r--r--hw/dmx/dmxfont.c2
-rw-r--r--hw/kdrive/ephyr/ephyrdriext.c24
-rw-r--r--hw/xfree86/dixmods/extmod/xf86dga2.c64
-rw-r--r--hw/xfree86/dixmods/extmod/xf86vmode.c44
-rw-r--r--hw/xfree86/dri/xf86dri.c24
-rw-r--r--hw/xfree86/dri2/dri2ext.c36
-rw-r--r--hw/xquartz/applewm.c26
-rw-r--r--hw/xquartz/pseudoramiX.c10
-rw-r--r--hw/xquartz/xpr/appledri.c14
-rwxr-xr-xhw/xwin/winwindowswm.c14
11 files changed, 140 insertions, 146 deletions
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 95e7adca9..5718b6a59 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -235,7 +235,7 @@ static int ProcDMXQueryVersion(ClientPtr client)
swapl(&rep.patchVersion, n);
}
WriteToClient(client, sizeof(xDMXQueryVersionReply), (char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXSync(ClientPtr client)
@@ -257,7 +257,7 @@ static int ProcDMXSync(ClientPtr client)
swapl(&rep.status, n);
}
WriteToClient(client, sizeof(xDMXSyncReply), (char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXForceWindowCreation(ClientPtr client)
@@ -326,7 +326,7 @@ static int ProcDMXGetScreenCount(ClientPtr client)
swapl(&rep.screenCount, n);
}
WriteToClient(client, sizeof(xDMXGetScreenCountReply), (char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXGetScreenAttributes(ClientPtr client)
@@ -384,7 +384,7 @@ static int ProcDMXGetScreenAttributes(ClientPtr client)
}
WriteToClient(client, sizeof(xDMXGetScreenAttributesReply), (char *)&rep);
if (length) WriteToClient(client, length, (char *)attr.displayName);
- return client->noClientException;
+ return Success;
}
static int ProcDMXChangeScreensAttributes(ClientPtr client)
@@ -457,7 +457,7 @@ static int ProcDMXChangeScreensAttributes(ClientPtr client)
WriteToClient(client,
sizeof(xDMXChangeScreensAttributesReply),
(char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXAddScreen(ClientPtr client)
@@ -508,7 +508,7 @@ static int ProcDMXAddScreen(ClientPtr client)
WriteToClient(client,
sizeof(xDMXAddScreenReply),
(char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXRemoveScreen(ClientPtr client)
@@ -534,7 +534,7 @@ static int ProcDMXRemoveScreen(ClientPtr client)
WriteToClient(client,
sizeof(xDMXRemoveScreenReply),
(char *)&rep);
- return client->noClientException;
+ return Success;
}
@@ -678,7 +678,7 @@ static int ProcDMXGetWindowAttributes(ClientPtr client)
free(windows);
free(screens);
- return client->noClientException;
+ return Success;
}
static int ProcDMXGetDesktopAttributes(ClientPtr client)
@@ -709,7 +709,7 @@ static int ProcDMXGetDesktopAttributes(ClientPtr client)
swapl(&rep.shiftY, n);
}
WriteToClient(client, sizeof(xDMXGetDesktopAttributesReply), (char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXChangeDesktopAttributes(ClientPtr client)
@@ -752,7 +752,7 @@ static int ProcDMXChangeDesktopAttributes(ClientPtr client)
WriteToClient(client,
sizeof(xDMXChangeDesktopAttributesReply),
(char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXGetInputCount(ClientPtr client)
@@ -772,7 +772,7 @@ static int ProcDMXGetInputCount(ClientPtr client)
swapl(&rep.inputCount, n);
}
WriteToClient(client, sizeof(xDMXGetInputCountReply), (char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXGetInputAttributes(ClientPtr client)
@@ -810,7 +810,7 @@ static int ProcDMXGetInputAttributes(ClientPtr client)
}
WriteToClient(client, sizeof(xDMXGetInputAttributesReply), (char *)&rep);
if (length) WriteToClient(client, length, (char *)attr.name);
- return client->noClientException;
+ return Success;
}
static int ProcDMXAddInput(ClientPtr client)
@@ -861,7 +861,7 @@ static int ProcDMXAddInput(ClientPtr client)
swapl(&rep.physicalId, n);
}
WriteToClient(client, sizeof(xDMXAddInputReply), (char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXRemoveInput(ClientPtr client)
@@ -887,7 +887,7 @@ static int ProcDMXRemoveInput(ClientPtr client)
swapl(&rep.status, n);
}
WriteToClient(client, sizeof(xDMXRemoveInputReply), (char *)&rep);
- return client->noClientException;
+ return Success;
}
static int ProcDMXDispatch(ClientPtr client)
diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index b6b2e3111..7a418c813 100644
--- a/hw/dmx/dmxfont.c
+++ b/hw/dmx/dmxfont.c
@@ -208,8 +208,6 @@ static int dmxProcSetFontPath(ClientPtr client)
/* Restore old fontpath in the DMX server */
SetFontPath(client, nOldPaths, oldFontPath);
client->errorValue = error;
- } else {
- result = client->noClientException;
}
}
diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c
index 07733381f..55cc0f128 100644
--- a/hw/kdrive/ephyr/ephyrdriext.c
+++ b/hw/kdrive/ephyr/ephyrdriext.c
@@ -636,7 +636,7 @@ ProcXF86DRIQueryVersion (register ClientPtr client)
}
WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep);
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -674,7 +674,7 @@ ProcXF86DRIQueryDirectRenderingCapable (register ClientPtr client)
WriteToClient(client, sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep);
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -717,7 +717,7 @@ ProcXF86DRIOpenConnection (register ClientPtr client)
if (rep.busIdStringLength)
WriteToClient(client, rep.busIdStringLength, busIdString);
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -744,7 +744,7 @@ ProcXF86DRIAuthConnection (register ClientPtr client)
}
WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep);
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -763,7 +763,7 @@ ProcXF86DRICloseConnection (register ClientPtr client)
*/
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -802,7 +802,7 @@ ProcXF86DRIGetClientDriverName (register ClientPtr client)
rep.clientDriverNameLength,
clientDriverName);
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -848,7 +848,7 @@ ProcXF86DRICreateContext (register ClientPtr client)
WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *)&rep);
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -868,7 +868,7 @@ ProcXF86DRIDestroyContext (register ClientPtr client)
}
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static Bool
@@ -1079,7 +1079,7 @@ ProcXF86DRICreateDrawable (ClientPtr client)
WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep);
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -1123,7 +1123,7 @@ ProcXF86DRIDestroyDrawable (register ClientPtr client)
pair->remote=0;
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -1257,7 +1257,7 @@ ProcXF86DRIGetDrawableInfo (register ClientPtr client)
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
@@ -1308,7 +1308,7 @@ ProcXF86DRIGetDeviceInfo (register ClientPtr client)
WriteToClient(client, rep.devPrivateSize, (char *)pDevPrivate);
}
EPHYR_LOG ("leave\n") ;
- return (client->noClientException);
+ return Success;
}
static int
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 711a9cb75..6587af947 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -129,7 +129,7 @@ ProcXDGAQueryVersion(ClientPtr client)
rep.minorVersion = SERVER_XDGA_MINOR_VERSION;
WriteToClient(client, sizeof(xXDGAQueryVersionReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
@@ -166,7 +166,7 @@ ProcXDGAOpenFramebuffer(ClientPtr client)
if(rep.length)
WriteToClient(client, nameSize, deviceName);
- return (client->noClientException);
+ return Success;
}
@@ -185,7 +185,7 @@ ProcXDGACloseFramebuffer(ClientPtr client)
DGACloseFramebuffer(stuff->screen);
- return (client->noClientException);
+ return Success;
}
static int
@@ -210,12 +210,12 @@ ProcXDGAQueryModes(ClientPtr client)
rep.number = 0;
rep.length = 0;
WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
- return (client->noClientException);
+ return Success;
}
if(!(num = DGAGetModes(stuff->screen))) {
WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
- return (client->noClientException);
+ return Success;
}
if(!(mode = (XDGAModePtr)malloc(num * sizeof(XDGAModeRec))))
@@ -269,7 +269,7 @@ ProcXDGAQueryModes(ClientPtr client)
free(mode);
- return (client->noClientException);
+ return Success;
}
@@ -342,7 +342,7 @@ ProcXDGASetMode(ClientPtr client)
DGASelectInput(stuff->screen, NULL, 0);
DGASetMode(stuff->screen, 0, &mode, &pPix);
WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep);
- return (client->noClientException);
+ return Success;
}
if(Success != DGASetMode(stuff->screen, stuff->mode, &mode, &pPix))
@@ -397,7 +397,7 @@ ProcXDGASetMode(ClientPtr client)
WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info));
WriteToClient(client, size, mode.name);
- return (client->noClientException);
+ return Success;
}
static int
@@ -415,7 +415,7 @@ ProcXDGASetViewport(ClientPtr client)
DGASetViewport(stuff->screen, stuff->x, stuff->y, stuff->flags);
- return (client->noClientException);
+ return Success;
}
static int
@@ -435,14 +435,10 @@ ProcXDGAInstallColormap(ClientPtr client)
rc = dixLookupResourceByType((pointer *)&cmap, stuff->cmap, RT_COLORMAP,
client, DixInstallAccess);
- if (rc == Success) {
- DGAInstallCmap(cmap);
- return (client->noClientException);
- } else {
+ if (rc != Success)
return (rc == BadValue) ? BadColor : rc;
- }
-
- return (client->noClientException);
+ DGAInstallCmap(cmap);
+ return Success;
}
@@ -462,7 +458,7 @@ ProcXDGASelectInput(ClientPtr client)
if(DGA_GETCLIENT(stuff->screen) == client)
DGASelectInput(stuff->screen, client, stuff->mask);
- return (client->noClientException);
+ return Success;
}
@@ -483,7 +479,7 @@ ProcXDGAFillRectangle(ClientPtr client)
stuff->width, stuff->height, stuff->color))
return BadMatch;
- return (client->noClientException);
+ return Success;
}
static int
@@ -503,7 +499,7 @@ ProcXDGACopyArea(ClientPtr client)
stuff->width, stuff->height, stuff->dstx, stuff->dsty))
return BadMatch;
- return (client->noClientException);
+ return Success;
}
@@ -524,7 +520,7 @@ ProcXDGACopyTransparentArea(ClientPtr client)
stuff->width, stuff->height, stuff->dstx, stuff->dsty, stuff->key))
return BadMatch;
- return (client->noClientException);
+ return Success;
}
@@ -548,7 +544,7 @@ ProcXDGAGetViewportStatus(ClientPtr client)
rep.status = DGAGetViewportStatus(stuff->screen);
WriteToClient(client, sizeof(xXDGAGetViewportStatusReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -571,7 +567,7 @@ ProcXDGASync(ClientPtr client)
DGASync(stuff->screen);
WriteToClient(client, sizeof(xXDGASyncReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -592,7 +588,7 @@ ProcXDGASetClientVersion(ClientPtr client)
pPriv->major = stuff->major;
pPriv->minor = stuff->minor;
- return (client->noClientException);
+ return Success;
}
static int
@@ -623,7 +619,7 @@ ProcXDGAChangePixmapMode(ClientPtr client)
rep.y = y;
WriteToClient(client, sizeof(xXDGAChangePixmapModeReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
@@ -649,7 +645,7 @@ ProcXDGACreateColormap(ClientPtr client)
if(result != Success)
return result;
- return (client->noClientException);
+ return Success;
}
/*
@@ -707,7 +703,7 @@ ProcXF86DGAGetVideoLL(ClientPtr client)
rep.ram_size = rep.bank_size >> 10;
WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -762,7 +758,7 @@ ProcXF86DGADirectVideo(ClientPtr client)
DGA_SETCLIENT(stuff->screen, NULL);
}
- return (client->noClientException);
+ return Success;
}
static int
@@ -793,7 +789,7 @@ ProcXF86DGAGetViewPortSize(ClientPtr client)
rep.height = mode.viewportHeight;
WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -819,7 +815,7 @@ ProcXF86DGASetViewPort(ClientPtr client)
!= Success)
return DGAErrorBase + XF86DGADirectNotActivated;
- return (client->noClientException);
+ return Success;
}
static int
@@ -838,7 +834,7 @@ ProcXF86DGAGetVidPage(ClientPtr client)
rep.vpage = 0; /* silently fail */
WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
@@ -854,7 +850,7 @@ ProcXF86DGASetVidPage(ClientPtr client)
/* silently fail */
- return (client->noClientException);
+ return Success;
}
@@ -880,7 +876,7 @@ ProcXF86DGAInstallColormap(ClientPtr client)
client, DixInstallAccess);
if (rc == Success) {
DGAInstallCmap(pcmp);
- return (client->noClientException);
+ return Success;
} else {
return (rc == BadValue) ? BadColor : rc;
}
@@ -905,7 +901,7 @@ ProcXF86DGAQueryDirectVideo(ClientPtr client)
rep.flags = XF86DGADirectPresent;
WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -931,7 +927,7 @@ ProcXF86DGAViewPortChanged(ClientPtr client)
rep.result = 1;
WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
#endif /* DGA_PROTOCOL_OLD_SUPPORT */
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 5bdd88c0a..665f74396 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -394,7 +394,7 @@ ProcXF86VidModeQueryVersion(ClientPtr client)
swaps(&rep.minorVersion, n);
}
WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -495,7 +495,7 @@ ProcXF86VidModeGetModeLine(ClientPtr client)
WriteToClient(client, sizeof(xXF86VidModeGetModeLineReply),
(char *)&rep);
}
- return (client->noClientException);
+ return Success;
}
static int
@@ -590,7 +590,7 @@ ProcXF86VidModeGetAllModeLines(ClientPtr client)
} while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock));
- return (client->noClientException);
+ return Success;
}
#define MODEMATCH(mode,stuff) \
@@ -761,7 +761,7 @@ ProcXF86VidModeAddModeLine(ClientPtr client)
if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
ErrorF("AddModeLine - Succeeded\n");
- return client->noClientException;
+ return Success;
}
static int
@@ -874,7 +874,7 @@ ProcXF86VidModeDeleteModeLine(ClientPtr client)
VidModeDeleteModeline(stuff->screen, mode);
if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
ErrorF("DeleteModeLine - Succeeded\n");
- return(client->noClientException);
+ return Success;
}
} while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock));
@@ -1002,7 +1002,7 @@ ProcXF86VidModeModModeLine(ClientPtr client)
if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
ErrorF("ModModeLine - Succeeded\n");
- return(client->noClientException);
+ return Success;
}
static int
@@ -1120,7 +1120,7 @@ status_reply:
WriteToClient(client, sizeof(xXF86VidModeValidateModeLineReply), (char *)&rep);
if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
ErrorF("ValidateModeLine - Succeeded (status = %d)\n", status);
- return(client->noClientException);
+ return Success;
}
static int
@@ -1137,7 +1137,7 @@ ProcXF86VidModeSwitchMode(ClientPtr client)
VidModeZoomViewport(stuff->screen, (short)stuff->zoom);
- return (client->noClientException);
+ return Success;
}
static int
@@ -1201,7 +1201,7 @@ ProcXF86VidModeSwitchToMode(ClientPtr client)
if ((VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock)
&& MODEMATCH(mode, stuff))
- return (client->noClientException);
+ return Success;
if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock))
return BadValue;
@@ -1230,7 +1230,7 @@ ProcXF86VidModeSwitchToMode(ClientPtr client)
if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY)
ErrorF("SwitchToMode - Succeeded\n");
- return(client->noClientException);
+ return Success;
}
} while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock));
@@ -1252,7 +1252,7 @@ ProcXF86VidModeLockModeSwitch(ClientPtr client)
if (!VidModeLockZoom(stuff->screen, (short)stuff->lock))
return VidModeErrorBase + XF86VidModeZoomLocked;
- return (client->noClientException);
+ return Success;
}
static int
@@ -1339,7 +1339,7 @@ ProcXF86VidModeGetMonitor(ClientPtr client)
free(hsyncdata);
free(vsyncdata);
- return (client->noClientException);
+ return Success;
}
static int
@@ -1371,7 +1371,7 @@ ProcXF86VidModeGetViewPort(ClientPtr client)
swapl(&rep.y, n);
}
WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -1389,7 +1389,7 @@ ProcXF86VidModeSetViewPort(ClientPtr client)
if (!VidModeSetViewPort(stuff->screen, stuff->x, stuff->y))
return BadValue;
- return (client->noClientException);
+ return Success;
}
static int
@@ -1453,7 +1453,7 @@ ProcXF86VidModeGetDotClocks(ClientPtr client)
}
free(Clocks);
- return (client->noClientException);
+ return Success;
}
static int
@@ -1472,7 +1472,7 @@ ProcXF86VidModeSetGamma(ClientPtr client)
((float)stuff->green)/10000., ((float)stuff->blue)/10000.))
return BadValue;
- return (client->noClientException);
+ return Success;
}
static int
@@ -1506,7 +1506,7 @@ ProcXF86VidModeGetGamma(ClientPtr client)
swapl(&rep.blue, n);
}
WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -1533,7 +1533,7 @@ ProcXF86VidModeSetGammaRamp(ClientPtr client)
if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b))
return BadValue;
- return (client->noClientException);
+ return Success;
}
static int
@@ -1584,7 +1584,7 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client)
free(ramp);
}
- return (client->noClientException);
+ return Success;
}
@@ -1611,7 +1611,7 @@ ProcXF86VidModeGetGammaRampSize(ClientPtr client)
}
WriteToClient(client,sizeof(xXF86VidModeGetGammaRampSizeReply),(char*)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -1641,7 +1641,7 @@ ProcXF86VidModeGetPermissions(ClientPtr client)
}
WriteToClient(client,sizeof(xXF86VidModeGetPermissionsReply),(char*)&rep);
- return (client->noClientException);
+ return Success;
}
@@ -1665,7 +1665,7 @@ ProcXF86VidModeSetClientVersion(ClientPtr client)
pPriv->major = stuff->major;
pPriv->minor = stuff->minor;
- return (client->noClientException);
+ return Success;
}
static int
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index 4e5a15fca..f32565d3c 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -146,7 +146,7 @@ ProcXF86DRIQueryVersion(
swapl(&rep.patchVersion, n);
}
WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -185,7 +185,7 @@ ProcXF86DRIQueryDirectRenderingCapable(
WriteToClient(client,
sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -228,7 +228,7 @@ ProcXF86DRIOpenConnection(
WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *)&rep);
if (rep.busIdStringLength)
WriteToClient(client, rep.busIdStringLength, busIdString);
- return (client->noClientException);
+ return Success;
}
static int
@@ -255,7 +255,7 @@ ProcXF86DRIAuthConnection(
rep.authenticated = 0;
}
WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -272,7 +272,7 @@ ProcXF86DRICloseConnection(
DRICloseConnection( screenInfo.screens[stuff->screen]);
- return (client->noClientException);
+ return Success;
}
static int
@@ -311,7 +311,7 @@ ProcXF86DRIGetClientDriverName(
WriteToClient(client,
rep.clientDriverNameLength,
clientDriverName);
- return (client->noClientException);
+ return Success;
}
static int
@@ -343,7 +343,7 @@ ProcXF86DRICreateContext(
}
WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -363,7 +363,7 @@ ProcXF86DRIDestroyContext(
return BadValue;
}
- return (client->noClientException);
+ return Success;
}
static int
@@ -397,7 +397,7 @@ ProcXF86DRICreateDrawable(
}
WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -425,7 +425,7 @@ ProcXF86DRIDestroyDrawable(
return BadValue;
}
- return (client->noClientException);
+ return Success;
}
static int
@@ -533,7 +533,7 @@ ProcXF86DRIGetDrawableInfo(
(char *)pBackClipRects);
}
- return (client->noClientException);
+ return Success;
}
static int
@@ -584,7 +584,7 @@ ProcXF86DRIGetDeviceInfo(
if (rep.length) {
WriteToClient(client, rep.devPrivateSize, (char *)pDevPrivate);
}
- return (client->noClientException);
+ return Success;
}
static int
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 94193266b..602eb6653 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -91,7 +91,7 @@ ProcDRI2QueryVersion(ClientPtr client)
WriteToClient(client, sizeof(xDRI2QueryVersionReply), &rep);
- return client->noClientException;
+ return Success;
}
static int
@@ -129,7 +129,7 @@ ProcDRI2Connect(ClientPtr client)
WriteToClient(client, rep.driverNameLength, driverName);
WriteToClient(client, rep.deviceNameLength, deviceName);
- return client->noClientException;
+ return Success;
}
static int
@@ -151,7 +151,7 @@ ProcDRI2Authenticate(ClientPtr client)
rep.authenticated = DRI2Authenticate(pDraw->pScreen, stuff->magic);
WriteToClient(client, sizeof(xDRI2AuthenticateReply), &rep);
- return client->noClientException;
+ return Success;
}
static void
@@ -188,7 +188,7 @@ ProcDRI2CreateDrawable(ClientPtr client)
if (status != Success)
return status;
- return client->noClientException;
+ return Success;
}
static int
@@ -203,7 +203,7 @@ ProcDRI2DestroyDrawable(ClientPtr client)
&pDrawable, &status))
return status;
- return client->noClientException;
+ return Success;
}
@@ -269,7 +269,7 @@ ProcDRI2GetBuffers(ClientPtr client)
return status;
if (DRI2ThrottleClient(client, pDrawable))
- return client->noClientException;
+ return Success;
attachments = (unsigned int *) &stuff[1];
buffers = DRI2GetBuffers(pDrawable, &width, &height,
@@ -278,7 +278,7 @@ ProcDRI2GetBuffers(ClientPtr client)
send_buffers_reply(client, pDrawable, buffers, count, width, height);
- return client->noClientException;
+ return Success;
}
static int
@@ -296,7 +296,7 @@ ProcDRI2GetBuffersWithFormat(ClientPtr client)
return status;
if (DRI2ThrottleClient(client, pDrawable))
- return client->noClientException;
+ return Success;
attachments = (unsigned int *) &stuff[1];
buffers = DRI2GetBuffersWithFormat(pDrawable, &width, &height,
@@ -304,7 +304,7 @@ ProcDRI2GetBuffersWithFormat(ClientPtr client)
send_buffers_reply(client, pDrawable, buffers, count, width, height);
- return client->noClientException;
+ return Success;
}
static int
@@ -341,7 +341,7 @@ ProcDRI2CopyRegion(ClientPtr client)
WriteToClient(client, sizeof(xDRI2CopyRegionReply), &rep);
- return client->noClientException;
+ return Success;
}
static void
@@ -398,7 +398,7 @@ ProcDRI2SwapBuffers(ClientPtr client)
* also orders swaps.
*/
if (DRI2ThrottleClient(client, pDrawable))
- return client->noClientException;
+ return Success;
target_msc = vals_to_card64(stuff->target_msc_lo, stuff->target_msc_hi);
divisor = vals_to_card64(stuff->divisor_lo, stuff->divisor_hi);
@@ -416,7 +416,7 @@ ProcDRI2SwapBuffers(ClientPtr client)
WriteToClient(client, sizeof(xDRI2SwapBuffersReply), &rep);
- return client->noClientException;
+ return Success;
}
static void
@@ -456,7 +456,7 @@ ProcDRI2GetMSC(ClientPtr client)
WriteToClient(client, sizeof(xDRI2MSCReply), &rep);
- return client->noClientException;
+ return Success;
}
static int
@@ -483,7 +483,7 @@ ProcDRI2WaitMSC(ClientPtr client)
if (status != Success)
return status;
- return client->noClientException;
+ return Success;
}
int
@@ -498,7 +498,7 @@ ProcDRI2WaitMSCReply(ClientPtr client, CARD64 ust, CARD64 msc, CARD64 sbc)
WriteToClient(client, sizeof(xDRI2MSCReply), &rep);
- return client->noClientException;
+ return Success;
}
static int
@@ -518,7 +518,7 @@ ProcDRI2SwapInterval(ClientPtr client)
DRI2SwapInterval(pDrawable, stuff->interval);
- return client->noClientException;
+ return Success;
}
static int
@@ -548,7 +548,7 @@ ProcDRI2WaitSBC(ClientPtr client)
WriteToClient(client, sizeof(xDRI2MSCReply), &rep);
- return client->noClientException;
+ return Success;
}
static int
@@ -613,7 +613,7 @@ SProcDRI2Connect(ClientPtr client)
rep.driverNameLength = 0;
rep.deviceNameLength = 0;
- return client->noClientException;
+ return Success;
}
static int
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index 8750f5d00..53d167e5b 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -192,7 +192,7 @@ ProcAppleWMQueryVersion(
swapl(&rep.length, n);
}
WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
@@ -383,7 +383,7 @@ ProcAppleWMDisableUpdate(
appleWMProcs->DisableUpdate();
- return (client->noClientException);
+ return Success;
}
static int
@@ -395,7 +395,7 @@ ProcAppleWMReenableUpdate(
appleWMProcs->EnableUpdate();
- return (client->noClientException);
+ return Success;
}
@@ -435,7 +435,7 @@ ProcAppleWMSetWindowMenu(
free(items);
free(shortcuts);
- return (client->noClientException);
+ return Success;
}
static int
@@ -447,7 +447,7 @@ ProcAppleWMSetWindowMenuCheck(
REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);
X11ApplicationSetWindowMenuCheck(stuff->index);
- return (client->noClientException);
+ return Success;
}
static int
@@ -458,7 +458,7 @@ ProcAppleWMSetFrontProcess(
REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq);
X11ApplicationSetFrontProcess();
- return (client->noClientException);
+ return Success;
}
static int
@@ -483,7 +483,7 @@ ProcAppleWMSetWindowLevel(register ClientPtr client)
return err;
}
- return (client->noClientException);
+ return Success;
}
static int
@@ -502,7 +502,7 @@ ProcAppleWMSendPSN(register ClientPtr client)
return err;
}
- return (client->noClientException);
+ return Success;
}
static int
@@ -532,7 +532,7 @@ ProcAppleWMAttachTransient(register ClientPtr client)
return err;
}
- return (client->noClientException);
+ return Success;
}
static int
@@ -545,7 +545,7 @@ ProcAppleWMSetCanQuit(
REQUEST_SIZE_MATCH(xAppleWMSetCanQuitReq);
X11ApplicationSetCanQuit(stuff->state);
- return (client->noClientException);
+ return Success;
}
@@ -581,7 +581,7 @@ ProcAppleWMFrameGetRect(
rep.h = rr.y2 - rr.y1;
WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -611,7 +611,7 @@ ProcAppleWMFrameHitTest(
rep.ret = ret;
WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -649,7 +649,7 @@ ProcAppleWMFrameDraw(
return errno;
}
- return (client->noClientException);
+ return Success;
}
diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index c3154b948..5868ab129 100644
--- a/hw/xquartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
@@ -202,7 +202,7 @@ static int ProcPseudoramiXGetState(ClientPtr client)
swaps (&rep.state, n);
}
WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep);
- return client->noClientException;
+ return Success;
}
@@ -231,7 +231,7 @@ static int ProcPseudoramiXGetScreenCount(ClientPtr client)
swaps (&rep.ScreenCount, n);
}
WriteToClient (client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
- return client->noClientException;
+ return Success;
}
@@ -265,7 +265,7 @@ static int ProcPseudoramiXGetScreenSize(ClientPtr client)
swaps (&rep.height, n);
}
WriteToClient (client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
- return client->noClientException;
+ return Success;
}
@@ -290,7 +290,7 @@ static int ProcPseudoramiXIsActive(ClientPtr client)
swapl (&rep.state, n);
}
WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep);
- return client->noClientException;
+ return Success;
}
@@ -337,7 +337,7 @@ static int ProcPseudoramiXQueryScreens(ClientPtr client)
}
}
- return client->noClientException;
+ return Success;
}
diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index 74a4ec315..71cfb591b 100644
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@@ -128,7 +128,7 @@ ProcAppleDRIQueryVersion(
swapl(&rep.length, n);
}
WriteToClient(client, sizeof(xAppleDRIQueryVersionReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
@@ -159,7 +159,7 @@ ProcAppleDRIQueryDirectRenderingCapable(
WriteToClient(client,
sizeof(xAppleDRIQueryDirectRenderingCapableReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -182,7 +182,7 @@ ProcAppleDRIAuthConnection(
rep.authenticated = 0;
}
WriteToClient(client, sizeof(xAppleDRIAuthConnectionReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static void surface_notify(
@@ -247,7 +247,7 @@ ProcAppleDRICreateSurface(
rep.uid = sid;
WriteToClient(client, sizeof(xAppleDRICreateSurfaceReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
static int
@@ -271,7 +271,7 @@ ProcAppleDRIDestroySurface(
return BadValue;
}
- return (client->noClientException);
+ return Success;
}
static int
@@ -323,7 +323,7 @@ ProcAppleDRICreatePixmap(ClientPtr client)
WriteReplyToClient(client, sizeof(rep), &rep);
(void)WriteToClient(client, rep.stringLength, path);
- return (client->noClientException);
+ return Success;
}
static int
@@ -342,7 +342,7 @@ ProcAppleDRIDestroyPixmap(ClientPtr client)
DRIDestroyPixmap(pDrawable);
- return (client->noClientException);
+ return Success;
}
/* dispatch */
diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index a996bc4ec..d09e98352 100755
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -124,7 +124,7 @@ ProcWindowsWMQueryVersion(register ClientPtr client)
swapl(&rep.length, n);
}
WriteToClient(client, sizeof(xWindowsWMQueryVersionReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
@@ -335,7 +335,7 @@ ProcWindowsWMDisableUpdate (register ClientPtr client)
//winDisableUpdate();
- return (client->noClientException);
+ return Success;
}
static int
@@ -345,7 +345,7 @@ ProcWindowsWMReenableUpdate (register ClientPtr client)
//winEnableUpdate();
- return (client->noClientException);
+ return Success;
}
@@ -358,7 +358,7 @@ ProcWindowsWMSetFrontProcess (register ClientPtr client)
//QuartzMessageMainThread(kWindowsSetFrontProcess, NULL, 0);
- return (client->noClientException);
+ return Success;
}
@@ -414,7 +414,7 @@ ProcWindowsWMFrameGetRect (register ClientPtr client)
#endif
WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *)&rep);
- return (client->noClientException);
+ return Success;
}
@@ -507,7 +507,7 @@ ProcWindowsWMFrameDraw (register ClientPtr client)
ErrorF ("ProcWindowsWMFrameDraw - done\n");
#endif
- return (client->noClientException);
+ return Success;
}
static int
@@ -566,7 +566,7 @@ ProcWindowsWMFrameSetTitle(
ErrorF ("ProcWindowsWMFrameSetTitle - done\n");
#endif
- return (client->noClientException);
+ return Success;
}