Changeset 81220 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Oct 11, 2019 8:19:05 AM (5 years ago)

Author:

vboxsync

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

133901

Message:

Shared Clipboard/Transfers: Update.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (2 diffs)

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

@@ -885 +885 @@
         rc = HGCMSvcGetU32(&paParms[1], &pOpenParms->fList);
         if (RT_SUCCESS(rc))
-            rc = HGCMSvcGetU32(&paParms[2], &cbPath);
-        if (RT_SUCCESS(rc))
-        {
-            rc = HGCMSvcGetStr(&paParms[3], &pOpenParms->pszPath, &pOpenParms->cbPath);
+            rc = HGCMSvcGetU32(&paParms[2], &cbFilter);
+        if (RT_SUCCESS(rc))
+        {
+            rc = HGCMSvcGetStr(&paParms[3], &pOpenParms->pszFilter, &pOpenParms->cbFilter);
+            AssertReturn(cbFilter == pOpenParms->cbFilter, VERR_INVALID_PARAMETER);
+        }
+        if (RT_SUCCESS(rc))
+            rc = HGCMSvcGetU32(&paParms[4], &cbPath);
+        if (RT_SUCCESS(rc))
+        {
+            rc = HGCMSvcGetStr(&paParms[5], &pOpenParms->pszPath, &pOpenParms->cbPath);
             AssertReturn(cbPath == pOpenParms->cbPath, VERR_INVALID_PARAMETER);
         }
-        if (RT_SUCCESS(rc))
-            rc = HGCMSvcGetU32(&paParms[4], &cbFilter);
-        if (RT_SUCCESS(rc))
-        {
-            rc = HGCMSvcGetStr(&paParms[5], &pOpenParms->pszFilter, &pOpenParms->cbFilter);
-            AssertReturn(cbFilter == pOpenParms->cbFilter, VERR_INVALID_PARAMETER);
-        }
-
-        if (RT_SUCCESS(rc))
-        {
-            /** @todo Some more validation. */
-        }
+
+        /** @todo Some more validation. */
     }
     else
@@ -1862 +1859 @@
             rc = shclSvcTransferGetError(cParms,paParms, &rcGuest);
             if (RT_SUCCESS(rc))
-                LogRel(("Shared Clipboard: Transfer error: %Rrc\n", rcGuest));
+                LogRel(("Shared Clipboard: Transfer error from guest: %Rrc\n", rcGuest));
             break;
         }