From 8e10c11bf52da6e193be9fdc69178a934faa2330 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <rpm@greysector.net>
Date: Nov 17 2010 17:10:51 +0000
Subject: Further porting to new pcsc-lite.


---

diff --git a/rdesktop-pcsc.patch b/rdesktop-pcsc.patch
index 94ddc0f..f17521c 100644
--- a/rdesktop-pcsc.patch
+++ b/rdesktop-pcsc.patch
@@ -1,6 +1,6 @@
 diff -up rdesktop-1.6.0/scard.c.pcsc rdesktop-1.6.0/scard.c
 --- rdesktop-1.6.0/scard.c.pcsc	2008-02-14 12:37:18.000000000 +0100
-+++ rdesktop-1.6.0/scard.c	2010-11-17 17:51:40.000000000 +0100
++++ rdesktop-1.6.0/scard.c	2010-11-17 18:10:13.000000000 +0100
 @@ -40,7 +40,6 @@
  /* variable segment */
  
@@ -9,6 +9,28 @@ diff -up rdesktop-1.6.0/scard.c.pcsc rdesktop-1.6.0/scard.c
  #define	OUT_STREAM_SIZE	4096
  
  #ifdef B_ENDIAN
+@@ -1235,10 +1234,10 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
+ 	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));
+@@ -1344,7 +1343,7 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
+ 		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);
 diff -up rdesktop-1.6.0/scard.h.pcsc rdesktop-1.6.0/scard.h
 --- rdesktop-1.6.0/scard.h.pcsc	2007-10-30 14:09:37.000000000 +0100
 +++ rdesktop-1.6.0/scard.h	2010-11-17 17:44:19.000000000 +0100