channels/rdpdr: remove sequenceId usage

This commit is contained in:
Marc-André Moreau 2014-05-07 17:50:09 -04:00
parent 67f691f90a
commit e7408089bd
2 changed files with 6 additions and 15 deletions
channels/rdpdr/client
include/freerdp/channels

View File

@ -51,16 +51,13 @@ static void irp_complete(IRP* irp)
rdpdr = (rdpdrPlugin*) irp->devman->plugin;
if (irp->sequenceId == rdpdr->sequenceId)
{
pos = (int) Stream_GetPosition(irp->output);
Stream_SetPosition(irp->output, RDPDR_DEVICE_IO_RESPONSE_LENGTH - 4);
Stream_Write_UINT32(irp->output, irp->IoStatus); /* IoStatus (4 bytes) */
Stream_SetPosition(irp->output, pos);
pos = (int) Stream_GetPosition(irp->output);
Stream_SetPosition(irp->output, RDPDR_DEVICE_IO_RESPONSE_LENGTH - 4);
Stream_Write_UINT32(irp->output, irp->IoStatus); /* IoStatus (4 bytes) */
Stream_SetPosition(irp->output, pos);
rdpdr_send((rdpdrPlugin*) irp->devman->plugin, irp->output);
irp->output = NULL;
}
rdpdr_send(rdpdr, irp->output);
irp->output = NULL;
irp_free(irp);
}
@ -70,7 +67,6 @@ IRP* irp_new(DEVMAN* devman, wStream* s)
IRP* irp;
DEVICE* device;
UINT32 DeviceId;
rdpdrPlugin* rdpdr;
Stream_Read_UINT32(s, DeviceId); /* DeviceId (4 bytes) */
device = devman_get_device_by_id(devman, DeviceId);
@ -78,8 +74,6 @@ IRP* irp_new(DEVMAN* devman, wStream* s)
if (!device)
return NULL;
rdpdr = (rdpdrPlugin*) devman->plugin;
irp = (IRP*) _aligned_malloc(sizeof(IRP), MEMORY_ALLOCATION_ALIGNMENT);
ZeroMemory(irp, sizeof(IRP));
@ -105,7 +99,5 @@ IRP* irp_new(DEVMAN* devman, wStream* s)
irp->thread = NULL;
irp->cancelled = FALSE;
irp->sequenceId = rdpdr->sequenceId;
return irp;
}

View File

@ -349,7 +349,6 @@ struct _IRP
HANDLE thread;
BOOL cancelled;
UINT32 sequenceId;
};
struct _DEVMAN