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

Merge branch 'smartcard_context_fix' of https://github.com/akallabeth/FreeRDP into smartcard

Browse Source
This commit is contained in:
Marc-André Moreau 2013-10-24 15:15:32 -04:00
commit 1ffb3f40b0
2 changed files with 382 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,12 @@
#include <winpr/crt.h> #include <winpr/crt.h>
#include <winpr/synch.h> #include <winpr/synch.h>
#define BOOL PCSC_BOOL
#include <PCSC/pcsclite.h>
#include <PCSC/reader.h>
#include <PCSC/winscard.h>
#undef BOOL
/* /*
* When using Windows Server 2008 R2 as the Terminal Services (TS) * When using Windows Server 2008 R2 as the Terminal Services (TS)
* server, and with a smart card reader connected to the TS client machine * server, and with a smart card reader connected to the TS client machine
@ -106,8 +112,11 @@ struct _SMARTCARD_DEVICE
HANDLE irpEvent; HANDLE irpEvent;
HANDLE stopEvent; HANDLE stopEvent;
LIST* CompletionIds; LIST* CompletionIds;
HANDLE CompletionIdsMutex; HANDLE CompletionIdsMutex;
SCARDCONTEXT hContext;
SCARDHANDLE hCard;
}; };
typedef struct _SMARTCARD_DEVICE SMARTCARD_DEVICE; typedef struct _SMARTCARD_DEVICE SMARTCARD_DEVICE;

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

File diff suppressed because it is too large Load Diff