mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 23:49:24 +00:00
(!1639) xfixes: drop swapping request length fields
The request struct's length fields aren't used anymore - we have the client->req_len field instead, which also is bigreq-compatible. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
@@ -302,8 +302,6 @@ SProcXFixesSelectCursorInput(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesSelectCursorInputReq);
|
||||
REQUEST_SIZE_MATCH(xXFixesSelectCursorInputReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
swapl(&stuff->window);
|
||||
swapl(&stuff->eventMask);
|
||||
return ProcXFixesSelectCursorInput(client);
|
||||
@@ -421,8 +419,6 @@ ProcXFixesGetCursorImage(ClientPtr client)
|
||||
int _X_COLD
|
||||
SProcXFixesGetCursorImage(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesGetCursorImageReq);
|
||||
swaps(&stuff->length);
|
||||
return ProcXFixesGetCursorImage(client);
|
||||
}
|
||||
|
||||
@@ -450,8 +446,6 @@ int _X_COLD
|
||||
SProcXFixesSetCursorName(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesSetCursorNameReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_AT_LEAST_SIZE(xXFixesSetCursorNameReq);
|
||||
swapl(&stuff->cursor);
|
||||
swaps(&stuff->nbytes);
|
||||
@@ -498,8 +492,6 @@ int _X_COLD
|
||||
SProcXFixesGetCursorName(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesGetCursorNameReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesGetCursorNameReq);
|
||||
swapl(&stuff->cursor);
|
||||
return ProcXFixesGetCursorName(client);
|
||||
@@ -577,8 +569,6 @@ ProcXFixesGetCursorImageAndName(ClientPtr client)
|
||||
int _X_COLD
|
||||
SProcXFixesGetCursorImageAndName(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesGetCursorImageAndNameReq);
|
||||
swaps(&stuff->length);
|
||||
return ProcXFixesGetCursorImageAndName(client);
|
||||
}
|
||||
|
||||
@@ -705,8 +695,6 @@ int _X_COLD
|
||||
SProcXFixesChangeCursor(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesChangeCursorReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesChangeCursorReq);
|
||||
swapl(&stuff->source);
|
||||
swapl(&stuff->destination);
|
||||
@@ -744,8 +732,6 @@ int _X_COLD
|
||||
SProcXFixesChangeCursorByName(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesChangeCursorByNameReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_AT_LEAST_SIZE(xXFixesChangeCursorByNameReq);
|
||||
swapl(&stuff->source);
|
||||
swaps(&stuff->nbytes);
|
||||
@@ -903,8 +889,6 @@ int _X_COLD
|
||||
SProcXFixesHideCursor(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesHideCursorReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesHideCursorReq);
|
||||
swapl(&stuff->window);
|
||||
return ProcXFixesHideCursor(client);
|
||||
@@ -953,8 +937,6 @@ int _X_COLD
|
||||
SProcXFixesShowCursor(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesShowCursorReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesShowCursorReq);
|
||||
swapl(&stuff->window);
|
||||
return ProcXFixesShowCursor(client);
|
||||
@@ -1028,7 +1010,6 @@ SProcXFixesCreatePointerBarrier(ClientPtr client)
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xXFixesCreatePointerBarrierReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
swaps(&stuff->num_devices);
|
||||
REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq,
|
||||
pad_to_int32(stuff->num_devices * sizeof(CARD16)));
|
||||
@@ -1061,8 +1042,6 @@ int _X_COLD
|
||||
SProcXFixesDestroyPointerBarrier(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesDestroyPointerBarrierReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesDestroyPointerBarrierReq);
|
||||
swapl(&stuff->barrier);
|
||||
return ProcXFixesDestroyPointerBarrier(client);
|
||||
|
||||
@@ -78,9 +78,6 @@ int _X_COLD
|
||||
SProcXFixesSetClientDisconnectMode(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesSetClientDisconnectModeReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
|
||||
REQUEST_AT_LEAST_SIZE(xXFixesSetClientDisconnectModeReq);
|
||||
|
||||
swapl(&stuff->disconnect_mode);
|
||||
@@ -113,12 +110,6 @@ ProcXFixesGetClientDisconnectMode(ClientPtr client)
|
||||
int _X_COLD
|
||||
SProcXFixesGetClientDisconnectMode(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesGetClientDisconnectModeReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
|
||||
REQUEST_SIZE_MATCH(xXFixesGetClientDisconnectModeReq);
|
||||
|
||||
return ProcXFixesGetClientDisconnectMode(client);
|
||||
}
|
||||
|
||||
|
||||
@@ -97,8 +97,6 @@ int _X_COLD
|
||||
SProcXFixesCreateRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesCreateRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_AT_LEAST_SIZE(xXFixesCreateRegionReq);
|
||||
swapl(&stuff->region);
|
||||
SwapRestS(stuff);
|
||||
@@ -141,8 +139,6 @@ int _X_COLD
|
||||
SProcXFixesCreateRegionFromBitmap(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesCreateRegionFromBitmapReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromBitmapReq);
|
||||
swapl(&stuff->region);
|
||||
swapl(&stuff->bitmap);
|
||||
@@ -200,8 +196,6 @@ int _X_COLD
|
||||
SProcXFixesCreateRegionFromWindow(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesCreateRegionFromWindowReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromWindowReq);
|
||||
swapl(&stuff->region);
|
||||
swapl(&stuff->window);
|
||||
@@ -243,8 +237,6 @@ int _X_COLD
|
||||
SProcXFixesCreateRegionFromGC(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesCreateRegionFromGCReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromGCReq);
|
||||
swapl(&stuff->region);
|
||||
swapl(&stuff->gc);
|
||||
@@ -285,8 +277,6 @@ int _X_COLD
|
||||
SProcXFixesCreateRegionFromPicture(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesCreateRegionFromPictureReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromPictureReq);
|
||||
swapl(&stuff->region);
|
||||
swapl(&stuff->picture);
|
||||
@@ -309,8 +299,6 @@ int _X_COLD
|
||||
SProcXFixesDestroyRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesDestroyRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesDestroyRegionReq);
|
||||
swapl(&stuff->region);
|
||||
return ProcXFixesDestroyRegion(client);
|
||||
@@ -347,8 +335,6 @@ int _X_COLD
|
||||
SProcXFixesSetRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesSetRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_AT_LEAST_SIZE(xXFixesSetRegionReq);
|
||||
swapl(&stuff->region);
|
||||
SwapRestS(stuff);
|
||||
@@ -376,8 +362,6 @@ int _X_COLD
|
||||
SProcXFixesCopyRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesCopyRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesCopyRegionReq);
|
||||
swapl(&stuff->source);
|
||||
swapl(&stuff->destination);
|
||||
@@ -418,8 +402,6 @@ int _X_COLD
|
||||
SProcXFixesCombineRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesCombineRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesCombineRegionReq);
|
||||
swapl(&stuff->source1);
|
||||
swapl(&stuff->source2);
|
||||
@@ -462,8 +444,6 @@ int _X_COLD
|
||||
SProcXFixesInvertRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesInvertRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesInvertRegionReq);
|
||||
swapl(&stuff->source);
|
||||
swaps(&stuff->x);
|
||||
@@ -492,8 +472,6 @@ int _X_COLD
|
||||
SProcXFixesTranslateRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesTranslateRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesTranslateRegionReq);
|
||||
swapl(&stuff->region);
|
||||
swaps(&stuff->dx);
|
||||
@@ -521,8 +499,6 @@ int _X_COLD
|
||||
SProcXFixesRegionExtents(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesRegionExtentsReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesRegionExtentsReq);
|
||||
swapl(&stuff->source);
|
||||
swapl(&stuff->destination);
|
||||
@@ -586,8 +562,6 @@ int _X_COLD
|
||||
SProcXFixesFetchRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesFetchRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesFetchRegionReq);
|
||||
swapl(&stuff->region);
|
||||
return ProcXFixesFetchRegion(client);
|
||||
@@ -645,8 +619,6 @@ int _X_COLD
|
||||
SProcXFixesSetGCClipRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesSetGCClipRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq);
|
||||
swapl(&stuff->gc);
|
||||
swapl(&stuff->region);
|
||||
@@ -748,8 +720,6 @@ int _X_COLD
|
||||
SProcXFixesSetWindowShapeRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesSetWindowShapeRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq);
|
||||
swapl(&stuff->dest);
|
||||
swaps(&stuff->xOff);
|
||||
@@ -797,8 +767,6 @@ int _X_COLD
|
||||
SProcXFixesSetPictureClipRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesSetPictureClipRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesSetPictureClipRegionReq);
|
||||
swapl(&stuff->picture);
|
||||
swapl(&stuff->region);
|
||||
@@ -850,8 +818,6 @@ int _X_COLD
|
||||
SProcXFixesExpandRegion(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesExpandRegionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
REQUEST_SIZE_MATCH(xXFixesExpandRegionReq);
|
||||
swapl(&stuff->source);
|
||||
swapl(&stuff->destination);
|
||||
|
||||
@@ -66,7 +66,6 @@ SProcXFixesChangeSaveSet(ClientPtr client)
|
||||
REQUEST(xXFixesChangeSaveSetReq);
|
||||
REQUEST_SIZE_MATCH(xXFixesChangeSaveSetReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
swapl(&stuff->window);
|
||||
return ProcXFixesChangeSaveSet(client);
|
||||
}
|
||||
|
||||
@@ -204,9 +204,7 @@ int _X_COLD
|
||||
SProcXFixesSelectSelectionInput(ClientPtr client)
|
||||
{
|
||||
REQUEST(xXFixesSelectSelectionInputReq);
|
||||
|
||||
REQUEST_SIZE_MATCH(xXFixesSelectSelectionInputReq);
|
||||
swaps(&stuff->length);
|
||||
swapl(&stuff->window);
|
||||
swapl(&stuff->selection);
|
||||
swapl(&stuff->eventMask);
|
||||
|
||||
@@ -209,7 +209,6 @@ SProcXFixesQueryVersion(ClientPtr client)
|
||||
REQUEST(xXFixesQueryVersionReq);
|
||||
REQUEST_SIZE_MATCH(xXFixesQueryVersionReq);
|
||||
|
||||
swaps(&stuff->length);
|
||||
swapl(&stuff->majorVersion);
|
||||
swapl(&stuff->minorVersion);
|
||||
return ProcXFixesQueryVersion(client);
|
||||
|
||||
Reference in New Issue
Block a user