Changeset 41363 in vbox

Timestamp:

May 21, 2012 12:26:40 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78054

Message:

VRDP,Main,Extpack,include: smartcard support: do not use platform specific types.

Location:

trunk

Files:

• include/VBox/RemoteDesktop/VRDESCard.h (modified) (8 diffs)
• include/VBox/vmm/pdmcardreaderinfs.h (added)
• src/VBox/Main/include/UsbCardReader.h (added)
• src/VBox/Main/src-client/UsbCardReader.cpp (added)

trunk/include/VBox/RemoteDesktop/VRDESCard.h

@@ -150 +150 @@
 #define VRDE_SCARD_FN_SETATTRIB        16
 
-#define VRDESCARD_MAX_READERS 10
-#define VRDESCARD_MAX_ATR_LENGTH 36
-#define VRDESCARD_MAX_PCI_DATA 1024
+#define VRDE_SCARD_MAX_READERS 10
+#define VRDE_SCARD_MAX_ATR_LENGTH 36
+#define VRDE_SCARD_MAX_PCI_DATA 1024
+
+#define VRDE_SCARD_S_SUCCESS 0x00000000
+#define VRDE_SCARD_F_INTERNAL_ERROR 0x80100001
+#define VRDE_SCARD_E_CANCELLED 0x80100002
+#define VRDE_SCARD_E_INVALID_HANDLE 0x80100003
+#define VRDE_SCARD_E_INVALID_PARAMETER 0x80100004
+#define VRDE_SCARD_E_INVALID_TARGET 0x80100005
+#define VRDE_SCARD_E_NO_MEMORY 0x80100006
+#define VRDE_SCARD_F_WAITED_TOO_LONG 0x80100007
+#define VRDE_SCARD_E_INSUFFICIENT_BUFFER 0x80100008
+#define VRDE_SCARD_E_UNKNOWN_READER 0x80100009
+#define VRDE_SCARD_E_TIMEOUT 0x8010000A
+#define VRDE_SCARD_E_SHARING_VIOLATION 0x8010000B
+#define VRDE_SCARD_E_NO_SMARTCARD 0x8010000C
+#define VRDE_SCARD_E_UNKNOWN_CARD 0x8010000D
+#define VRDE_SCARD_E_CANT_DISPOSE 0x8010000E
+#define VRDE_SCARD_E_PROTO_MISMATCH 0x8010000F
+#define VRDE_SCARD_E_NOT_READY 0x80100010
+#define VRDE_SCARD_E_INVALID_VALUE 0x80100011
+#define VRDE_SCARD_E_SYSTEM_CANCELLED 0x80100012
+#define VRDE_SCARD_F_COMM_ERROR 0x80100013
+#define VRDE_SCARD_F_UNKNOWN_ERROR 0x80100014
+#define VRDE_SCARD_E_INVALID_ATR 0x80100015
+#define VRDE_SCARD_E_NOT_TRANSACTED 0x80100016
+#define VRDE_SCARD_E_READER_UNAVAILABLE 0x80100017
+#define VRDE_SCARD_P_SHUTDOWN 0x80100018
+#define VRDE_SCARD_E_PCI_TOO_SMALL 0x80100019
+#define VRDE_SCARD_E_ICC_INSTALLATION 0x80100020
+#define VRDE_SCARD_E_ICC_CREATEORDER 0x80100021
+#define VRDE_SCARD_E_UNSUPPORTED_FEATURE 0x80100022
+#define VRDE_SCARD_E_DIR_NOT_FOUND 0x80100023
+#define VRDE_SCARD_E_FILE_NOT_FOUND 0x80100024
+#define VRDE_SCARD_E_NO_DIR 0x80100025
+#define VRDE_SCARD_E_READER_UNSUPPORTED 0x8010001A
+#define VRDE_SCARD_E_DUPLICATE_READER 0x8010001B
+#define VRDE_SCARD_E_CARD_UNSUPPORTED 0x8010001C
+#define VRDE_SCARD_E_NO_SERVICE 0x8010001D
+#define VRDE_SCARD_E_SERVICE_STOPPED 0x8010001E
+#define VRDE_SCARD_E_UNEXPECTED 0x8010001F
+#define VRDE_SCARD_E_NO_FILE 0x80100026
+#define VRDE_SCARD_E_NO_ACCESS 0x80100027
+#define VRDE_SCARD_E_WRITE_TOO_MANY 0x80100028
+#define VRDE_SCARD_E_BAD_SEEK 0x80100029
+#define VRDE_SCARD_E_INVALID_CHV 0x8010002A
+#define VRDE_SCARD_E_UNKNOWN_RES_MSG 0x8010002B
+#define VRDE_SCARD_E_NO_SUCH_CERTIFICATE 0x8010002C
+#define VRDE_SCARD_E_CERTIFICATE_UNAVAILABLE 0x8010002D
+#define VRDE_SCARD_E_NO_READERS_AVAILABLE 0x8010002E
+#define VRDE_SCARD_E_COMM_DATA_LOST 0x8010002F
+#define VRDE_SCARD_E_NO_KEY_CONTAINER 0x80100030
+#define VRDE_SCARD_E_SERVER_TOO_BUSY 0x80100031
+#define VRDE_SCARD_E_PIN_CACHE_EXPIRED 0x80100032
+#define VRDE_SCARD_E_NO_PIN_CACHE 0x80100033
+#define VRDE_SCARD_E_READ_ONLY_CARD 0x80100034
+#define VRDE_SCARD_W_UNSUPPORTED_CARD 0x80100065
+#define VRDE_SCARD_W_UNRESPONSIVE_CARD 0x80100066
+#define VRDE_SCARD_W_UNPOWERED_CARD 0x80100067
+#define VRDE_SCARD_W_RESET_CARD 0x80100068
+#define VRDE_SCARD_W_REMOVED_CARD 0x80100069
+#define VRDE_SCARD_W_SECURITY_VIOLATION 0x8010006A
+#define VRDE_SCARD_W_WRONG_CHV 0x8010006B
+#define VRDE_SCARD_W_CHV_BLOCKED 0x8010006C
+#define VRDE_SCARD_W_EOF 0x8010006D
+#define VRDE_SCARD_W_CANCELLED_BY_USER 0x8010006E
+#define VRDE_SCARD_W_CARD_NOT_AUTHENTICATED 0x8010006F
+#define VRDE_SCARD_W_CACHE_ITEM_NOT_FOUND 0x80100070
+#define VRDE_SCARD_W_CACHE_ITEM_STALE 0x80100071
+#define VRDE_SCARD_W_CACHE_ITEM_TOO_BIG 0x80100072
+
+#define VRDE_SCARD_STATE_UNAWARE      0x0000
+#define VRDE_SCARD_STATE_IGNORE       0x0001
+#define VRDE_SCARD_STATE_CHANGED      0x0002
+#define VRDE_SCARD_STATE_UNKNOWN      0x0004
+#define VRDE_SCARD_STATE_UNAVAILABLE  0x0008
+#define VRDE_SCARD_STATE_EMPTY        0x0010
+#define VRDE_SCARD_STATE_PRESENT      0x0020
+#define VRDE_SCARD_STATE_ATRMATCH     0x0040
+#define VRDE_SCARD_STATE_EXCLUSIVE    0x0080
+#define VRDE_SCARD_STATE_INUSE        0x0100
+#define VRDE_SCARD_STATE_MUTE         0x0200
+#define VRDE_SCARD_STATE_UNPOWERED    0x0400
+#define VRDE_SCARD_STATE_MASK         UINT32_C(0x0000FFFF)
+#define VRDE_SCARD_STATE_COUNT_MASK   UINT32_C(0xFFFF0000)
+
+#define VRDE_SCARD_PROTOCOL_UNDEFINED 0x00000000
+#define VRDE_SCARD_PROTOCOL_T0 0x00000001
+#define VRDE_SCARD_PROTOCOL_T1 0x00000002
+#define VRDE_SCARD_PROTOCOL_Tx 0x00000003
+#define VRDE_SCARD_PROTOCOL_RAW 0x00010000
+
+#define VRDE_SCARD_PROTOCOL_DEFAULT 0x80000000
+#define VRDE_SCARD_PROTOCOL_OPTIMAL 0x00000000
+
+#define VRDE_SCARD_SHARE_EXCLUSIVE 0x00000001
+#define VRDE_SCARD_SHARE_SHARED 0x00000002
+#define VRDE_SCARD_SHARE_DIRECT 0x00000003
+
+/* u32Initialization, u32Disposition */
+#define VRDE_SCARD_LEAVE_CARD 0x00000000
+#define VRDE_SCARD_RESET_CARD 0x00000001
+#define VRDE_SCARD_UNPOWER_CARD 0x00000002
+#define VRDE_SCARD_EJECT_CARD 0x00000003
+
+/* VRDESCARDSTATUSRSP::u32State */
+#define VRDE_SCARD_UNKNOWN 0x00000000
+#define VRDE_SCARD_ABSENT 0x00000001
+#define VRDE_SCARD_PRESENT 0x00000002
+#define VRDE_SCARD_SWALLOWED 0x00000003
+#define VRDE_SCARD_POWERED 0x00000004
+#define VRDE_SCARD_NEGOTIABLE 0x00000005
+#define VRDE_SCARD_SPECIFICMODE 0x00000006
+
 
 /*
@@ -173 +285 @@
 {
     char *pszReader; /* UTF8 */
