Changeset 84996 in vbox for trunk/src

Timestamp:

Jun 29, 2020 4:21:34 PM (5 years ago)

Author:

vboxsync

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

138891

Message:

Shared Clipboard/Transfers: Removed some superfluous HGCM parameters. Untested.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (12 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (10 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -817 +817 @@
     Msg.enmType.SetUInt32(VBOX_SHCL_REPLYMSGTYPE_TRANSFER_STATUS);
     Msg.rc.SetUInt32((uint32_t )rcTransfer); /* int vs. uint32_t */
-    Msg.cbPayload.SetUInt32(0);
     Msg.pvPayload.SetPtr(NULL, 0);
 
@@ -986 +985 @@
     Msg.uContext.SetUInt64(pCtx->idContext);
     Msg.fList.SetUInt32(0);
-    Msg.cbFilter.SetUInt32(pOpenParms->cbFilter);
     Msg.pvFilter.SetPtr(pOpenParms->pszFilter, pOpenParms->cbFilter);
-    Msg.cbPath.SetUInt32(pOpenParms->cbPath);
     Msg.pvPath.SetPtr(pOpenParms->pszPath, pOpenParms->cbPath);
     Msg.uHandle.SetUInt64(0);
@@ -1022 +1019 @@
     Msg.uContext.SetUInt64(VBOX_SHCL_HOST_MSG_TRANSFER_LIST_OPEN);
     Msg.fList.SetUInt32(0);
-    Msg.cbPath.SetUInt32(pOpenParms->cbPath);
     Msg.pvPath.SetPtr(pOpenParms->pszPath, pOpenParms->cbPath);
-    Msg.cbFilter.SetUInt32(pOpenParms->cbFilter);
     Msg.pvFilter.SetPtr(pOpenParms->pszFilter, pOpenParms->cbFilter);
     Msg.uHandle.SetUInt64(0);
@@ -1034 +1029 @@
         if (RT_SUCCESS(rc))
             rc = Msg.fList.GetUInt32(&pOpenParms->fList);
-        if (RT_SUCCESS(rc))
-            rc = Msg.cbFilter.GetUInt32(&pOpenParms->cbFilter);
-        if (RT_SUCCESS(rc))
-            rc = Msg.cbPath.GetUInt32(&pOpenParms->cbPath);
     }
 
@@ -1065 +1056 @@
     Msg.enmType.SetUInt32(VBOX_SHCL_REPLYMSGTYPE_LIST_OPEN);
     Msg.rc.SetUInt32((uint32_t)rcReply); /** int vs. uint32_t */
-    Msg.cbPayload.SetUInt32(0);
     Msg.pvPayload.SetPtr(NULL, 0);
 
@@ -1130 +1120 @@
     Msg.enmType.SetUInt32(VBOX_SHCL_REPLYMSGTYPE_LIST_CLOSE);
     Msg.rc.SetUInt32((uint32_t)rcReply); /** int vs. uint32_t */
-    Msg.cbPayload.SetUInt32(0);
     Msg.pvPayload.SetPtr(NULL, 0);
 
@@ -1414 +1403 @@
     Msg.uContext.SetUInt64(VBOX_SHCL_HOST_MSG_TRANSFER_OBJ_OPEN);
     Msg.uHandle.SetUInt64(0);
-    Msg.cbPath.SetUInt32(pCreateParms->cbPath);
     Msg.szPath.SetPtr(pCreateParms->pszPath, pCreateParms->cbPath);
     Msg.fCreate.SetUInt32(0);
@@ -1422 +1410 @@
     {
         rc = Msg.uContext.GetUInt64(&pCtx->idContext);
-        if (RT_SUCCESS(rc))
-            rc = Msg.cbPath.GetUInt32(&pCreateParms->cbPath);
         if (RT_SUCCESS(rc))
             rc = Msg.fCreate.GetUInt32(&pCreateParms->fCreate);
@@ -1453 +1439 @@
     Msg.enmType.SetUInt32(VBOX_SHCL_REPLYMSGTYPE_OBJ_OPEN);
     Msg.rc.SetUInt32((uint32_t)rcReply); /** int vs. uint32_t */
-    Msg.cbPayload.SetUInt32(0);
     Msg.pvPayload.SetPtr(NULL, 0);
 
@@ -1487 +1472 @@
     Msg.uContext.SetUInt64(pCtx->idContext);
     Msg.uHandle.SetUInt64(0);
-    Msg.cbPath.SetUInt32(pCreateParms->cbPath);
     Msg.szPath.SetPtr((void *)pCreateParms->pszPath, pCreateParms->cbPath);
     Msg.fCreate.SetUInt32(pCreateParms->fCreate);
@@ -1555 +1539 @@
     Msg.enmType.SetUInt32(VBOX_SHCL_REPLYMSGTYPE_OBJ_CLOSE);
     Msg.rc.SetUInt32((uint32_t)rcReply); /** int vs. uint32_t */
-    Msg.cbPayload.SetUInt32(0);
     Msg.pvPayload.SetPtr(NULL, 0);
 
@@ -1710 +1693 @@
     Msg.uHandle.SetUInt64(hObj);
     Msg.pvData.SetPtr(pvData, cbData);
-    Msg.cbData.SetUInt32(cbData);
     Msg.pvChecksum.SetPtr(NULL, 0);
-    Msg.cbChecksum.SetUInt32(0);
 
     int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp

@@ -791 +791 @@
     if (cParms >= VBOX_SHCL_CPARMS_REPLY_MIN)
     {
-        uint32_t cbPayload = 0;
-
         /* aParms[0] has the context ID. */
         rc = HGCMSvcGetU32(&aParms[1], &pReply->uType);
@@ -798 +796 @@
             rc = HGCMSvcGetU32(&aParms[2], &pReply->rc);
         if (RT_SUCCESS(rc))
-            rc = HGCMSvcGetU32(&aParms[3], &cbPayload);
-        if (RT_SUCCESS(rc))
-        {
-            rc = HGCMSvcGetPv(&aParms[4], &pReply->pvPayload, &pReply->cbPayload);
-            AssertReturn(cbPayload == pReply->cbPayload, VERR_INVALID_PARAMETER);
-        }
+            rc = HGCMSvcGetPv(&aParms[3], &pReply->pvPayload, &pReply->cbPayload);
 
         if (RT_SUCCESS(rc))
@@ -809 +802 @@
             rc = VERR_INVALID_PARAMETER; /* Play safe. */
 
+            const unsigned idxParm = VBOX_SHCL_CPARMS_REPLY_MIN;
+
             switch (pReply->uType)
             {
                 case VBOX_SHCL_REPLYMSGTYPE_TRANSFER_STATUS:
                 {
-                    if (cParms >= 6)
-                        rc = HGCMSvcGetU32(&aParms[5], &pReply->u.TransferStatus.uStatus);
+                    if (cParms > idxParm)
+                        rc = HGCMSvcGetU32(&aParms[idxParm], &pReply->u.TransferStatus.uStatus);
 
                     LogFlowFunc(("uTransferStatus=%RU32\n", pReply->u.TransferStatus.uStatus));
@@ -822 +817 @@
                 case VBOX_SHCL_REPLYMSGTYPE_LIST_OPEN:
                 {
-                    if (cParms >= 6)
-                        rc = HGCMSvcGetU64(&aParms[5], &pReply->u.ListOpen.uHandle);
+                    if (cParms > idxParm)
+                        rc = HGCMSvcGetU64(&aParms[idxParm], &pReply->u.ListOpen.uHandle);
 
                     LogFlowFunc(("hListOpen=%RU64\n", pReply->u.ListOpen.uHandle));
@@ -831 +826 @@
                 case VBOX_SHCL_REPLYMSGTYPE_LIST_CLOSE:
                 {
-                    if (cParms >= 6)
-                        rc = HGCMSvcGetU64(&aParms[5], &pReply->u.ListClose.uHandle);
+                    if (cParms > idxParm)
+                        rc = HGCMSvcGetU64(&aParms[idxParm], &pReply->u.ListClose.uHandle);
 
                     LogFlowFunc(("hListClose=%RU64\n", pReply->u.ListClose.uHandle));
@@ -840 +835 @@
                 case VBOX_SHCL_REPLYMSGTYPE_OBJ_OPEN:
                 {
-                    if (cParms >= 6)
-                        rc = HGCMSvcGetU64(&aParms[5], &pReply->u.ObjOpen.uHandle);
+                    if (cParms > idxParm)
+                        rc = HGCMSvcGetU64(&aParms[idxParm], &pReply->u.ObjOpen.uHandle);
 
                     LogFlowFunc(("hObjOpen=%RU64\n", pReply->u.ObjOpen.uHandle));
@@ -849 +844 @@
                 case VBOX_SHCL_REPLYMSGTYPE_OBJ_CLOSE:
                 {
-                    if (cParms >= 6)
-                        rc = HGCMSvcGetU64(&aParms[5], &pReply->u.ObjClose.uHandle);
+                    if (cParms > idxParm)
+                        rc = HGCMSvcGetU64(&aParms[idxParm], &pReply->u.ObjClose.uHandle);
 
                     LogFlowFunc(("hObjClose=%RU64\n", pReply->u.ObjClose.uHandle));
@@ -947 +942 @@
     if (cParms == VBOX_SHCL_CPARMS_LIST_OPEN)
     {
-        uint32_t cbPath   = 0;
-        uint32_t cbFilter = 0;
-
         rc = HGCMSvcGetU32(&aParms[1], &pOpenParms->fList);
         if (RT_SUCCESS(rc))
-            rc = HGCMSvcGetU32(&aParms[2], &cbFilter);
-        if (RT_SUCCESS(rc))
-        {
-            rc = HGCMSvcGetStr(&aParms[3], &pOpenParms->pszFilter, &pOpenParms->cbFilter);
-            AssertReturn(cbFilter == pOpenParms->cbFilter, VERR_INVALID_PARAMETER);
-        }
-        if (RT_SUCCESS(rc))
-            rc = HGCMSvcGetU32(&aParms[4], &cbPath);
-        if (RT_SUCCESS(rc))
-        {
-            rc = HGCMSvcGetStr(&aParms[5], &pOpenParms->pszPath, &pOpenParms->cbPath);
-            AssertReturn(cbPath == pOpenParms->cbPath, VERR_INVALID_PARAMETER);
-        }
+            rc = HGCMSvcGetStr(&aParms[2], &pOpenParms->pszFilter, &pOpenParms->cbFilter);
+        if (RT_SUCCESS(rc))
+            rc = HGCMSvcGetStr(&aParms[3], &pOpenParms->pszPath, &pOpenParms->cbPath);
 
         /** @todo Some more validation. */
@@ -993 +975 @@
         HGCMSvcSetU64(&aParms[0], idCtx);
         HGCMSvcSetU32(&aParms[1], pOpenParms->fList);
-        HGCMSvcSetU32(&aParms[2], pOpenParms->cbFilter);
-        HGCMSvcSetPv (&aParms[3], pOpenParms->pszFilter, pOpenParms->cbFilter);
-        HGCMSvcSetU32(&aParms[4], pOpenParms->cbPath);
-        HGCMSvcSetPv (&aParms[5], pOpenParms->pszPath, pOpenParms->cbPath);
-        HGCMSvcSetU64(&aParms[6], 0); /* OUT: uHandle */
+        HGCMSvcSetPv (&aParms[2], pOpenParms->pszFilter, pOpenParms->cbFilter);
+        HGCMSvcSetPv (&aParms[3], pOpenParms->pszPath, pOpenParms->cbPath);
+        HGCMSvcSetU64(&aParms[4], 0); /* OUT: uHandle */
 
         rc = VINF_SUCCESS;
@@ -1623 +1603 @@
             RT_ZERO(openCreateParms);
 
-            uint32_t cbPath;
-            rc = HGCMSvcGetU32(&aParms[2], &cbPath); /** @todo r=bird: This is an pointless parameter. */
-            if (RT_SUCCESS(rc))
-            {
-                /** @todo r=bird: This is the wrong way of getting a string!   */
-                rc = HGCMSvcGetPv(&aParms[3], (void **)&openCreateParms.pszPath, &openCreateParms.cbPath);
-                if (cbPath != openCreateParms.cbPath)
-                    rc = VERR_INVALID_PARAMETER;
-            }
-            if (RT_SUCCESS(rc))
-                rc = HGCMSvcGetU32(&aParms[4], &openCreateParms.fCreate);
+            /* aParms[1] will return the object handle on success; see below. */
+            rc = HGCMSvcGetStr(&aParms[2], &openCreateParms.pszPath, &openCreateParms.cbPath);
+            if (RT_SUCCESS(rc))
+                rc = HGCMSvcGetU32(&aParms[3], &openCreateParms.fCreate);
 
             if (RT_SUCCESS(rc))