Annotation of /trunk/rdesktop/patches/rdesktop-1.7.0-pcsc17.patch
Parent Directory | Revision Log
Revision 1563 -
(hide annotations)
(download)
Tue Nov 22 15:14:56 2011 UTC (12 years, 10 months ago) by niro
File size: 2354 byte(s)
Tue Nov 22 15:14:56 2011 UTC (12 years, 10 months ago) by niro
File size: 2354 byte(s)
fixed build against newer pcsc-lite
1 | niro | 1563 | diff -up rdesktop-1.6.0/scard.c.pcsc rdesktop-1.6.0/scard.c |
2 | --- rdesktop-1.6.0/scard.c.pcsc 2008-02-14 12:37:18.000000000 +0100 | ||
3 | +++ rdesktop-1.6.0/scard.c 2010-11-17 22:34:15.238453021 +0100 | ||
4 | @@ -1235,10 +1234,10 @@ TS_SCardLocateCardsByATR(STREAM in, STRE | ||
5 | in_uint8a(in, pAtrMasks, atrMaskCount * sizeof(SCARD_ATRMASK_L)); | ||
6 | |||
7 | in_uint32_le(in, readerCount); | ||
8 | - rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE_A)); | ||
9 | + rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE)); | ||
10 | if (!rsArray) | ||
11 | return SC_returnNoMemoryError(&lcHandle, in, out); | ||
12 | - memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE_A)); | ||
13 | + memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE)); | ||
14 | |||
15 | DEBUG_SCARD(("SCARD: SCardLocateCardsByATR(context: 0x%08x, atrs: %d, readers: %d)\n", | ||
16 | (unsigned) hContext, (int) atrMaskCount, (int) readerCount)); | ||
17 | @@ -1323,7 +1322,7 @@ TS_SCardLocateCardsByATR(STREAM in, STRE | ||
18 | if (equal) | ||
19 | { | ||
20 | rsCur->dwEventState |= 0x00000040; /* SCARD_STATE_ATRMATCH 0x00000040 */ | ||
21 | - memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE_A)); | ||
22 | + memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE)); | ||
23 | DEBUG_SCARD(("SCARD: \"%s\"\n", | ||
24 | rsCur->szReader ? rsCur->szReader : "NULL")); | ||
25 | DEBUG_SCARD(("SCARD: user: 0x%08x, state: 0x%08x, event: 0x%08x\n", (unsigned) rsCur->pvUserData, (unsigned) rsCur->dwCurrentState, (unsigned) rsCur->dwEventState)); | ||
26 | @@ -1344,7 +1343,7 @@ TS_SCardLocateCardsByATR(STREAM in, STRE | ||
27 | rsCur->cbAtr = swap32(rsCur->cbAtr); | ||
28 | |||
29 | out_uint8p(out, (void *) ((unsigned char **) rsCur + 2), | ||
30 | - sizeof(SCARD_READERSTATE_A) - 2 * sizeof(unsigned char *)); | ||
31 | + sizeof(SCARD_READERSTATE) - 2 * sizeof(unsigned char *)); | ||
32 | } | ||
33 | |||
34 | outForceAlignment(out, 8); | ||
35 | diff -up rdesktop-1.6.0/scard.h.pcsc rdesktop-1.6.0/scard.h | ||
36 | --- rdesktop-1.6.0/scard.h.pcsc 2007-10-30 14:09:37.000000000 +0100 | ||
37 | +++ rdesktop-1.6.0/scard.h 2010-11-17 22:32:40.394453665 +0100 | ||
38 | @@ -51,8 +51,8 @@ typedef SCARDHANDLE MYPCSC_SCARDHANDLE; | ||
39 | typedef uint32_t SERVER_SCARDCONTEXT; | ||
40 | typedef uint32_t SERVER_SCARDHANDLE; | ||
41 | |||
42 | -typedef SCARD_READERSTATE_A MYPCSC_SCARD_READERSTATE_A; | ||
43 | -typedef LPSCARD_READERSTATE_A MYPCSC_LPSCARD_READERSTATE_A; | ||
44 | +typedef SCARD_READERSTATE MYPCSC_SCARD_READERSTATE_A; | ||
45 | +typedef LPSCARD_READERSTATE MYPCSC_LPSCARD_READERSTATE_A; | ||
46 | |||
47 | typedef struct | ||
48 | { |