mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

channels/smartcard: decode and then call

Browse Source
This commit is contained in:
Marc-André Moreau 2014-05-12 15:32:02 -04:00
parent 77827bb411
commit 5416ab1d6e
3 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
channels/smartcard/client/smartcard_main.c
View File

@ -35,6 +35,14 @@
#include "smartcard_main.h"
struct _SMARTCARD_IRP_WORK
{
IRP* irp;
ULONG_PTR* call;
UINT32 ioControlCode;
};
typedef struct _SMARTCARD_IRP_WORK SMARTCARD_IRP_WORK;
void* smartcard_context_thread(SMARTCARD_CONTEXT* pContext)
{
IRP* irp;
@ -221,16 +229,26 @@ void smartcard_complete_irp(SMARTCARD_DEVICE* smartcard, IRP* irp)
irp->Complete(irp);
}
void* smartcard_process_irp_worker_proc(IRP* irp)
void* smartcard_process_irp_worker_proc(SMARTCARD_IRP_WORK* irpWork)
{
IRP* irp;
UINT32 status;
ULONG_PTR* call;
UINT32 ioControlCode;
SMARTCARD_DEVICE* smartcard;
irp = irpWork->irp;
call = irpWork->call;
ioControlCode = irpWork->ioControlCode;
smartcard = (SMARTCARD_DEVICE*) irp->device;
smartcard_irp_device_control(smartcard, irp);
status = smartcard_irp_device_control_call(smartcard, irp, ioControlCode, call);
Queue_Enqueue(smartcard->CompletedIrpQueue, (void*) irp);
free(irpWork);
ExitThread(0);
return NULL;
}
@ -243,7 +261,9 @@ void* smartcard_process_irp_worker_proc(IRP* irp)
void smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp)
{
void* key;
UINT32 status;
BOOL asyncIrp = FALSE;
ULONG_PTR* call = NULL;
UINT32 ioControlCode = 0;
key = (void*) (size_t) irp->CompletionId;
@ -327,17 +347,32 @@ void smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp)
break;
}
status = smartcard_irp_device_control_decode(smartcard, irp, &ioControlCode, &call);
if (status != SCARD_S_SUCCESS)
{
/* TODO: properly handle decoding failure response */
fprintf(stderr, "fixme: properly handle decoding failure response\n");
}
if (!asyncIrp)
{
smartcard_irp_device_control(smartcard, irp);
status = smartcard_irp_device_control_call(smartcard, irp, ioControlCode, call);
Queue_Enqueue(smartcard->CompletedIrpQueue, (void*) irp);
}
else
{
SMARTCARD_IRP_WORK* irpWork;
irpWork = (SMARTCARD_IRP_WORK*) calloc(1, sizeof(SMARTCARD_IRP_WORK));
irpWork->irp = irp;
irpWork->call = call;
irpWork->ioControlCode = ioControlCode;
irp->thread = CreateThread(NULL, 0,
(LPTHREAD_START_ROUTINE) smartcard_process_irp_worker_proc,
irp, 0, NULL);
irpWork, 0, NULL);
}
}
else

2
channels/smartcard/client/smartcard_main.h
View File

@ -117,8 +117,6 @@ void smartcard_process_irp(SMARTCARD_DEVICE* smartcard, IRP* irp);
UINT32 smartcard_irp_device_control_decode(SMARTCARD_DEVICE* smartcard, IRP* irp, UINT32* pIoControlCode, ULONG_PTR** ppCall);
UINT32 smartcard_irp_device_control_call(SMARTCARD_DEVICE* smartcard, IRP* irp, UINT32 ioControlCode, ULONG_PTR* call);
UINT32 smartcard_irp_device_control(SMARTCARD_DEVICE* smartcard, IRP* irp);
void smartcard_irp_device_control_peek_io_control_code(SMARTCARD_DEVICE* smartcard, IRP* irp, UINT32* ioControlCode);
#include "smartcard_pack.h"

15
channels/smartcard/client/smartcard_operations.c
View File

@ -1716,18 +1716,3 @@ UINT32 smartcard_irp_device_control_call(SMARTCARD_DEVICE* smartcard, IRP* irp,
return SCARD_S_SUCCESS;
}
UINT32 smartcard_irp_device_control(SMARTCARD_DEVICE* smartcard, IRP* irp)
{
UINT32 status;
UINT32 ioControlCode;
ULONG_PTR* call = NULL;
status = smartcard_irp_device_control_decode(smartcard, irp, &ioControlCode, &call);
if (status != SCARD_S_SUCCESS)
return status;
status = smartcard_irp_device_control_call(smartcard, irp, ioControlCode, call);
return status;
}