Changeset 80968 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Sep 24, 2019 11:40:42 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/VbglR3: Fixes for legacy protocol handling.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (7 diffs)

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

@@ -172 +172 @@
                            VBOX_SHCL_GUEST_FN_MSG_GET, 3);
 
-        Msg.uContext.SetUInt32(VBOX_SHCL_HOST_MSG_FORMATS_REPORT);
-        Msg.uFormats.SetUInt32(0);
-        Msg.fFlags.SetUInt32(0);
-    }
-
-    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-    {
-        rc = Msg.uContext.GetUInt32(&pCtx->uContextID);
-        if (RT_SUCCESS(rc))
-            rc = Msg.uFormats.GetUInt32(&pFormats->uFormats);
-        if (RT_SUCCESS(rc))
-            rc = Msg.fFlags.GetUInt32(&pFormats->fFlags);
+        Msg.u.v1.uContext.SetUInt32(VBOX_SHCL_HOST_MSG_FORMATS_REPORT);
+        Msg.u.v1.uFormats.SetUInt32(0);
+        Msg.u.v1.fFlags.SetUInt32(0);
+    }
+
+    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+    {
+        rc = Msg.u.v1.uContext.GetUInt32(&pCtx->uContextID);
+        if (RT_SUCCESS(rc))
+            rc = Msg.u.v1.uFormats.GetUInt32(&pFormats->uFormats);
+        if (RT_SUCCESS(rc))
+            rc = Msg.u.v1.fFlags.GetUInt32(&pFormats->fFlags);
     }
 
@@ -1290 +1290 @@
                  uTransferID,
                  enmDir    == SHCLTRANSFERDIR_READ ? "reading from" : "writing to",
-                 enmSource == SHCLSOURCE_LOCAL     ? "local"   : "remote"));
+                 enmSource == SHCLSOURCE_LOCAL     ? "local"        : "remote"));
     }
     else
@@ -1368 +1368 @@
                 const SHCLTRANSFERID uTransferID = VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID);
 
-                LogFlowFunc(("[Transfer %RU16] %s\n", uTransferID, VBoxShClTransferStatusToStr(transferReport.uStatus)));
+                LogFlowFunc(("[Transfer %RU16] enmDir=%RU32, status=%s\n",
+                             uTransferID, enmDir, VBoxShClTransferStatusToStr(transferReport.uStatus)));
 
                 switch (transferReport.uStatus)
@@ -1890 +1891 @@
     VBoxShClFormatsMsg Msg;
 
+    int rc;
+
     if (pCtx->uProtocolVer == 0)
     {
         VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, VBOX_SHCL_GUEST_FN_FORMATS_REPORT, 1);
-        VbglHGCMParmUInt32Set(&Msg.uFormats, pFormats->uFormats);
+        Msg.u.v0.uFormats.SetUInt32(pFormats->uFormats);
+
+        rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg.hdr) + sizeof(Msg.u.v0));
     }
     else
@@ -1899 +1904 @@
         VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, VBOX_SHCL_GUEST_FN_FORMATS_REPORT, 3);
 
-        Msg.uContext.SetUInt32(pCtx->uContextID);
-        Msg.uFormats.SetUInt32(pFormats->uFormats);
-        Msg.fFlags.SetUInt32(pFormats->fFlags);
-    }
-
-    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+        Msg.u.v1.uContext.SetUInt32(pCtx->uContextID);
+        Msg.u.v1.uFormats.SetUInt32(pFormats->uFormats);
+        Msg.u.v1.fFlags.SetUInt32(pFormats->fFlags);
+
+        rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg.hdr) + sizeof(Msg.u.v1));
+    }
 
     LogFlowFuncLeaveRC(rc);
@@ -1924 +1929 @@
 
     VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, VBOX_SHCL_GUEST_FN_FORMATS_REPORT, 1);
-    VbglHGCMParmUInt32Set(&Msg.uFormats, fFormats);
-
-    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    VbglHGCMParmUInt32Set(&Msg.u.v0.uFormats, fFormats);
+
+    return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg.hdr) + sizeof(Msg.u.v0));
 }
 
@@ -1952 +1957 @@
     VbglHGCMParmPtrSet(&Msg.u.v0.ptr, pv, cb);
 
-    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg.hdr) + sizeof(Msg.u.v0));
 
     LogFlowFuncLeaveRC(rc);