pyscard-devel

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

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

Revision: 183
          http://pyscard.svn.sourceforge.net/pyscard/?rev=183&view=rev
Author:   jdaussel
Date:     2008-01-03 01:58:28 -0800 (Thu, 03 Jan 2008)

Log Message:
-----------
pcsc_stringify not available on Mac OS X Tiger

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/scard/scard.i

Modified: trunk/pyscard/src/smartcard/scard/scard.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/scard.i	2008-01-02 22:48:56 UTC (rev 182)
+++ trunk/pyscard/src/smartcard/scard/scard.i	2008-01-03 09:58:28 UTC (rev 183)
@@ -824,7 +824,7 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// some pcsclite versions (e.g. on Max OS X darwint) don't have a pcsc stringify
+// some pcsclite versions (e.g. on Max OS X Tiger) have no pcsc_stringify
 // this function was taken from pcsclite
 //
 char* _pcsc_stringify_error( SCARDRETCODE pcscError )
@@ -984,7 +984,7 @@
         return ppszError;
     #endif // WIN32
     #ifdef PCSCLITE
-    #ifdef __APPLE__
+    #ifdef __TIGER__
         return (ERRORSTRING*)_pcsc_stringify_error( lErrCode );
     #endif
         return (ERRORSTRING*)pcsc_stringify_error( lErrCode );


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

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

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

Revision: 184
          http://pyscard.svn.sourceforge.net/pyscard/?rev=184&view=rev
Author:   jdaussel
Date:     2008-01-04 03:51:13 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
Fixed issue on Mac OS X Tiger where SCardReleaseContext fails if SCardConnect is not called, even with a dummy reader

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/scard/scard.i

Modified: trunk/pyscard/src/smartcard/scard/scard.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/scard.i	2008-01-03 09:58:28 UTC (rev 183)
+++ trunk/pyscard/src/smartcard/scard/scard.i	2008-01-04 11:51:13 UTC (rev 184)
@@ -533,6 +533,18 @@
     long lRet;
     winscard_init();
     lRet = (mySCardEstablishContext)( dwScope, NULL, NULL, phContext );
+
+    #ifdef __TIGER__
+        // SCardReleaseContext on Mac OS X Tiger fails if SCardConnect is not called with an established
+        // context, even on a dummy reader
+        if( SCARD_S_SUCCESS==lRet ) 
+        {
+            SCARDHANDLE hcard;
+            SCARDDWORDARG dwarg;
+            (mySCardConnectA)( *phContext, "dummy-reader", SCARD_SHARE_SHARED, SCARD_PROTOCOL_ANY, &hcard, &dwarg );  
+        }
+    #endif // __TIGER__
+
     return lRet;
 }
 


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

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

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

Revision: 193
          http://pyscard.svn.sourceforge.net/pyscard/?rev=193&view=rev
Author:   jdaussel
Date:     2008-02-24 08:43:39 -0800 (Sun, 24 Feb 2008)

Log Message:
-----------
pcsc_stringify not dynamically loaded for Apple Leopard

Modified Paths:
--------------
    trunk/pyscard/src/smartcard/scard/scard.i

Modified: trunk/pyscard/src/smartcard/scard/scard.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/scard.i	2008-02-24 16:29:51 UTC (rev 192)
+++ trunk/pyscard/src/smartcard/scard/scard.i	2008-02-24 16:43:39 UTC (rev 193)
@@ -995,11 +995,16 @@
         return ppszError;
     #endif // WIN32
     #ifdef PCSCLITE
-    #ifdef __TIGER__
-        return (ERRORSTRING*)_pcsc_stringify_error( lErrCode );
-    #endif
-        return (ERRORSTRING*)pcsc_stringify_error( lErrCode );
-    #else
+            #ifdef __APPLE__
+                #ifdef __TIGER__
+                    return (ERRORSTRING*)_pcsc_stringify_error( lErrCode );
+                #endif
+                #ifdef __LEOPARD__
+                    return (ERRORSTRING*)_pcsc_stringify_error( lErrCode );
+                #endif
+            #else
+                return (ERRORSTRING*)pcsc_stringify_error( lErrCode );
+            #endif
     #endif // PCSCLITE
 }
 


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