Changeset 81559 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Oct 28, 2019 10:09:35 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Got rid of the protocol version in VBOX_SHCL_GUEST_FN_CONNECT and internals; instead use the get / query features bit field.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -960 +960 @@
     const PSHCLWINCTX pWinCtx = &pCtx->Win;
 
-    LogRel2(("Shared Clipboard: Worker loop running, using protocol v%RU32\n", pCtx->CmdCtx.uProtocolVer));
+    LogRel2(("Shared Clipboard: Worker loop running\n"));
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
@@ -975 +975 @@
     int rc;
 
-    LogFlowFunc(("uProtocolVer=%RU32\n", pCtx->CmdCtx.uProtocolVer));
-
     uint32_t uMsg;
     uint32_t uFormats;
@@ -985 +983 @@
         PVBGLR3CLIPBOARDEVENT pEvent = NULL;
 
-        LogFlowFunc(("Waiting for host message (protocol v%RU32) ...\n", pCtx->CmdCtx.uProtocolVer));
-
-        if (pCtx->CmdCtx.uProtocolVer == 0) /* Legacy protocol */
+        LogFlowFunc(("Waiting for host message (fHostFeatures=%#RX64) ...\n", pCtx->CmdCtx.fHostFeatures));
+
+        if (pCtx->CmdCtx.fUseLegacyProtocol)
         {
             rc = VbglR3ClipboardGetHostMsgOld(pCtx->CmdCtx.uClientID, &uMsg, &uFormats);
@@ -1030 +1028 @@
             }
         }
-        else /* Protocol >= v1. */
+        else /* Host service has peeking for messages support. */
         {
             pEvent = (PVBGLR3CLIPBOARDEVENT)RTMemAllocZ(sizeof(VBGLR3CLIPBOARDEVENT));