[Pyscard-devel] SF.net SVN: pyscard:[274] trunk/pyscard/src/smartcard/scard

[<jda...@us...>]

Revision: 274
          http://pyscard.svn.sourceforge.net/pyscard/?rev=274&view=rev
Author:   jdaussel
Date:     2009-03-12 10:18:48 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
PCSCSTRINGIFYERROR on pcsclite only

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/scard/winscarddll.c
    trunk/pyscard/src/smartcard/scard/winscarddll.h

Modified: trunk/pyscard/src/smartcard/scard/winscarddll.c
===================================================================
--- trunk/pyscard/src/smartcard/scard/winscarddll.c	2009-03-12 10:13:41 UTC (rev 273)
+++ trunk/pyscard/src/smartcard/scard/winscarddll.c	2009-03-12 10:18:48 UTC (rev 274)
@@ -580,7 +580,11 @@
 SCARDRELEASECONTEXT             mySCardReleaseContext               = _defaultSCARDRELEASECONTEXT;
 SCARDSTATUSA                    mySCardStatusA                      = _defaultSCARDSTATUSA;
 SCARDTRANSMIT                   mySCardTransmit                     = _defaultSCARDTRANSMIT;
+
+
+#ifdef PCSCLITE
 PCSCSTRINGIFYERROR              myPcscStringifyError                = _defaultPCSCSTRINGIFYERROR;
+#endif // PCSCLITE
 
 
 void * myg_prgSCardT0Pci=NULL;

Modified: trunk/pyscard/src/smartcard/scard/winscarddll.h
===================================================================
--- trunk/pyscard/src/smartcard/scard/winscarddll.h	2009-03-12 10:13:41 UTC (rev 273)
+++ trunk/pyscard/src/smartcard/scard/winscarddll.h	2009-03-12 10:18:48 UTC (rev 274)
@@ -52,34 +52,34 @@
     #endif
 #endif // PCSCLITE
 
-// 
+//
 // these functions are only available on win32 PCSC
-// 
+//
 #ifdef WIN32
     typedef WINSCARDAPI HANDLE
     (WINAPI *SCARDACCESSSTARTEDEVENT)(void);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDADDREADERTOGROUPA)(
         IN SCARDCONTEXT hContext,
         IN LPCTSTR szReaderName,
         IN LPCTSTR szGroupName);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDFORGETCARDTYPEA)(
         IN SCARDCONTEXT hContext,
         IN LPCSTR szCardName);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDFORGETREADERA)(
         IN SCARDCONTEXT hContext,
         IN LPCSTR szReaderName);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDFORGETREADERGROUPA)(
         IN SCARDCONTEXT hContext,
         IN LPCSTR szGroupName);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDGETCARDTYPEPROVIDERNAMEA)(
         IN SCARDCONTEXT hContext,
@@ -87,13 +87,13 @@
         IN SCARDDWORDARG dwProviderId,
         OUT LPTSTR szProvider,
         IN OUT SCARDDWORDARG* pcchProvider);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDGETPROVIDERIDA)(
         IN      SCARDCONTEXT hContext,
         IN      LPCSTR szCard,
         OUT     LPGUID pguidProviderId);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDINTRODUCECARDTYPEA)(
         IN SCARDCONTEXT hContext,
@@ -104,18 +104,18 @@
         IN LPCBYTE pbAtr,
         IN LPCBYTE pbAtrMask,
         IN SCARDDWORDARG cbAtrLen);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDINTRODUCEREADERA)(
         IN SCARDCONTEXT hContext,
         IN LPCSTR szReaderName,
         IN LPCSTR szDeviceName);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDINTRODUCEREADERGROUPA)(
         IN SCARDCONTEXT hContext,
         IN LPCSTR szGroupName);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDLISTCARDSA)(
         IN      SCARDCONTEXT hContext,
@@ -124,21 +124,21 @@
         IN      SCARDDWORDARG cguidInterfaceCount,
         OUT     LPTSTR mszCards,
         IN OUT  SCARDDWORDARG* pcchCards);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDLISTINTERFACESA)(
         IN      SCARDCONTEXT hContext,
         IN      LPCSTR szCard,
         OUT     LPGUID pguidInterfaces,
         IN OUT  SCARDDWORDARG* pcguidInterfaces);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDLOCATECARDSA)(
         IN      SCARDCONTEXT hContext,
         IN      LPCSTR mszCards,
         IN OUT  LPSCARD_READERSTATEA rgReaderStates,
         IN      SCARDDWORDARG cReaders);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDLOCATECARDSBYATRA)(
         IN      SCARDCONTEXT hContext,
@@ -146,23 +146,23 @@
         IN      SCARDDWORDARG cAtrs,
         IN OUT  LPSCARD_READERSTATEA rgReaderStates,
         IN      SCARDDWORDARG cReaders);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDSETCARDTYPEPROVIDERNAMEA)(
         IN SCARDCONTEXT hContext,
         IN LPCSTR szCardName,
         IN SCARDDWORDARG dwProviderId,
         IN LPCSTR szProvider);
-    
+
     typedef WINSCARDAPI void
     (WINAPI *SCARDRELEASESTARTEDEVENT)(void);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDREMOVEREADERFROMGROUPA)(
         IN SCARDCONTEXT hContext,
         IN LPCTSTR szReaderName,
         IN LPCTSTR szGroupName);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDSTATE)(
         IN SCARDHANDLE hCard,
@@ -189,7 +189,7 @@
     extern SCARDREMOVEREADERFROMGROUPA     mySCardRemoveReaderFromGroupA;
     extern SCARDSETCARDTYPEPROVIDERNAMEA   mySCardSetCardTypeProviderNameA;
     extern SCARDSTATE                      mySCardState;
-    
+
 #endif // WIN32
 
 
@@ -207,7 +207,7 @@
         IN SCARDDWORDARG dwAttrId,
         OUT LPBYTE pbAttr,
         IN OUT SCARDDWORDARG* pcbAttrLen);
-    
+
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDSETATTRIB)(
         IN SCARDHANDLE hCard,
@@ -223,7 +223,7 @@
 
 //
 // SCardControl does not have the same prototype on Mac OS X Tiger
-// 
+//
 #ifdef __TIGER__
     typedef WINSCARDAPI SCARDRETCODE
     (WINAPI *SCARDCONTROL)(
@@ -344,10 +344,10 @@
 #ifdef PCSCLITE
 typedef WINSCARDAPI char*
 (WINAPI *PCSCSTRINGIFYERROR)(
-	IN SCARDRETCODE pcscError);
+    IN SCARDRETCODE pcscError);
 
 extern PCSCSTRINGIFYERROR              myPcscStringifyError;
-#endif
+#endif // PCSCLITE
 
 extern SCARDBEGINTRANSACTION           mySCardBeginTransaction;
 extern SCARDCANCEL                     mySCardCancel;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.