|
 |
df1034d |
diff -up opensc-0.11.13/src/libopensc/internal-winscard.h.build opensc-0.11.13/src/libopensc/internal-winscard.h
|
|
|
df1034d |
--- opensc-0.11.13/src/libopensc/internal-winscard.h.build 2010-02-16 10:03:28.000000000 +0100
|
|
|
df1034d |
+++ opensc-0.11.13/src/libopensc/internal-winscard.h 2010-09-07 10:34:20.000000000 +0200
|
|
|
df1034d |
@@ -88,7 +88,7 @@ SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *L
|
|
|
df1034d |
|
|
|
df1034d |
typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
|
|
|
df1034d |
typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A,
|
|
|
df1034d |
- *LPSCARD_READERSTATE_A;
|
|
|
df1034d |
+ *LPSCARD_READERSTATE_A, *LPSCARD_READERSTATE;
|
|
|
df1034d |
|
|
|
df1034d |
#endif /* HAVE_SCARD_H */
|
|
|
df1034d |
|
|
|
df1034d |
@@ -113,7 +113,7 @@ typedef LONG (PCSC_API *SCardEndTransact
|
|
|
df1034d |
typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen,
|
|
|
df1034d |
LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen);
|
|
|
df1034d |
typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout,
|
|
|
df1034d |
- LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders);
|
|
|
df1034d |
+ LPSCARD_READERSTATE rgReaderStates, DWORD cReaders);
|
|
|
df1034d |
typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength,
|
|
|
df1034d |
LPVOID pbRecvBuffer, LPDWORD lpBytesReturned);
|
|
|
df1034d |
typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer,
|
|
|
df1034d |
diff -up opensc-0.11.13/src/libopensc/reader-pcsc.c.build opensc-0.11.13/src/libopensc/reader-pcsc.c
|
|
|
df1034d |
--- opensc-0.11.13/src/libopensc/reader-pcsc.c.build 2010-02-16 10:03:28.000000000 +0100
|
|
|
df1034d |
+++ opensc-0.11.13/src/libopensc/reader-pcsc.c 2010-09-07 10:34:51.000000000 +0200
|
|
|
df1034d |
@@ -80,7 +80,7 @@ struct pcsc_private_data {
|
|
|
df1034d |
|
|
|
df1034d |
struct pcsc_slot_data {
|
|
|
df1034d |
SCARDHANDLE pcsc_card;
|
|
|
df1034d |
- SCARD_READERSTATE_A reader_state;
|
|
|
df1034d |
+ SCARD_READERSTATE reader_state;
|
|
|
df1034d |
DWORD verify_ioctl;
|
|
|
df1034d |
DWORD verify_ioctl_start;
|
|
|
df1034d |
DWORD verify_ioctl_finish;
|
|
|
df1034d |
@@ -353,7 +353,7 @@ static int pcsc_wait_for_event(sc_reader
|
|
|
df1034d |
sc_context_t *ctx;
|
|
|
df1034d |
SCARDCONTEXT pcsc_ctx;
|
|
|
df1034d |
LONG ret;
|
|
|
df1034d |
- SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS];
|
|
|
df1034d |
+ SCARD_READERSTATE rgReaderStates[SC_MAX_READERS];
|
|
|
df1034d |
unsigned long on_bits, off_bits;
|
|
|
df1034d |
time_t end_time, now, delta;
|
|
|
df1034d |
size_t i;
|
|
|
df1034d |
@@ -401,7 +401,7 @@ static int pcsc_wait_for_event(sc_reader
|
|
|
df1034d |
/* Wait for a status change and return if it's a card insert/removal
|
|
|
df1034d |
*/
|
|
|
df1034d |
for( ; ; ) {
|
|
|
df1034d |
- SCARD_READERSTATE_A *rsp;
|
|
|
df1034d |
+ SCARD_READERSTATE *rsp;
|
|
|
df1034d |
|
|
|
df1034d |
/* Scan the current state of all readers to see if they
|
|
|
df1034d |
* match any of the events we're polling for */
|