1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
Index: scard.c
===================================================================
--- scard.c (revision 1609)
+++ scard.c (working copy)
@@ -1165,10 +1165,10 @@
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 @@
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 @@
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);
Index: scard.h
===================================================================
--- scard.h (revision 1609)
+++ scard.h (working copy)
@@ -50,8 +50,8 @@
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
{
|
GitWeb
