ArchiveOrangemail archive

Gentoo Linux mail


gentoo-commits.gentoo.org
(List home) (Recent threads) (64 other Gentoo lists)

Subscription Options

  • RSS or Atom: Read-only subscription using a browser or aggregator. This is the recommended way if you don't need to send messages to the list. You can learn more about feed syndication and clients here.
  • Conventional: All messages are delivered to your mail address, and you can reply. To subscribe, send an email to the list's subscribe address with "subscribe" in the subject line, or visit the list's homepage here.
  • Very high traffic list: 100+ messages per day
  • This list contains about 569,674 messages, beginning Jun 2009
  • 165 messages added yesterday
Report the Spam
This button sends a spam report to the moderator. Please use it sparingly. For other removal requests, read this.
Are you sure? yes no

gentoo-x86 commit in net-misc/rdesktop/files: rdesktop-1.7.0+pcsc-lite-1.6.6.patch

Ad
Bernard Cafarelli (voyageur) 1303299664Wed, 20 Apr 2011 11:41:04 +0000 (UTC)
voyageur    11/04/20 11:40:54

  Added:                rdesktop-1.7.0+pcsc-lite-1.6.6.patch
  Log:
  Version bump with some important bugfixes, update license, drop rdpusb patch. Drop previous 1.6.0 ebuilds
  
  (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/rdesktop/files/rdesktop-1.7.0+pcsc-lite-1.6.6.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x...
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x...

Index: rdesktop-1.7.0+pcsc-lite-1.6.6.patch
===================================================================
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
 {
Home | About | Privacy