Changeset 58230 in vbox for trunk/src/VBox

Timestamp:

Oct 14, 2015 11:31:33 AM (9 years ago)

Author:

vboxsync

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

103394

Message:

DnD: Bugfixes.

Location:

trunk/src/VBox

Files:

• HostServices/DragAndDrop/service.cpp (modified) (1 diff)
• Main/include/GuestDnDPrivate.h (modified) (1 diff)
• Main/include/GuestImpl.h (modified) (1 diff)
• Main/src-client/GuestDnDPrivate.cpp (modified) (5 diffs)
• Main/src-client/GuestDnDTargetImpl.cpp (modified) (1 diff)

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

@@ -382 +382 @@
                 if (cParms == 2)
                 {
-                    uint32_t uProtocol;
-                    rc = paParms[0].getUInt32(&uProtocol); /* Get protocol version. */
-                    if (RT_SUCCESS(rc))
-                        rc = pClient->setProtocol(uProtocol);
+                    VBOXDNDCBCONNECTMSGDATA data;
+                    data.hdr.u32Magic = CB_MAGIC_DND_CONNECT;
+                    rc = paParms[0].getUInt32(&data.uProtocol);
+                    if (RT_SUCCESS(rc))
+                        rc = paParms[1].getUInt32(&data.uFlags);
+                    if (RT_SUCCESS(rc))
+                        rc = pClient->setProtocol(data.uProtocol);
                     if (RT_SUCCESS(rc))
                     {
                         LogFlowFunc(("Client %RU32 is now using protocol v%RU32\n", pClient->clientId(), pClient->protocol()));
-                        /** @todo Handle connection flags (paParms[1]). */
+                        DO_HOST_CALLBACK();
                     }
-
-                    /* Note: Does not reach the host; the client's protocol version
-                     *       is only kept in this service. */
                 }
                 break;

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -151 +151 @@
         if (strData.isNotEmpty())
         {
-            const size_t cbData = strData.length() + 1; /* Include terminating zero. */
-            rc = resize(cbData);
+            const size_t cbStrData = strData.length() + 1; /* Include terminating zero. */
+            rc = resize(cbStrData);
             if (RT_SUCCESS(rc))
-                memcpy(pvData, strData.c_str(), cbData);
+                memcpy(pvData, strData.c_str(), cbStrData);
         }
 

trunk/src/VBox/Main/include/GuestImpl.h

@@ -100 +100 @@
         return setErrorInternal(aResultCode, getStaticClassIID(), getStaticComponentName(), aText, false, true);
     }
+    uint32_t    i_getAdditionsRevision(void) { return mData.mAdditionsRevision; }
     uint32_t    i_getAdditionsVersion(void) { return mData.mAdditionsVersionFull; }
     VBOXOSTYPE  i_getGuestOSType(void) { return mData.mOSType; }

trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

@@ -362 +362 @@
     switch (u32Function)
     {
+        case DragAndDropSvc::GUEST_DND_CONNECT:
+        {
+            /* Not used in here (yet). */
+            rc = VINF_SUCCESS;
+            break;
+        }
+
         case DragAndDropSvc::GUEST_DND_HG_ACK_OP:
         {
@@ -743 +750 @@
     /* Initialzie private stuff. */
     mDataBase.m_cTransfersPending = 0;
+    mDataBase.m_uProtocolVersion  = 0;
 }
 
@@ -795 +803 @@
 }
 
+/**
+ * Tries to guess the DnD protocol version to use on the guest, based on the
+ * installed Guest Additions version + revision.
+ *
+ * If unable to retrieve the protocol version, VERR_NOT_FOUND is returned along
+ * with protocol version 1.
+ *
+ * @return  IPRT status code.
+ * @param   puProto                 Where to store the protocol version.
+ */
 int GuestDnDBase::getProtocolVersion(uint32_t *puProto)
 {
@@ -801 +819 @@
     int rc;
 
-    uint32_t uProto        = 1; /* Use protocol v1 as a fallback. */
+    uint32_t uProto        = 0;
     uint32_t uVerAdditions = 0;
+    uint32_t uRevAdditions = 0;
     if (   m_pGuest
-        && (uVerAdditions = m_pGuest->i_getAdditionsVersion()) > 0)
-    {
-#if 1
+        && (uVerAdditions = m_pGuest->i_getAdditionsVersion())  > 0
+        && (uRevAdditions = m_pGuest->i_getAdditionsRevision()) > 0)
+    {
+#ifdef _DEBUG
+# if 0
         /* Hardcode the to-used protocol version; nice for testing side effects. */
         uProto = 3;
-#else
-        if (uVerAdditions >= VBOX_FULL_VERSION_MAKE(5, 0, 0))
-        {
-            if (uVerAdditions >= VBOX_FULL_VERSION_MAKE(5, 0, 8))
+# endif
+#endif
+        if (!uProto) /* Protocol not set yet? */
+        {
+            if (uVerAdditions >= VBOX_FULL_VERSION_MAKE(5, 0, 0))
             {
-                uProto = 3; /* Since VBox 5.0.8: Protocol v3. */
+                if (uRevAdditions >= 103344) /* Since r103344: Protocol v3. */
+                {
+                    uProto = 3;
+                }
+                else
+                    uProto = 2; /* VBox 5.0.0 - 5.0.6: Protocol v2. */
             }
-            else
-                uProto = 2; /* VBox 5.0.0 - 5.0.6: Protocol v2. */
-        }
-#endif
-        LogRel3(("DnD: uVerAdditions=%RU32 (%RU32.%RU32.%RU32)\n",
-                 uVerAdditions, VBOX_FULL_VERSION_GET_MAJOR(uVerAdditions), VBOX_FULL_VERSION_GET_MINOR(uVerAdditions),
-                                VBOX_FULL_VERSION_GET_BUILD(uVerAdditions)));
-        rc = VINF_SUCCESS;
+
+            LogFlowFunc(("uVerAdditions=%RU32 (%RU32.%RU32.%RU32), r%RU32\n",
+                         uVerAdditions, VBOX_FULL_VERSION_GET_MAJOR(uVerAdditions), VBOX_FULL_VERSION_GET_MINOR(uVerAdditions),
+                                        VBOX_FULL_VERSION_GET_BUILD(uVerAdditions), uRevAdditions));
+            rc = VINF_SUCCESS;
+        }
     }
     else
@@ -831 +856 @@
     }
 
-    LogRel3(("DnD: uProto=%RU32, rc=%Rrc\n", uProto, rc));
+    LogRel2(("DnD: Guest is using protocol v%RU32, rc=%Rrc\n", uProto, rc));
 
     *puProto = uProto;

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -804 +804 @@
         Msg.setNextUInt32(pData->getFmtSize());                                            /* cbFormat */
         Msg.setNextPointer(pData->getMeta().getDataMutable(), pData->getMeta().getSize()); /* pvData */
-        /* Note1: Fill in the total data to send.
-         * Note2: Only supports uint32_t. */
-        Msg.setNextUInt32((uint32_t)pData->getTotal());                                    /* cbData */
+        /* Fill in the current data block size to send.
+         * Note: Only supports uint32_t. */
+        Msg.setNextUInt32((uint32_t)pData->getMeta().getSize());                           /* cbData */
     }
     else