Changeset 42433 in vbox

Timestamp:

Jul 27, 2012 11:30:39 AM (12 years ago)

Author:

vboxsync

Message:

Main/UsbCardReader: fixes.

File:

• trunk/src/VBox/Main/src-client/UsbCardReader.cpp (modified) (24 diffs)

trunk/src/VBox/Main/src-client/UsbCardReader.cpp

@@ -774 +774 @@
         case VRDE_SCARD_FN_ESTABLISHCONTEXT:
         {
-            Assert(cbData == sizeof(VRDESCARDESTABLISHCONTEXTRSP));
+            Assert(cbData == sizeof(VRDESCARDESTABLISHCONTEXTRSP) || RT_FAILURE(rcRequest));
             VRDESCARDESTABLISHCONTEXTRSP *pRsp = (VRDESCARDESTABLISHCONTEXTRSP *)pvData;
             UCRREMOTE *pRemote = (UCRREMOTE *)pvUser;
@@ -798 +798 @@
         case VRDE_SCARD_FN_LISTREADERS:
         {
-            Assert(cbData == sizeof(VRDESCARDLISTREADERSRSP));
+            Assert(cbData == sizeof(VRDESCARDLISTREADERSRSP) || RT_FAILURE(rcRequest));
             VRDESCARDLISTREADERSRSP *pRsp = (VRDESCARDLISTREADERSRSP *)pvData;
             UCRREMOTE *pRemote = (UCRREMOTE *)pvUser;
@@ -831 +831 @@
         case VRDE_SCARD_FN_RELEASECONTEXT:
         {
-            Assert(cbData == sizeof(VRDESCARDRELEASECONTEXTRSP));
+            Assert(cbData == sizeof(VRDESCARDRELEASECONTEXTRSP) || RT_FAILURE(rcRequest));
             VRDESCARDRELEASECONTEXTRSP *pRsp = (VRDESCARDRELEASECONTEXTRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -845 +845 @@
         case VRDE_SCARD_FN_GETSTATUSCHANGE:
         {
-            Assert(cbData == sizeof(VRDESCARDGETSTATUSCHANGERSP));
+            Assert(cbData == sizeof(VRDESCARDGETSTATUSCHANGERSP) || RT_FAILURE(rcRequest));
             VRDESCARDGETSTATUSCHANGERSP *pRsp = (VRDESCARDGETSTATUSCHANGERSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -854 +854 @@
 
             uint32_t rcCard;
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(rcRequest))
             {
                 rcCard = VRDE_SCARD_E_NO_SMARTCARD;
@@ -903 +903 @@
         case VRDE_SCARD_FN_CANCEL:
         {
-            Assert(cbData == sizeof(VRDESCARDCANCELRSP));
+            Assert(cbData == sizeof(VRDESCARDCANCELRSP) || RT_FAILURE(rcRequest));
             VRDESCARDCANCELRSP *pRsp = (VRDESCARDCANCELRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -914 +914 @@
         case VRDE_SCARD_FN_CONNECT:
         {
-            Assert(cbData == sizeof(VRDESCARDCONNECTRSP));
+            Assert(cbData == sizeof(VRDESCARDCONNECTRSP) || RT_FAILURE(rcRequest));
             VRDESCARDCONNECTRSP *pRsp = (VRDESCARDCONNECTRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -925 +925 @@
             uint32_t rcCard;
 
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(rcRequest))
             {
                 rcCard = VRDE_SCARD_E_NO_SMARTCARD;
@@ -953 +953 @@
         case VRDE_SCARD_FN_RECONNECT:
         {
-            Assert(cbData == sizeof(VRDESCARDRECONNECTRSP));
+            Assert(cbData == sizeof(VRDESCARDRECONNECTRSP) || RT_FAILURE(rcRequest));
             VRDESCARDRECONNECTRSP *pRsp = (VRDESCARDRECONNECTRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -964 +964 @@
         case VRDE_SCARD_FN_DISCONNECT:
         {
-            Assert(cbData == sizeof(VRDESCARDDISCONNECTRSP));
+            Assert(cbData == sizeof(VRDESCARDDISCONNECTRSP) || RT_FAILURE(rcRequest));
             VRDESCARDDISCONNECTRSP *pRsp = (VRDESCARDDISCONNECTRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -976 +976 @@
             uint32_t rcCard;
 
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(rcRequest))
             {
                 rcCard = VRDE_SCARD_E_NO_SMARTCARD;
@@ -994 +994 @@
         case VRDE_SCARD_FN_BEGINTRANSACTION:
         {
-            Assert(cbData == sizeof(VRDESCARDBEGINTRANSACTIONRSP));
+            Assert(cbData == sizeof(VRDESCARDBEGINTRANSACTIONRSP) || RT_FAILURE(rcRequest));
             VRDESCARDBEGINTRANSACTIONRSP *pRsp = (VRDESCARDBEGINTRANSACTIONRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -1005 +1005 @@
         case VRDE_SCARD_FN_ENDTRANSACTION:
         {
-            Assert(cbData == sizeof(VRDESCARDENDTRANSACTIONRSP));
+            Assert(cbData == sizeof(VRDESCARDENDTRANSACTIONRSP) || RT_FAILURE(rcRequest));
             VRDESCARDENDTRANSACTIONRSP *pRsp = (VRDESCARDENDTRANSACTIONRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -1016 +1016 @@
         case VRDE_SCARD_FN_STATE:
         {
-            Assert(cbData == sizeof(VRDESCARDSTATERSP));
+            Assert(cbData == sizeof(VRDESCARDSTATERSP) || RT_FAILURE(rcRequest));
             VRDESCARDSTATERSP *pRsp = (VRDESCARDSTATERSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -1027 +1027 @@
         case VRDE_SCARD_FN_STATUS:
         {
-            Assert(cbData == sizeof(VRDESCARDSTATUSRSP));
+            Assert(cbData == sizeof(VRDESCARDSTATUSRSP) || RT_FAILURE(rcRequest));
             VRDESCARDSTATUSRSP *pRsp = (VRDESCARDSTATUSRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -1044 +1044 @@
             uint32_t rcCard;
 
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(rcRequest))
             {
                 rcCard = VRDE_SCARD_E_NO_SMARTCARD;
@@ -1078 +1078 @@
         case VRDE_SCARD_FN_TRANSMIT:
         {
-            Assert(cbData == sizeof(VRDESCARDTRANSMITRSP));
+            Assert(cbData == sizeof(VRDESCARDTRANSMITRSP) || RT_FAILURE(rcRequest));
             VRDESCARDTRANSMITRSP *pRsp = (VRDESCARDTRANSMITRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -1092 +1092 @@
             uint32_t rcCard;
 
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(rcRequest))
             {
                 rcCard = VRDE_SCARD_E_NO_SMARTCARD;
@@ -1122 +1122 @@
         case VRDE_SCARD_FN_CONTROL:
         {
-            Assert(cbData == sizeof(VRDESCARDCONTROLRSP));
+            Assert(cbData == sizeof(VRDESCARDCONTROLRSP) || RT_FAILURE(rcRequest));
             VRDESCARDCONTROLRSP *pRsp = (VRDESCARDCONTROLRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -1135 +1135 @@
             uint32_t rcCard;
 
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(rcRequest))
             {
                 rcCard = VRDE_SCARD_E_NO_SMARTCARD;
@@ -1162 +1162 @@
         case VRDE_SCARD_FN_GETATTRIB:
         {
-            Assert(cbData == sizeof(VRDESCARDGETATTRIBRSP));
+            Assert(cbData == sizeof(VRDESCARDGETATTRIBRSP) || RT_FAILURE(rcRequest));
             VRDESCARDGETATTRIBRSP *pRsp = (VRDESCARDGETATTRIBRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -1175 +1175 @@
             uint32_t rcCard;
 
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(rcRequest))
             {
                 rcCard = VRDE_SCARD_E_NO_SMARTCARD;
@@ -1202 +1202 @@
         case VRDE_SCARD_FN_SETATTRIB:
         {
-            Assert(cbData == sizeof(VRDESCARDSETATTRIBRSP));
+            Assert(cbData == sizeof(VRDESCARDSETATTRIBRSP) || RT_FAILURE(rcRequest));
             VRDESCARDSETATTRIBRSP *pRsp = (VRDESCARDSETATTRIBRSP *)pvData;
             UCRREQCTX *pCtx = (UCRREQCTX *)pvUser;
@@ -1212 +1212 @@
             uint32_t rcCard;
 
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(rcRequest))
             {
                 rcCard = VRDE_SCARD_E_NO_SMARTCARD;