1 files changed, 244 insertions, 255 deletions

diff --git a/nx-X11/programs/Xserver/randr/rrmode.c b/nx-X11/programs/Xserver/randr/rrmode.c
index c3740b5f8..918e0f221 100644
--- a/nx-X11/programs/Xserver/randr/rrmode.c
+++ b/nx-X11/programs/Xserver/randr/rrmode.c
@@ -38,63 +38,76 @@
 /**************************************************************************/
 
 #include "randrstr.h"
-#include "registry.h"
 
-RESTYPE	RRModeType;
+RESTYPE RRModeType;
 
 static Bool
-RRModeEqual (xRRModeInfo *a, xRRModeInfo *b)
+RRModeEqual(xRRModeInfo * a, xRRModeInfo * b)
 {
-    if (a->width != b->width) return FALSE;
-    if (a->height != b->height) return FALSE;
-    if (a->dotClock != b->dotClock) return FALSE;
-    if (a->hSyncStart != b->hSyncStart) return FALSE;
-    if (a->hSyncEnd != b->hSyncEnd) return FALSE;
-    if (a->hTotal != b->hTotal) return FALSE;
-    if (a->hSkew != b->hSkew) return FALSE;
-    if (a->vSyncStart != b->vSyncStart) return FALSE;
-    if (a->vSyncEnd != b->vSyncEnd) return FALSE;
-    if (a->vTotal != b->vTotal) return FALSE;
-    if (a->nameLength != b->nameLength) return FALSE;
-    if (a->modeFlags != b->modeFlags) return FALSE;
+    if (a->width != b->width)
+        return FALSE;
+    if (a->height != b->height)
+        return FALSE;
+    if (a->dotClock != b->dotClock)
+        return FALSE;
+    if (a->hSyncStart != b->hSyncStart)
+        return FALSE;
+    if (a->hSyncEnd != b->hSyncEnd)
+        return FALSE;
+    if (a->hTotal != b->hTotal)
+        return FALSE;
+    if (a->hSkew != b->hSkew)
+        return FALSE;
+    if (a->vSyncStart != b->vSyncStart)
+        return FALSE;
+    if (a->vSyncEnd != b->vSyncEnd)
+        return FALSE;
+    if (a->vTotal != b->vTotal)
+        return FALSE;
+    if (a->nameLength != b->nameLength)
+        return FALSE;
+    if (a->modeFlags != b->modeFlags)
+        return FALSE;
     return TRUE;
 }
 
 /*
  * Keep a list so it's easy to find modes in the resource database.
  */
-static int	    num_modes;
-static RRModePtr    *modes;
+static int num_modes;
+static RRModePtr *modes;
 
 static RRModePtr
