mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'smartcard' of github.com:awakecoding/FreeRDP into smartcard

This commit is contained in:
Marc-André Moreau 2014-04-05 11:23:01 -04:00
parent 23745fd58a 67ba28e86d
commit 1e7c4dc091
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -763,7 +763,6 @@ static UINT32 handle_ListReaders(SMARTCARD_DEVICE* smartcard, IRP* irp, BOOL wid
if (status)
goto finish;
/* Read RedirScardcontextRef */
status = handle_RedirContextRef(smartcard, irp, redirect, &hContext);
if (status)

17
channels/smartcard/client/smartcard_pack.c
View File

@ -21,6 +21,9 @@
#include "config.h"
#endif
#include <winpr/crt.h>
#include <winpr/print.h>
#include "smartcard_pack.h"
UINT32 smartcard_unpack_establish_context_call(SMARTCARD_DEVICE* smartcard, wStream* s, EstablishContext_Call* call)
@ -55,16 +58,8 @@ UINT32 smartcard_unpack_list_readers_call(SMARTCARD_DEVICE* smartcard, wStream*
return SCARD_F_INTERNAL_ERROR;
}
if (call->cBytes)
{
call->mszGroups = malloc(call->cBytes);
Stream_Read(s, call->mszGroups, call->cBytes); /* mszGroups */
}
else
{
call->mszGroups = NULL;
Stream_Seek(s, 4); /* mszGroups */
}
call->mszGroups = NULL;
Stream_Seek(s, 4); /* mszGroupsPtr (4 bytes) */
Stream_Read_UINT32(s, call->fmszReadersIsNULL); /* fmszReadersIsNULL (4 bytes) */
Stream_Read_UINT32(s, call->cchReaders); /* cchReaders (4 bytes) */
@ -76,5 +71,7 @@ UINT32 smartcard_unpack_list_readers_call(SMARTCARD_DEVICE* smartcard, wStream*
return SCARD_F_INTERNAL_ERROR;
}
/* FIXME: complete parsing */
return SCARD_S_SUCCESS;
}