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

[<lu...@us...>]

Revision: 272
          http://pyscard.svn.sourceforge.net/pyscard/?rev=272&view=rev
Author:   ludov
Date:     2009-03-01 16:42:08 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
return codes should not be Windows or Unix specific. They should be
defined (even if never returned) everywhere to provide code portability

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

Modified: trunk/pyscard/src/smartcard/scard/PcscDefs.i
===================================================================
--- trunk/pyscard/src/smartcard/scard/PcscDefs.i	2009-03-01 16:39:27 UTC (rev 271)
+++ trunk/pyscard/src/smartcard/scard/PcscDefs.i	2009-03-01 16:42:08 UTC (rev 272)
@@ -180,30 +180,6 @@
 
 typedef enum
 {
-    SCARD_E_UNEXPECTED               ,
-    SCARD_E_ICC_INSTALLATION         ,
-    SCARD_E_ICC_CREATEORDER          ,
-    SCARD_E_DIR_NOT_FOUND            ,
-    SCARD_E_FILE_NOT_FOUND           ,
-    SCARD_E_NO_DIR                   ,
-    SCARD_E_NO_FILE                  ,
-    SCARD_E_NO_ACCESS                ,
-    SCARD_E_WRITE_TOO_MANY           ,
-    SCARD_E_BAD_SEEK                 ,
-    SCARD_E_INVALID_CHV              ,
-    SCARD_E_UNKNOWN_RES_MNG          ,
-    SCARD_E_NO_SUCH_CERTIFICATE      ,
-    SCARD_E_CERTIFICATE_UNAVAILABLE  ,
-    SCARD_E_NO_READERS_AVAILABLE     ,
-    SCARD_E_COMM_DATA_LOST           ,
-    SCARD_E_NO_KEY_CONTAINER         ,
-    SCARD_E_SERVER_TOO_BUSY          ,
-    SCARD_W_SECURITY_VIOLATION       ,
-    SCARD_W_WRONG_CHV                ,
-    SCARD_W_CHV_BLOCKED              ,
-    SCARD_W_EOF                      ,
-    SCARD_W_CANCELLED_BY_USER        ,
-    SCARD_W_CARD_NOT_AUTHENTICATED   ,
     // from winerror.h
     ERROR_ALREADY_EXISTS
 } ErrorTypeWin32Only;
@@ -307,15 +283,66 @@
 #ifdef SCARD_E_NO_READERS_AVAILABLE
 %constant TYPE SCARD_E_NO_READERS_AVAILABLE = SCARD_E_NO_READERS_AVAILABLE ;
 #else
-%constant TYPE SCARD_E_NO_READERS_AVAILABLE = 0x80100017 ;
+%constant TYPE SCARD_E_NO_READERS_AVAILABLE = 0x8010002E ;
 #endif
 %constant TYPE SCARD_E_UNSUPPORTED_FEATURE = SCARD_E_UNSUPPORTED_FEATURE ;
 %constant TYPE SCARD_W_UNSUPPORTED_CARD    = SCARD_W_UNSUPPORTED_CARD ;
 %constant TYPE SCARD_W_UNRESPONSIVE_CARD   = SCARD_W_UNRESPONSIVE_CARD ;
 %constant TYPE SCARD_W_UNPOWERED_CARD      = SCARD_W_UNPOWERED_CARD ;
 %constant TYPE SCARD_W_RESET_CARD          = SCARD_W_RESET_CARD ;
-%constant TYPE SCARD_W_REMOVED_CARD        = SCARD_W_REMOVED_CARD  ;
+%constant TYPE SCARD_W_REMOVED_CARD        = SCARD_W_REMOVED_CARD ;
 
