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

Timestamp:

Dec 9, 2019 7:48:38 PM (5 years ago)

Author:

vboxsync

Message:

SharedClipboardSvc,Vbgl: Looked at the connect and feature exchange stuff. Decided to make the connect one always fail, that way the beta and rc additions should not try make use of any of the new features and we should be free to do whatever we like. Need to circle back and drop the _61B parameter count variants later. bugref:9437

File:

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

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

@@ -293 +293 @@
 ClipboardClientQueue g_listClientsDeferred;
 
-/** Host feature mask for VBOX_SHCL_GUEST_FN_REPORT_FEATURES/VBOX_SHCL_GUEST_FN_QUERY_FEATURES. */
-static uint64_t const g_fHostFeatures0 = VBOX_SHCL_HF_NONE;
+/** Host feature mask (VBOX_SHCL_HF_0_XXX) for VBOX_SHCL_GUEST_FN_REPORT_FEATURES
+ * and VBOX_SHCL_GUEST_FN_QUERY_FEATURES. */
+static uint64_t const g_fHostFeatures0 = VBOX_SHCL_HF_0_CONTEXT_ID;
 
 
@@ -1849 +1850 @@
 
         case VBOX_SHCL_GUEST_FN_CONNECT:
-        {
-            if (cParms != VBOX_SHCL_CPARMS_CONNECT)
-            {
-                rc = VERR_INVALID_PARAMETER;
-            }
-            else if (   paParms[0].type != VBOX_HGCM_SVC_PARM_32BIT  /* cbChunkSize */
-                     || paParms[1].type != VBOX_HGCM_SVC_PARM_32BIT  /* enmCompression */
-                     || paParms[2].type != VBOX_HGCM_SVC_PARM_32BIT) /* enmChecksumType */
-            {
-                rc = VERR_INVALID_PARAMETER;
-            }
-            else if (ShClSvcGetMode() == VBOX_SHCL_MODE_OFF)
-            {
-                rc = VERR_ACCESS_DENIED;
-            }
-            else
-            {
-                /* Report back supported chunk size to the guest. */
-                HGCMSvcSetU32(&paParms[0], _64K); /* Chunk size */ /** @todo Make chunk size dynamic. */
-
-                rc = VINF_SUCCESS;
-            }
+            LogRel(("6.1.0 beta or rc additions detected. Please upgrade!\n"));
+            rc = VERR_NOT_IMPLEMENTED;
             break;
-        }
 
         case VBOX_SHCL_GUEST_FN_REPORT_FEATURES: