Changeset 85722 in vbox

Timestamp:

Aug 12, 2020 5:34:49 PM (4 years ago)

Author:

vboxsync

Message:

DnD: Added wire protocol support for querying and reporting guest / host features in host service and VbglR3. Follow-up for r139856.

Location:

trunk

Files:

• include/VBox/HostServices/DragAndDropSvc.h (modified) (3 diffs)
• src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp (modified) (3 diffs)

trunk/include/VBox/HostServices/DragAndDropSvc.h

@@ -925 +925 @@
 {
     CB_MAGIC_DND_CONNECT                   = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_CONNECT, 0),
+    CB_MAGIC_DND_REPORT_FEATURES           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_REPORT_FEATURES, 0),
     CB_MAGIC_DND_HG_GET_NEXT_HOST_MSG      = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GET_NEXT_HOST_MSG, 0),
     CB_MAGIC_DND_HG_ACK_OP                 = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_HG_ACK_OP, 0),
@@ -946 +947 @@
 } VBOXDNDCBHEADERDATA, *PVBOXDNDCBHEADERDATA;
 
-typedef struct VBOXDNDCBCONNECTMSGDATA
+typedef struct VBOXDNDCBCONNECTDATA
 {
     /** Callback data header. */
@@ -952 +953 @@
     /** Protocol version to use.
      *  Deprecated since VBox 6.1.x. Do not use / rely on it anymore. */
-    uint32_t                    uProtocol;
-    uint32_t                    uFlags;
-} VBOXDNDCBCONNECTMSGDATA, *PVBOXDNDCBCONNECTMSGDATA;
+    uint32_t                    uProtocolVersion;
+    /** Connection flags; currently unused. */
+    uint32_t                    fFlags;
+} VBOXDNDCBCONNECTDATA, *PVBOXDNDCBCONNECTDATA;
+
+typedef struct VBOXDNDCBREPORTFEATURESDATA
+{
+    /** Callback data header. */
+    VBOXDNDCBHEADERDATA         hdr;
+    uint32_t                    fGuestFeatures0;
+} VBOXDNDCBREPORTFEATURESDATA, *PVBOXDNDCBREPORTFEATURESDATA;
 
 typedef struct VBOXDNDCBDISCONNECTMSGDATA

trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp

@@ -605 +605 @@
                 ASSERT_GUEST_BREAK(cParms >= 2);
 
-                VBOXDNDCBCONNECTMSGDATA data;
+                VBOXDNDCBCONNECTDATA data;
                 RT_ZERO(data);
+                data.hdr.uMagic = CB_MAGIC_DND_CONNECT;
 
                 rc = HGCMSvcGetU32(&paParms[idxParm++], &data.hdr.uContextID); \
                 ASSERT_GUEST_RC_BREAK(rc);
-                rc = HGCMSvcGetU32(&paParms[idxParm++], &data.uProtocol);
-                ASSERT_GUEST_RC_BREAK(rc);
-                rc = HGCMSvcGetU32(&paParms[idxParm], &data.uFlags);
+                rc = HGCMSvcGetU32(&paParms[idxParm++], &data.uProtocolVersion);
+                ASSERT_GUEST_RC_BREAK(rc);
+                rc = HGCMSvcGetU32(&paParms[idxParm], &data.fFlags);
                 ASSERT_GUEST_RC_BREAK(rc);
 
@@ -618 +619 @@
 
                 /* Make sure we're only setting a protocl version we're supporting on the host. */
-                if (data.uProtocol > uProtocolVer)
-                    data.uProtocol = uProtocolVer;
-
-                pClient->uProtocolVerDeprecated = data.uProtocol;
+                if (data.uProtocolVersion > uProtocolVer)
+                    data.uProtocolVersion = uProtocolVer;
+
+                pClient->uProtocolVerDeprecated = data.uProtocolVersion;
 
                 /* Return the highest protocol version we're supporting. */
                 AssertBreak(idxParm);
                 ASSERT_GUEST_BREAK(idxParm);
-                paParms[idxParm - 1].u.uint32 = data.uProtocol;
+                paParms[idxParm - 1].u.uint32 = data.uProtocolVersion;
 
                 LogFlowFunc(("Client %RU32 is now using protocol v%RU32\n",
@@ -638 +639 @@
                 LogFlowFunc(("GUEST_DND_REPORT_FEATURES\n"));
                 rc = clientReportFeatures(pClient, callHandle, cParms, paParms);
+                if (RT_SUCCESS(rc))
+                {
+                    VBOXDNDCBREPORTFEATURESDATA data;
+                    RT_ZERO(data);
+                    data.hdr.uMagic = CB_MAGIC_DND_REPORT_FEATURES;
+
+                    data.fGuestFeatures0 = pClient->fGuestFeatures0;
+                    /* fGuestFeatures1 is not used yet. */
+
+                    /* Don't touch initial rc. */
+                    int rc2 = m_SvcCtx.pfnHostCallback(m_SvcCtx.pvHostData, u32Function, &data, sizeof(data));
+                    AssertRC(rc2);
+                }
                 break;
             }