+#ifdef SCARD_W_SECURITY_VIOLATION
+/* introduced in pcsc-lite > 1.5.2 */
+%constant TYPE SCARD_W_SECURITY_VIOLATION  = SCARD_W_SECURITY_VIOLATION ;
+%constant TYPE SCARD_W_WRONG_CHV           = SCARD_W_WRONG_CHV ;
+%constant TYPE SCARD_W_CHV_BLOCKED         = SCARD_W_CHV_BLOCKED ;
+%constant TYPE SCARD_W_EOF                 = SCARD_W_EOF ;
+%constant TYPE SCARD_W_CANCELLED_BY_USER   = SCARD_W_CANCELLED_BY_USER ;
+%constant TYPE SCARD_W_CARD_NOT_AUTHENTICATED = SCARD_W_CARD_NOT_AUTHENTICATED ;
+%constant TYPE SCARD_E_UNEXPECTED          = SCARD_E_UNEXPECTED ;
+%constant TYPE SCARD_E_ICC_INSTALLATION    = SCARD_E_ICC_INSTALLATION ;
+%constant TYPE SCARD_E_ICC_CREATEORDER     = SCARD_E_ICC_CREATEORDER ;
+%constant TYPE SCARD_E_DIR_NOT_FOUND       = SCARD_E_DIR_NOT_FOUND ;
+%constant TYPE SCARD_E_FILE_NOT_FOUND      = SCARD_E_FILE_NOT_FOUND ;
+%constant TYPE SCARD_E_NO_DIR              = SCARD_E_NO_DIR ;
+%constant TYPE SCARD_E_NO_FILE             = SCARD_E_NO_FILE ;
+%constant TYPE SCARD_E_NO_ACCESS           = SCARD_E_NO_ACCESS ;
+%constant TYPE SCARD_E_WRITE_TOO_MANY      = SCARD_E_WRITE_TOO_MANY ;
+%constant TYPE SCARD_E_BAD_SEEK            = SCARD_E_BAD_SEEK ;
+%constant TYPE SCARD_E_INVALID_CHV         = SCARD_E_INVALID_CHV ;
+%constant TYPE SCARD_E_UNKNOWN_RES_MNG     = SCARD_E_UNKNOWN_RES_MNG ;
+%constant TYPE SCARD_E_NO_SUCH_CERTIFICATE = SCARD_E_NO_SUCH_CERTIFICATE ;
+%constant TYPE SCARD_E_CERTIFICATE_UNAVAILABLE = SCARD_E_CERTIFICATE_UNAVAILABLE ;
+%constant TYPE SCARD_E_COMM_DATA_LOST      = SCARD_E_COMM_DATA_LOST ;
+%constant TYPE SCARD_E_NO_KEY_CONTAINER    = SCARD_E_NO_KEY_CONTAINER ;
+%constant TYPE SCARD_E_SERVER_TOO_BUSY     = SCARD_E_SERVER_TOO_BUSY ;
+#else
+%constant TYPE SCARD_W_SECURITY_VIOLATION  = 0x8010006A ;
+%constant TYPE SCARD_W_WRONG_CHV           = 0x8010006B ;
+%constant TYPE SCARD_W_CHV_BLOCKED         = 0x8010006C ;
+%constant TYPE SCARD_W_EOF                 = 0x8010006D ;
+%constant TYPE SCARD_W_CANCELLED_BY_USER   = 0x8010006E ;
+%constant TYPE SCARD_W_CARD_NOT_AUTHENTICATED = 0x8010006F ;
+%constant TYPE SCARD_E_UNEXPECTED          = 0x8010001F ;
+%constant TYPE SCARD_E_ICC_INSTALLATION    = 0x80100020 ;
+%constant TYPE SCARD_E_ICC_CREATEORDER     = 0x80100021 ;
+%constant TYPE SCARD_E_DIR_NOT_FOUND       = 0x80100023 ;
+%constant TYPE SCARD_E_FILE_NOT_FOUND      = 0x80100024 ;
+%constant TYPE SCARD_E_NO_DIR              = 0x80100025 ;
+%constant TYPE SCARD_E_NO_FILE             = 0x80100026 ;
+%constant TYPE SCARD_E_NO_ACCESS           = 0x80100027 ;
+%constant TYPE SCARD_E_WRITE_TOO_MANY      = 0x80100028 ;
+%constant TYPE SCARD_E_BAD_SEEK            = 0x80100029 ;
+%constant TYPE SCARD_E_INVALID_CHV         = 0x8010002A ;
+%constant TYPE SCARD_E_UNKNOWN_RES_MNG     = 0x8010002B ;
+%constant TYPE SCARD_E_NO_SUCH_CERTIFICATE = 0x8010002C ;
+%constant TYPE SCARD_E_CERTIFICATE_UNAVAILABLE = 0x8010002D ;
+%constant TYPE SCARD_E_COMM_DATA_LOST      = 0x8010002F ;
+%constant TYPE SCARD_E_NO_KEY_CONTAINER    = 0x80100030 ;
+%constant TYPE SCARD_E_SERVER_TOO_BUSY     = 0x80100031 ;
+#endif
+
 #ifdef WIN32
 typedef enum
 {


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