pcsclite >= 1.6.2 does not include the type SCARD_READERSTATE_A which
breaks compilation, change code to use SCARD_READERSTATE which is the new name and is also an typedef of the old SCARD_READERSTATE_A from pcslite <1.9.2 versions. git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1643 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
0b87100632
commit
aa517c7c39
8
scard.c
8
scard.c
@ -1165,10 +1165,10 @@ TS_SCardLocateCardsByATR(STREAM in, STREAM out, RD_BOOL wide)
|
||||
in_uint8a(in, pAtrMasks, atrMaskCount * sizeof(SCARD_ATRMASK_L));
|
||||
|
||||
in_uint32_le(in, readerCount);
|
||||
rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE_A));
|
||||
rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE));
|
||||
if (!rsArray)
|
||||
return SC_returnNoMemoryError(&lcHandle, in, out);
|
||||
memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE_A));
|
||||
memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE));
|
||||
|
||||
DEBUG_SCARD(("SCARD: SCardLocateCardsByATR(context: 0x%08x, atrs: %d, readers: %d)\n",
|
||||
(unsigned) hContext, (int) atrMaskCount, (int) readerCount));
|
||||
@ -1253,7 +1253,7 @@ TS_SCardLocateCardsByATR(STREAM in, STREAM out, RD_BOOL wide)
|
||||
if (equal)
|
||||
{
|
||||
rsCur->dwEventState |= 0x00000040; /* SCARD_STATE_ATRMATCH 0x00000040 */
|
||||
memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE_A));
|
||||
memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE));
|
||||
DEBUG_SCARD(("SCARD: \"%s\"\n",
|
||||
rsCur->szReader ? rsCur->szReader : "NULL"));
|
||||
DEBUG_SCARD(("SCARD: user: 0x%08x, state: 0x%08x, event: 0x%08x\n", (unsigned) rsCur->pvUserData, (unsigned) rsCur->dwCurrentState, (unsigned) rsCur->dwEventState));
|
||||
@ -1274,7 +1274,7 @@ TS_SCardLocateCardsByATR(STREAM in, STREAM out, RD_BOOL wide)
|
||||
rsCur->cbAtr = swap32(rsCur->cbAtr);
|
||||
|
||||
out_uint8p(out, (void *) ((unsigned char **) rsCur + 2),
|
||||
sizeof(SCARD_READERSTATE_A) - 2 * sizeof(unsigned char *));
|
||||
sizeof(SCARD_READERSTATE) - 2 * sizeof(unsigned char *));
|
||||
}
|
||||
|
||||
outForceAlignment(out, 8);
|
||||
|
4
scard.h
4
scard.h
@ -50,8 +50,8 @@ typedef SCARDHANDLE MYPCSC_SCARDHANDLE;
|
||||
typedef uint32_t SERVER_SCARDCONTEXT;
|
||||
typedef uint32_t SERVER_SCARDHANDLE;
|
||||
|
||||
typedef SCARD_READERSTATE_A MYPCSC_SCARD_READERSTATE_A;
|
||||
typedef LPSCARD_READERSTATE_A MYPCSC_LPSCARD_READERSTATE_A;
|
||||
typedef SCARD_READERSTATE MYPCSC_SCARD_READERSTATE_A;
|
||||
typedef LPSCARD_READERSTATE MYPCSC_LPSCARD_READERSTATE_A;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user