frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xi: fix up broken DeviceChangedEvent swapping code

This commit is contained in:
Peter Hutterer 2009-08-11 16:16:54 +10:00
parent b44d34d5fd
commit ce69a06aff
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Xi/extinit.c
View File

@ -676,20 +676,11 @@ SDeviceChangedEvent(xXIDeviceChangedEvent* from, xXIDeviceChangedEvent* to)
*to = *from; *to = *from;
memcpy(&to[1], &from[1], from->length * 4); memcpy(&to[1], &from[1], from->length * 4);
swaps(&to->sequenceNumber, n);
swapl(&to->length, n);
swaps(&to->evtype, n);
swaps(&to->deviceid, n);
swapl(&to->time, n);
swaps(&to->num_classes, n);
swaps(&to->sourceid, n);
/* now swap the actual classes */
any = (xXIAnyInfo*)&to[1]; any = (xXIAnyInfo*)&to[1];
for (i = 0; i < to->num_classes; i++) for (i = 0; i < to->num_classes; i++)
{ {
swaps(&any->type, n); int length = any->length;
swaps(&any->length, n);
switch(any->type) switch(any->type)
{ {
case KeyClass: case KeyClass:
@ -704,8 +695,10 @@ SDeviceChangedEvent(xXIDeviceChangedEvent* from, xXIDeviceChangedEvent* to)
case ButtonClass: case ButtonClass:
{ {
xXIButtonInfo *bi = (xXIButtonInfo*)any; xXIButtonInfo *bi = (xXIButtonInfo*)any;
Atom *labels = (Atom*)((char*)bi + sizeof(xXIButtonInfo) +
pad_to_int32(bits_to_bytes(bi->num_buttons)));
for (j = 0; j < bi->num_buttons; j++) for (j = 0; j < bi->num_buttons; j++)
swapl(&bi[1 + j], n); swapl(&labels[j], n);
swaps(&bi->num_buttons, n); swaps(&bi->num_buttons, n);
} }
break; break;
@ -722,8 +715,22 @@ SDeviceChangedEvent(xXIDeviceChangedEvent* from, xXIDeviceChangedEvent* to)
} }
break; break;
} }
any = (xXIAnyInfo*)((char*)any + any->length * 4);
swaps(&any->type, n);
swaps(&any->length, n);
swaps(&any->sourceid, n);
any = (xXIAnyInfo*)((char*)any + length * 4);
} }
swaps(&to->sequenceNumber, n);
swapl(&to->length, n);
swaps(&to->evtype, n);
swaps(&to->deviceid, n);
swapl(&to->time, n);
swaps(&to->num_classes, n);
swaps(&to->sourceid, n);
} }
static void SDeviceEvent(xXIDeviceEvent *from, xXIDeviceEvent *to) static void SDeviceEvent(xXIDeviceEvent *from, xXIDeviceEvent *to)