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
|
Index: scard.c
===================================================================
--- scard.c (revision 1728)
+++ scard.c (revision 1729)
@@ -2,8 +2,8 @@
rdesktop: A Remote Desktop Protocol client.
Smart Card support
Copyright (C) Alexi Volkov <alexi@myrealbox.com> 2006
- Copyright 2010 Pierre Ossman <ossman@cendio.se> for Cendio AB
- Copyright 2011 Henrik Andersson <hean01@cendio.se> for Cendio AB
+ Copyright 2010-2013 Pierre Ossman <ossman@cendio.se> for Cendio AB
+ Copyright 2011-2013 Henrik Andersson <hean01@cendio.se> for Cendio AB
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1109,6 +1109,7 @@
MYPCSC_SCARDCONTEXT myHContext;
SERVER_DWORD dwTimeout;
SERVER_DWORD dwCount;
+ SERVER_DWORD dwPointerId;
SERVER_LPSCARD_READERSTATE_A rsArray, cur;
MYPCSC_LPSCARD_READERSTATE_A myRsArray;
long i;
@@ -1133,7 +1134,8 @@
memset(rsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE_A));
for (i = 0, cur = rsArray; i < dwCount; i++, cur++)
{
- in_uint32_le(in, cur->szReader);
+ in_uint32_le(in, dwPointerId);
+ cur->szReader = (char *)(intptr_t)dwPointerId;
in_uint32_le(in, cur->dwCurrentState);
in_uint32_le(in, cur->dwEventState);
in_uint32_le(in, cur->cbAtr);
|