-RRModeCreate (xRRModeInfo   *modeInfo,
-	      const char    *name,
-	      ScreenPtr	    userScreen)
+RRModeCreate(xRRModeInfo * modeInfo, const char *name, ScreenPtr userScreen)
 {
-    RRModePtr	mode, *newModes;
-    
-    if (!RRInit ())
-	return NULL;
+    RRModePtr mode, *newModes;
 
-    mode = xalloc (sizeof (RRModeRec) + modeInfo->nameLength + 1);
+    if (!RRInit())
+        return NULL;
+
+    mode = xalloc(sizeof(RRModeRec) + modeInfo->nameLength + 1);
     if (!mode)
-	return NULL;
+        return NULL;
     mode->refcnt = 1;
     mode->mode = *modeInfo;
     mode->name = (char *) (mode + 1);
-    memcpy (mode->name, name, modeInfo->nameLength);
+    memcpy(mode->name, name, modeInfo->nameLength);
     mode->name[modeInfo->nameLength] = '\0';
     mode->userScreen = userScreen;
 
     if (num_modes)
-	newModes = xrealloc (modes, (num_modes + 1) * sizeof (RRModePtr));
+#ifndef NXAGENT_SERVER
+        newModes = reallocarray(modes, num_modes + 1, sizeof(RRModePtr));
+#else                           /* !defined(NXAGENT_SERVER) */
+        newModes = xrealloc(modes, (num_modes + 1) * sizeof(RRModePtr));
+#endif                          /* !defined(NXAGENT_SERVER) */
+
     else
-	newModes = xalloc (sizeof (RRModePtr));
+        newModes = xalloc(sizeof(RRModePtr));
 
-    if (!newModes)
-    {
-	xfree (mode);
-	return NULL;
+    if (!newModes) {
+        xfree(mode);
+        return NULL;
     }
 
     mode->mode.id = FakeClientID(0);
@@ -104,341 +117,317 @@ RRModeCreate (xRRModeInfo   *modeInfo,
     }
     modes = newModes;
     modes[num_modes++] = mode;
+
     /*
      * give the caller a reference to this mode
      */
     ++mode->refcnt;
 #ifdef DEBUG
-    fprintf(stderr, "RRModeCreate: num_modes [%d] new mode [%s] ([%p]) refcnt [%d]\n", num_modes, mode->name, mode, mode->refcnt);
+    fprintf(stderr,
+            "RRModeCreate: num_modes [%d] new mode [%s] ([%p]) refcnt [%d]\n",
+            num_modes, mode->name, mode, mode->refcnt);
 #endif
     return mode;
 }
 
 static RRModePtr
-RRModeFindByName (const char	*name,
-		  CARD16    	nameLength)
+RRModeFindByName(const char *name, CARD16 nameLength)
 {
-    int		i;
-    RRModePtr	mode;
-
-    for (i = 0; i < num_modes; i++)
-    {
-	mode = modes[i];
-	if (mode->mode.nameLength == nameLength &&
-	    !memcmp (name, mode->name, nameLength))
-	{
-	    return mode;
-	}
+    int i;
+    RRModePtr mode;
+
+    for (i = 0; i < num_modes; i++) {
+        mode = modes[i];
+        if (mode->mode.nameLength == nameLength &&
+            !memcmp(name, mode->name, nameLength)) {
+            return mode;
+        }
     }
     return NULL;
 }
 
 RRModePtr
-RRModeGet (xRRModeInfo	*modeInfo,
-	   const char	*name)
+RRModeGet(xRRModeInfo * modeInfo, const char *name)
 {
-    int	i;
+    int i;
 
-    for (i = 0; i < num_modes; i++)
-    {
-	RRModePtr   mode = modes[i];
-	if (RRModeEqual (&mode->mode, modeInfo) &&
-	    !memcmp (name, mode->name, modeInfo->nameLength))
-	{
-	    ++mode->refcnt;
+    for (i = 0; i < num_modes; i++) {
+        RRModePtr mode = modes[i];
+
+        if (RRModeEqual(&mode->mode, modeInfo) &&
+            !memcmp(name, mode->name, modeInfo->nameLength)) {
+            ++mode->refcnt;
 #ifdef DEBUG
-	    fprintf(stderr, "RRModeGet: return existing mode [%s] ([%p]) refcnt [%d]\n", mode->name, mode, mode->refcnt);
+            fprintf(stderr,
+                    "RRModeGet: return existing mode [%s] ([%p]) refcnt [%d]\n",
+                    mode->name, mode, mode->refcnt);
 #endif
-	    return mode;
-	}
+            return mode;
+        }
     }
 
 #ifdef DEBUG
     {
-	RRModePtr   mode = RRModeCreate (modeInfo, name, NULL);
-	fprintf(stderr, "RRModeGet: return new mode [%s] ([%p]) refcnt [%d]\n", mode->name, mode, mode->refcnt);
-	return mode;
+        RRModePtr mode = RRModeCreate(modeInfo, name, NULL);
+
+        fprintf(stderr, "RRModeGet: return new mode [%s] ([%p]) refcnt [%d]\n",
+                mode->name, mode, mode->refcnt);
+        return mode;
     }
 #else
-    return RRModeCreate (modeInfo, name, NULL);
+    return RRModeCreate(modeInfo, name, NULL);
 #endif
 }
 
 static RRModePtr
-RRModeCreateUser (ScreenPtr	pScreen,
-		  xRRModeInfo	*modeInfo,
-		  const char	*name,
-		  int		*error)
+RRModeCreateUser(ScreenPtr pScreen,
+                 xRRModeInfo * modeInfo, const char *name, int *error)
 {
-    RRModePtr	mode;
+    RRModePtr mode;
 
-    mode = RRModeFindByName (name, modeInfo->nameLength);
-    if (mode)
-    {
-	*error = BadName;
-	return NULL;
+    mode = RRModeFindByName(name, modeInfo->nameLength);
+    if (mode) {
+        *error = BadName;
+        return NULL;
     }
-    
-    mode = RRModeCreate (modeInfo, name, pScreen);
-    if (!mode)
-    {
-	*error = BadAlloc;
-	return NULL;
+
+    mode = RRModeCreate(modeInfo, name, pScreen);
+    if (!mode) {
+        *error = BadAlloc;
+        return NULL;
     }
     *error = Success;
     return mode;
 }
 
 RRModePtr *
-RRModesForScreen (ScreenPtr pScreen, int *num_ret)
+RRModesForScreen(ScreenPtr pScreen, int *num_ret)
 {
     rrScrPriv(pScreen);
-    int		o, c, m;
-    RRModePtr	*screen_modes;
-    int		num_screen_modes = 0;
-
-    screen_modes = xalloc ((num_modes ? num_modes : 1) * sizeof (RRModePtr));
+    int o, c, m;
+    RRModePtr *screen_modes;
+    int num_screen_modes = 0;
+
+#ifndef NXAGENT_SERVER
+    screen_modes = xallocarray((num_modes ? num_modes : 1), sizeof(RRModePtr));
+#else                           /* !defined(NXAGENT_SERVER) */
+    screen_modes = xalloc((num_modes ? num_modes : 1) * sizeof(RRModePtr));
+#endif                          /* !defined(NXAGENT_SERVER) */
     if (!screen_modes)
-	return NULL;
-    
+        return NULL;
+
     /*
      * Add modes from all outputs
      */
-    for (o = 0; o < pScrPriv->numOutputs; o++)
-    {
-	RROutputPtr	output = pScrPriv->outputs[o];
-	int		n;
-
-	for (m = 0; m < output->numModes + output->numUserModes; m++)
-	{
-	    RRModePtr   mode = (m < output->numModes ? 
-				output->modes[m] : 
-				output->userModes[m-output->numModes]);
-	    for (n = 0; n < num_screen_modes; n++)
-		if (screen_modes[n] == mode)
-		    break;
-	    if (n == num_screen_modes)
-		screen_modes[num_screen_modes++] = mode;
-	}
+    for (o = 0; o < pScrPriv->numOutputs; o++) {
+        RROutputPtr output = pScrPriv->outputs[o];
+        int n;
+
+        for (m = 0; m < output->numModes + output->numUserModes; m++) {
+            RRModePtr mode = (m < output->numModes ?
+                              output->modes[m] :
+                              output->userModes[m - output->numModes]);
+            for (n = 0; n < num_screen_modes; n++)
+                if (screen_modes[n] == mode)
+                    break;
+            if (n == num_screen_modes)
+                screen_modes[num_screen_modes++] = mode;
+        }
     }
     /*
      * Add modes from all crtcs. The goal is to
      * make sure all available and active modes
      * are visible to the client
      */
-    for (c = 0; c < pScrPriv->numCrtcs; c++)
-    {
-	RRCrtcPtr	crtc = pScrPriv->crtcs[c];
-	RRModePtr	mode = crtc->mode;
-	int		n;
-
-	if (!mode) continue;
-	for (n = 0; n < num_screen_modes; n++)
-	    if (screen_modes[n] == mode)
-		break;
-	if (n == num_screen_modes)
-	    screen_modes[num_screen_modes++] = mode;
+    for (c = 0; c < pScrPriv->numCrtcs; c++) {
+        RRCrtcPtr crtc = pScrPriv->crtcs[c];
+        RRModePtr mode = crtc->mode;
+        int n;
+
+        if (!mode)
+            continue;
+        for (n = 0; n < num_screen_modes; n++)
+            if (screen_modes[n] == mode)
+                break;
+        if (n == num_screen_modes)
+            screen_modes[num_screen_modes++] = mode;
     }
     /*
      * Add all user modes for this screen
      */
-    for (m = 0; m < num_modes; m++)
-    {
-	RRModePtr	mode = modes[m];
-	int		n;
-
-	if (mode->userScreen != pScreen)
-	    continue;
-	for (n = 0; n < num_screen_modes; n++)
-	    if (screen_modes[n] == mode)
-		break;
-	if (n == num_screen_modes)
-	    screen_modes[num_screen_modes++] = mode;
+    for (m = 0; m < num_modes; m++) {
+        RRModePtr mode = modes[m];
+        int n;
+
+        if (mode->userScreen != pScreen)
+            continue;
+        for (n = 0; n < num_screen_modes; n++)
+            if (screen_modes[n] == mode)
+                break;
+        if (n == num_screen_modes)
+            screen_modes[num_screen_modes++] = mode;
     }
-    
+
     *num_ret = num_screen_modes;
     return screen_modes;
 }
 
 void
-RRModeDestroy (RRModePtr mode)
+RRModeDestroy(RRModePtr mode)
 {
-    int	m;
-    
-    if (--mode->refcnt > 0) {
-#ifdef DEBUG
-        fprintf(stderr, "RRModeDestroy: mode [%s] ([%p]) refcnt [%d -> %d]\n", mode->name, mode, mode->refcnt + 1, mode->refcnt);
-#endif
-	return;
-    }
-    for (m = 0; m < num_modes; m++)
-    {
-	if (modes[m] == mode)
-	{
-	    memmove (modes + m, modes + m + 1,
-		     (num_modes - m - 1) * sizeof (RRModePtr));
-	    num_modes--;
-	    if (!num_modes)
-	    {
-		xfree (modes);
-		modes = NULL;
-	    }
-	    break;
-	}
+    int m;
+
+    if (--mode->refcnt > 0)
+        return;
+    for (m = 0; m < num_modes; m++) {
+        if (modes[m] == mode) {
+            memmove(modes + m, modes + m + 1,
+                    (num_modes - m - 1) * sizeof(RRModePtr));
+            num_modes--;
+            if (!num_modes) {
+                xfree(modes);
+                modes = NULL;
+            }
+            break;
+        }
     }
-    
-#ifdef DEBUG
-    fprintf(stderr, "RRModeDestroy: destroyed mode [%s] ([%p])\n", mode->name, mode);
-#endif
-    xfree (mode);
+
+    xfree(mode);
 }
 
 static int
-RRModeDestroyResource (void * value, XID pid)
+RRModeDestroyResource(void *value, XID pid)
 {
-#ifdef DEBUG
-  fprintf(stderr, "RRModeDestroyResource: mode [%s] ([%p]) refcnt [%d]\n", ((RRModePtr)value)->name, (RRModePtr)value, ((RRModePtr)value)->refcnt);
-#endif
-    RRModeDestroy ((RRModePtr) value);
+    RRModeDestroy((RRModePtr) value);
     return 1;
 }
 
+/*
+ * Initialize mode type
+ */
 Bool
-RRModeInit (void)
+RRModeInit(void)
 {
-    assert (num_modes == 0);
-    assert (modes == NULL);
-    RRModeType = CreateNewResourceType (RRModeDestroyResource);
+    assert(num_modes == 0);
+    assert(modes == NULL);
+    RRModeType = CreateNewResourceType(RRModeDestroyResource
+#ifndef NXAGENT_SERVER
+                                       , "MODE"
+#endif
+        );
     if (!RRModeType)
-	return FALSE;
-    RegisterResourceName (RRModeType, "MODE");
+        return FALSE;
+
     return TRUE;
 }
 
+/*
+ * Initialize mode type error value
+ */
+void
+RRModeInitErrorValue(void)
+{
+#ifndef NXAGENT_SERVER
+    SetResourceTypeErrorValue(RRModeType, RRErrorBase + BadRRMode);
+#endif
+}
+
 int
-ProcRRCreateMode (ClientPtr client)
+ProcRRCreateMode(ClientPtr client)
 {
     REQUEST(xRRCreateModeReq);
-    xRRCreateModeReply	rep;
-    WindowPtr		pWin;
-    ScreenPtr		pScreen;
-    xRRModeInfo		*modeInfo;
-    long		units_after;
-    char		*name;
-    int			error, rc;
-    RRModePtr		mode;
-    
-    REQUEST_AT_LEAST_SIZE (xRRCreateModeReq);
-    #ifndef NXAGENT_SERVER
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
-    #else
+    xRRCreateModeReply rep;
+    WindowPtr pWin;
+    ScreenPtr pScreen;
+    xRRModeInfo *modeInfo;
+    long units_after;
+    char *name;
+    int error, rc;
+    RRModePtr mode;
+    int n;
+
+    REQUEST_AT_LEAST_SIZE(xRRCreateModeReq);
+#ifndef NXAGENT_SERVER
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+#else
     pWin = SecurityLookupWindow(stuff->window, client, SecurityReadAccess);
     rc = pWin ? Success : BadWindow;
-    #endif
+#endif
     if (rc != Success)
-	return rc;
+        return rc;
 
     pScreen = pWin->drawable.pScreen;
-    
+
     modeInfo = &stuff->modeInfo;
     name = (char *) (stuff + 1);
-    units_after = (stuff->length - (sizeof (xRRCreateModeReq) >> 2));
+    units_after = (stuff->length - bytes_to_int32(sizeof(xRRCreateModeReq)));
 
     /* check to make sure requested name fits within the data provided */
-    if ((int) (modeInfo->nameLength + 3) >> 2 > units_after)
-	return BadLength;
+    if (bytes_to_int32(modeInfo->nameLength) > units_after)
+        return BadLength;
 
-    mode = RRModeCreateUser (pScreen, modeInfo, name, &error);
+    mode = RRModeCreateUser(pScreen, modeInfo, name, &error);
     if (!mode)
-	return error;
-
-    rep.type = X_Reply;
-    rep.pad0 = 0;
-    rep.sequenceNumber = client->sequence;
-    rep.length = 0;
-    rep.mode = mode->mode.id;
-    if (client->swapped)
-    {
-	int n;
-    	swaps(&rep.sequenceNumber, n);
-    	swapl(&rep.length, n);
-	swapl(&rep.mode, n);
+        return error;
+
+    rep = (xRRCreateModeReply) {
+        .type = X_Reply,
+        .sequenceNumber = client->sequence,
+        .length = 0,
+        .mode = mode->mode.id
+    };
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber, n);
+        swapl(&rep.length, n);
+        swapl(&rep.mode, n);
     }
-    WriteToClient(client, sizeof(xRRCreateModeReply), (char *)&rep);
+    WriteToClient(client, sizeof(xRRCreateModeReply), (char *) &rep);
     /* Drop out reference to this mode */
-    RRModeDestroy (mode);
-    return client->noClientException;
+    RRModeDestroy(mode);
+    return Success;
 }
 
 int
-ProcRRDestroyMode (ClientPtr client)
+ProcRRDestroyMode(ClientPtr client)
 {
     REQUEST(xRRDestroyModeReq);
-    RRModePtr	mode;
-    
+    RRModePtr mode;
+
     REQUEST_SIZE_MATCH(xRRDestroyModeReq);
-    mode = LookupIDByType (stuff->mode, RRModeType);
-    if (!mode)
-    {
-	client->errorValue = stuff->mode;
-	return RRErrorBase + BadRRMode;
-    }
+    VERIFY_RR_MODE(stuff->mode, mode, DixDestroyAccess);
+
     if (!mode->userScreen)
-	return BadMatch;
+        return BadMatch;
     if (mode->refcnt > 1)
-	return BadAccess;
-    FreeResource (stuff->mode, 0);
+        return BadAccess;
+    FreeResource(stuff->mode, 0);
     return Success;
 }
 
 int
-ProcRRAddOutputMode (ClientPtr client)
+ProcRRAddOutputMode(ClientPtr client)
 {
     REQUEST(xRRAddOutputModeReq);
-    RRModePtr	mode;
-    RROutputPtr	output;
-    
+    RRModePtr mode;
+    RROutputPtr output;
+
     REQUEST_SIZE_MATCH(xRRAddOutputModeReq);
-    output = LookupOutput(client, stuff->output, DixReadAccess);
+    VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
+    VERIFY_RR_MODE(stuff->mode, mode, DixUseAccess);
 
-    if (!output)
-    {
-	client->errorValue = stuff->output;
-	return RRErrorBase + BadRROutput;
-    }
-    
-    mode = LookupIDByType (stuff->mode, RRModeType);
-    if (!mode)
-    {
-	client->errorValue = stuff->mode;
-	return RRErrorBase + BadRRMode;
-    }
-    
-    return RROutputAddUserMode (output, mode);
+    return RROutputAddUserMode(output, mode);
 }
 
 int
-ProcRRDeleteOutputMode (ClientPtr client)
+ProcRRDeleteOutputMode(ClientPtr client)
 {
     REQUEST(xRRDeleteOutputModeReq);
-    RRModePtr	mode;
-    RROutputPtr	output;
-    
+    RRModePtr mode;
+    RROutputPtr output;
+
     REQUEST_SIZE_MATCH(xRRDeleteOutputModeReq);
-    output = LookupOutput(client, stuff->output, DixReadAccess);
+    VERIFY_RR_OUTPUT(stuff->output, output, DixReadAccess);
+    VERIFY_RR_MODE(stuff->mode, mode, DixUseAccess);
 
-    if (!output)
-    {
-	client->errorValue = stuff->output;
-	return RRErrorBase + BadRROutput;
-    }
-    
-    mode = LookupIDByType (stuff->mode, RRModeType);
-    if (!mode)
-    {
-	client->errorValue = stuff->mode;
-	return RRErrorBase + BadRRMode;
-    }
-    
-    return RROutputDeleteUserMode (output, mode);
+    return RROutputDeleteUserMode(output, mode);
 }