-    uint32_t u32CurrentState;
+    uint32_t u32CurrentState; /* VRDE_SCARD_STATE_* */
 } VRDESCARDREADERSTATECALL;
 
 typedef struct VRDESCARDREADERSTATERETURN
 {
-    uint32_t u32CurrentState;
-    uint32_t u32EventState;
+    uint32_t u32CurrentState; /* VRDE_SCARD_STATE_* */
+    uint32_t u32EventState; /* VRDE_SCARD_STATE_* */
     uint32_t u32AtrLength;
-    uint8_t au8Atr[VRDESCARD_MAX_ATR_LENGTH];
+    uint8_t au8Atr[VRDE_SCARD_MAX_ATR_LENGTH];
 } VRDESCARDREADERSTATERETURN;
 
 typedef struct VRDESCARDPCI
 {
-    uint32_t u32Protocol;
+    uint32_t u32Protocol; /* VRDE_SCARD_PROTOCOL_* */
     uint32_t u32PciLength; /* Includes u32Protocol and u32PciLength fields. 8 if no data in au8PciData. */
-    uint8_t au8PciData[VRDESCARD_MAX_PCI_DATA];
+    uint8_t au8PciData[VRDE_SCARD_MAX_PCI_DATA];
 } VRDESCARDPCI;
 
@@ -212 +324 @@
     uint32_t u32ReturnCode;
     uint32_t cReaders;
-    char *apszNames[VRDESCARD_MAX_READERS];  /* UTF8 */
+    char *apszNames[VRDE_SCARD_MAX_READERS];  /* UTF8 */
 } VRDESCARDLISTREADERSRSP;
 
@@ -228 +340 @@
 {
     VRDESCARDCONTEXT Context;
-    uint32_t u32Timeout;
+    uint32_t u32Timeout; /* Milliseconds. 0xFFFFFFFF = INFINITE */
     uint32_t cReaders;
-    VRDESCARDREADERSTATECALL aReaderStates[VRDESCARD_MAX_READERS];
+    VRDESCARDREADERSTATECALL aReaderStates[VRDE_SCARD_MAX_READERS];
 } VRDESCARDGETSTATUSCHANGEREQ;
 
@@ -237 +349 @@
     uint32_t u32ReturnCode;
     uint32_t cReaders;
-    VRDESCARDREADERSTATERETURN aReaderStates[VRDESCARD_MAX_READERS];
+    VRDESCARDREADERSTATERETURN aReaderStates[VRDE_SCARD_MAX_READERS];
 } VRDESCARDGETSTATUSCHANGERSP;
 
@@ -254 +366 @@
     VRDESCARDCONTEXT Context;
     char *pszReader; /* UTF8 */
-    uint32_t u32ShareMode;
+    uint32_t u32ShareMode; /* VRDE_SCARD_SHARE_* */
     uint32_t u32PreferredProtocols;
 } VRDESCARDCONNECTREQ;
@@ -323 +435 @@
     uint32_t u32Protocol;
     uint32_t u32AtrLength;
-    uint8_t au8Atr[VRDESCARD_MAX_ATR_LENGTH];
+    uint8_t au8Atr[VRDE_SCARD_MAX_ATR_LENGTH];
 } VRDESCARDSTATERSP;
 
@@ -338 +450 @@
     uint32_t u32Protocol;
     uint32_t u32AtrLength;
-    uint8_t au8Atr[VRDESCARD_MAX_ATR_LENGTH];
+    uint8_t au8Atr[VRDE_SCARD_MAX_ATR_LENGTH];
 } VRDESCARDSTATUSRSP;