Changeset 50561 in vbox for trunk/src/VBox/HostServices/DragAndDrop

Timestamp:

Feb 24, 2014 9:07:22 PM (11 years ago)

Author:

vboxsync

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

92425

Message:

DnD: Update, bugfixes.

Location:

trunk/src/VBox/HostServices/DragAndDrop

Files:

• dndmanager.cpp (modified) (12 diffs)
• service.cpp (modified) (16 diffs)

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

@@ -41 +41 @@
 
 /**
- * Internal DnD message class for informing the guest about a new directory.
+ * Internal DnD message class for informing the
+ * guest about a new directory.
  *
  * @see DnDHGSendDataMessage
@@ -55 +56 @@
         , m_pvProgressUser(pvProgressUser)
     {
+        RTCString strPath = m_URIObject.GetDestPath();
+        LogFlowFunc(("strPath=%s (%zu)\n", strPath.c_str(), strPath.length()));
+
         VBOXHGCMSVCPARM paTmpParms[3];
-        paTmpParms[0].setString(m_URIObject.GetDestPath().c_str());
-        paTmpParms[1].setUInt32((uint32_t)(m_URIObject.GetDestPath().length() + 1));
+        paTmpParms[0].setString(strPath.c_str());
+        paTmpParms[1].setUInt32((uint32_t)(strPath.length() + 1));
         paTmpParms[2].setUInt32(m_URIObject.GetMode());
 
         m_pNextMsg = new HGCM::Message(DragAndDropSvc::HOST_DND_HG_SND_DIR, 3, paTmpParms);
     }
+
+public:
 
     int currentMessage(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
@@ -78 +84 @@
     DnDURIObject           m_URIObject;
 
-    /* Progress stuff */
+    /* Progress stuff. */
     PFNDNDPRIVATEPROGRESS  m_pfnProgressCallback;
     void                  *m_pvProgressUser;
@@ -96 +102 @@
     virtual ~DnDHGSendFilePrivate(void);
 
+public:
+
     int currentMessage(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
 
@@ -101 +109 @@
 
     DnDURIObject           m_URIObject;
-    VBOXHGCMSVCPARM        m_paSkelParms[5];
-
-    /* Progress stuff */
+    /** Skeleton parameters for the next upcoming message in case
+     *  the file data didn't fit completely into the first one. */
+    VBOXHGCMSVCPARM        m_aSkelParms[5];
+
+    /* Progress stuff. */
     PFNDNDPRIVATEPROGRESS  m_pfnProgressCallback;
     void                  *m_pvProgressUser;
@@ -127 +137 @@
     size_t                 m_cbDone;
 
-    /* Progress stuff */
+    /* Progress stuff. */
     PFNDNDPRIVATEPROGRESS  m_pfnProgressCallback;
     void                  *m_pvProgressUser;
@@ -146 +156 @@
     , m_pvProgressUser(pvProgressUser)
 {
-    m_paSkelParms[0].setString(m_URIObject.GetDestPath().c_str());
-    m_paSkelParms[1].setUInt32((uint32_t)(m_URIObject.GetDestPath().length() + 1));
-    m_paSkelParms[2].setPointer(NULL, 0);
-    m_paSkelParms[3].setUInt32(0);
-    m_paSkelParms[4].setUInt32(m_URIObject.GetMode());
-
-    m_pNextMsg = new HGCM::Message(DragAndDropSvc::HOST_DND_HG_SND_FILE, 5, m_paSkelParms);
+    LogFlowFunc(("strPath=%s (%zu)\n",
+                 m_URIObject.GetDestPath().c_str(), m_URIObject.GetDestPath().length()));
+
+    m_aSkelParms[0].setString(m_URIObject.GetDestPath().c_str()); /* pvName */
+    m_aSkelParms[1].setUInt32((uint32_t)(m_URIObject.GetDestPath().length() + 1)); /* cbName */
+    m_aSkelParms[2].setPointer(NULL, 0); /* pvData */
+    m_aSkelParms[3].setUInt32(0); /* cbData */
+    m_aSkelParms[4].setUInt32(m_URIObject.GetMode()); /* fMode */
+
+    m_pNextMsg = new HGCM::Message(DragAndDropSvc::HOST_DND_HG_SND_FILE, 5, m_aSkelParms);
 }
 
@@ -174 +187 @@
     {
         /* Get buffer size + pointer to buffer from guest side. */
-        uint32_t cbToRead = paParms[2].u.pointer.size;
+        uint32_t cbToRead = paParms[2].u.pointer.size; /* cbData */
         Assert(cbToRead);
-        void *pvBuf = paParms[2].u.pointer.addr;
+        void *pvBuf = paParms[2].u.pointer.addr; /* pvData */
         AssertPtr(pvBuf);
 
         rc = m_URIObject.Read(pvBuf, cbToRead, &cbRead);
+        LogFlowFunc(("Read %RU32 bytes (%RU32 bytes buffer) for \"%s\", rc=%Rrc\n",
+                     cbRead, cbToRead, m_URIObject.GetDestPath().c_str(), rc));
+
         if (RT_LIKELY(RT_SUCCESS(rc)))
         {
-            /* Tell the guest the actual size. */
-            paParms[3].setUInt32((uint32_t)cbRead);
+            /* Tell the guest the actual size read. */
+            paParms[3].setUInt32((uint32_t)cbRead); /* cbData */
         }
     }
@@ -195 +211 @@
                 /* More data needed to send over. Prepare the next message. */
                 m_pNextMsg = new HGCM::Message(DragAndDropSvc::HOST_DND_HG_SND_FILE, 5 /* cParms */,
-                                               m_paSkelParms);
+                                               m_aSkelParms);
             }
             catch(std::bad_alloc &)
@@ -323 +339 @@
         Assert(cbList);
 
-        LogFlowFunc(("Old data: '%s'\n", pszList));
+        LogFlowFunc(("Old data (%RU32 bytes): '%s'\n", cbList, pszList));
 
         /* The list is separated by newline (even if only one file is listed). */
@@ -330 +346 @@
         if (!lstURIOrg.isEmpty())
         {
-            rc = m_lstURI.AppendNativePathsFromList(lstURIOrg, 0 /* fFlags */);
+            rc = m_lstURI.AppendURIPathsFromList(lstURIOrg, 0 /* fFlags */);
             if (RT_SUCCESS(rc))
             {
@@ -351 +367 @@
                 paParms[4].u.uint32       = (uint32_t)(strNewURIs.length() + 1);
 
-                LogFlowFunc(("Set new data: '%s'\n", (char*)paParms[3].u.pointer.addr));
+                LogFlowFunc(("Set new data (%RU32 bytes): '%s'\n",
+                            paParms[3].u.pointer.size,
+                            (const char*)paParms[3].u.pointer.addr));
             }
         }

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

@@ -72 +72 @@
 {
 public:
+
     explicit DragAndDropService(PVBOXHGCMSVCHELPERS pHelpers)
-      : HGCM::AbstractService<DragAndDropService>(pHelpers)
-      , m_pManager(0)
-      , m_cClients(0)
+        : HGCM::AbstractService<DragAndDropService>(pHelpers)
+        , m_pManager(0)
+        , m_cClients(0)
     {}
 
@@ -88 +89 @@
 
     static DECLCALLBACK(int) progressCallback(uint32_t uPercentage, uint32_t uState, int rc, void *pvUser);
-    int      hostMessage(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
-    void     modeSet(uint32_t u32Mode);
+    int modeSet(uint32_t u32Mode);
     inline uint32_t modeGet() { return m_u32Mode; };
 
@@ -110 +110 @@
     pTable->pfnLoadState         = NULL;  /* construction done before restoring suffices */
     pTable->pfnRegisterExtension = svcRegisterExtension;
+
+    /* Drag'n drop mode is disabled by default. */
     modeSet(VBOX_DRAG_AND_DROP_MODE_OFF);
 
@@ -117 +119 @@
 }
 
-int DragAndDropService::uninit()
+int DragAndDropService::uninit(void)
 {
     delete m_pManager;
@@ -131 +133 @@
     else
         AssertMsgFailed(("Maximum number of clients reached\n"));
+
+    /*
+     * Clear the message queue as soon as a new clients connect
+     * to ensure that every client has the same state.
+     */
+    if (m_pManager)
+        m_pManager->clear();
+
     return VINF_SUCCESS;
 }
@@ -136 +146 @@
 int DragAndDropService::clientDisconnect(uint32_t u32ClientID, void *pvClient)
 {
-    /* Remove all waiters with this clientId. */
+    /* Remove all waiters with this u32ClientID. */
     for (size_t i = 0; i < m_clientQueue.size(); )
     {
@@ -142 +152 @@
         if (pClient->clientId() == u32ClientID)
         {
-            m_pHelpers->pfnCallComplete(pClient->handle(), VERR_INTERRUPTED);
+            if (m_pHelpers)
+                m_pHelpers->pfnCallComplete(pClient->handle(), VERR_INTERRUPTED);
+
             m_clientQueue.removeAt(i);
             delete pClient;
@@ -153 +165 @@
 }
 
-void DragAndDropService::modeSet(uint32_t u32Mode)
-{
+int DragAndDropService::modeSet(uint32_t u32Mode)
+{
+    /** @todo Validate mode. */
     switch (u32Mode)
     {
@@ -166 +179 @@
         default:
             m_u32Mode = VBOX_DRAG_AND_DROP_MODE_OFF;
-    }
+            break;
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -222 +238 @@
     if (!fIgnoreRequest)
     {
-        rc = VINF_SUCCESS;
         switch (u32Function)
         {
@@ -244 +259 @@
                         && paParms[2].u.uint32) /* Blocking? */
                     {
-                        m_clientQueue.append(new HGCM::Client(u32ClientID, callHandle, u32Function, cParms, paParms));
+                        m_clientQueue.append(new HGCM::Client(u32ClientID, callHandle,
+                                                              u32Function, cParms, paParms));
                         rc = VINF_HGCM_ASYNC_EXECUTE;
                     }
@@ -393 +409 @@
                     DragAndDropSvc::VBOXDNDCBEVTERRORDATA data;
                     data.hdr.u32Magic = DragAndDropSvc::CB_MAGIC_DND_GH_EVT_ERROR;
+
                     uint32_t rcOp;
                     paParms[0].getUInt32(&rcOp);
                     data.rc = rcOp;
+
                     if (m_pfnHostCallback)
                         rc = m_pfnHostCallback(m_pvHostData, u32Function, &data, sizeof(data));
@@ -411 +429 @@
     }
     else
-        rc = VERR_NOT_SUPPORTED;
+        rc = VERR_ACCESS_DENIED;
 
     /* If async execute is requested, we didn't notify the guest about
      * completion. The client is queued into the waiters list and will be
      * notified as soon as a new event is available. */
-    if (rc != VINF_HGCM_ASYNC_EXECUTE)
+    if (   rc != VINF_HGCM_ASYNC_EXECUTE
+        && m_pHelpers)
+    {
         m_pHelpers->pfnCallComplete(callHandle, rc);
+    }
+
     LogFlowFunc(("Returning rc=%Rrc\n", rc));
 }
 
-int DragAndDropService::hostMessage(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
-{
-    int rc = VINF_SUCCESS;
-#if 0
-    HGCM::Message *pMessage = new HGCM::Message(u32Function, cParms, paParms);
-    m_hostQueue.push(pMessage);
-//    bool fPush = true;
-    RTPrintf("client queue %u\n", m_clientQueue.size());
-    RTPrintf("host   queue %u\n", m_hostQueue.size());
-    if (!m_clientQueue.empty())
-    {
-        pMessage = m_hostQueue.front();
-        HGCM::Client *pClient = m_clientQueue.front();
-        /* Check if this was a request for getting the next host
-         * message. If so, return the message id and the parameter
-         * count. The message itself has to be queued. */
-        if (pClient->message() == DragAndDropSvc::GUEST_GET_NEXT_HOST_MSG)
-        {
-            RTPrintf("client is waiting for next host msg\n");
-//            rc = VERR_TOO_MUCH_DATA;
-            pClient->addMessageInfo(pMessage);
-            /* temp */
-//        m_pHelpers->pfnCallComplete(pClient->handle(), rc);
-//        m_clientQueue.pop();
-//        delete pClient;
-        }
-        else
-        {
-            RTPrintf("client is waiting for host msg (%d)\n", u32Function);
-            /* There is a request for a host message pending. Check
-             * if this is the correct message and if so deliver. If
-             * not the message will be queued. */
-            rc = pClient->addMessage(pMessage);
-            m_hostQueue.pop();
-            delete pMessage;
-//            if (RT_SUCCESS(rc))
-//                fPush = false;
-        }
-        /* In any case mark this client request as done. */
-        m_pHelpers->pfnCallComplete(pClient->handle(), rc);
-        m_clientQueue.pop_front();
-        delete pClient;
-    }
-//    if (fPush)
-//    {
-//        RTPrintf("push message\n");
-//        m_hostQueue.push(pMessage);
-//    }
-//    else
-//        delete pMessage;
-#endif
-
-    return rc;
-}
-
-int DragAndDropService::hostCall(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+int DragAndDropService::hostCall(uint32_t u32Function,
+                                 uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     LogFlowFunc(("u32Function=%RU32, cParms=%RU32\n", u32Function, cParms));
 
-    int rc = VINF_SUCCESS;
+    int rc;
     if (u32Function == DragAndDropSvc::HOST_DND_SET_MODE)
     {
@@ -488 +456 @@
             rc = VERR_INVALID_PARAMETER;
         else
-            modeSet(paParms[0].u.uint32);
+            rc = modeSet(paParms[0].u.uint32);
     }
     else if (modeGet() != VBOX_DRAG_AND_DROP_MODE_OFF)
     {
-        rc = m_pManager->addMessage(u32Function, cParms, paParms);
-        if (   RT_SUCCESS(rc)
-            && !m_clientQueue.isEmpty())
+        if (!m_clientQueue.isEmpty()) /* At least one client on the guest connected? */
         {
-            HGCM::Client *pClient = m_clientQueue.first();
-            AssertPtr(pClient);
-            /* Check if this was a request for getting the next host
-             * message. If so, return the message id and the parameter
-             * count. The message itself has to be queued. */
-            if (pClient->message() == DragAndDropSvc::GUEST_DND_GET_NEXT_HOST_MSG)
-            {
-                LogFlowFunc(("Client %RU32 is waiting for next host msg\n", pClient->clientId()));
-
-                uint32_t uMsg1;
-                uint32_t cParms1;
-                rc = m_pManager->nextMessageInfo(&uMsg1, &cParms1);
-                if (RT_SUCCESS(rc))
-                {
-                    pClient->addMessageInfo(uMsg1, cParms1);
-                    m_pHelpers->pfnCallComplete(pClient->handle(), rc);
-                    m_clientQueue.removeFirst();
-                    delete pClient;
-                }
-                else
-                    AssertMsgFailed(("Should not happen!"));
+            rc = m_pManager->addMessage(u32Function, cParms, paParms);
+            if (RT_SUCCESS(rc))
+            {
+                HGCM::Client *pClient = m_clientQueue.first();
+                AssertPtr(pClient);
+
+                /* Check if this was a request for getting the next host
+                 * message. If so, return the message id and the parameter
+                 * count. The message itself has to be queued. */
+                uint32_t uMsg = pClient->message();
+                if (uMsg == DragAndDropSvc::GUEST_DND_GET_NEXT_HOST_MSG)
+                {
+                    LogFlowFunc(("Client %RU32 is waiting for next host msg\n", pClient->clientId()));
+
+                    uint32_t uMsg1;
+                    uint32_t cParms1;
+                    rc = m_pManager->nextMessageInfo(&uMsg1, &cParms1);
+                    if (RT_SUCCESS(rc))
+                    {
+                        pClient->addMessageInfo(uMsg1, cParms1);
+                        if (m_pHelpers)
+                            m_pHelpers->pfnCallComplete(pClient->handle(), rc);
+
+                        m_clientQueue.removeFirst();
+                        delete pClient;
+                    }
+                    else
+                        AssertMsgFailed(("m_pManager::nextMessageInfo failed with rc=%Rrc\n", rc));
+                }
+                else
+                    AssertMsgFailed(("Client ID=%RU32 in wrong state with uMsg=%RU32\n",
+                                     pClient->clientId(), uMsg));
             }
             else
-                AssertMsgFailed(("Should not happen!"));
+                AssertMsgFailed(("Adding new message of type=%RU32 failed with rc=%Rrc\n",
+                                 u32Function, rc));
         }
-//      else
-//          AssertMsgFailed(("Should not happen %Rrc!", rc));
+        else
+        {
+            /* Tell the host that the guest does not support drag'n drop.
+             * This might happen due to not installed Guest Additions or
+             * not running VBoxTray/VBoxClient. */
+            rc = VERR_NOT_SUPPORTED;
+        }
+    }
+    else
+    {
+        /* Tell the host that a wrong drag'n drop mode is set. */
+        rc = VERR_ACCESS_DENIED;
     }
 
@@ -534 +522 @@
 
     DragAndDropService *pSelf = static_cast<DragAndDropService *>(pvUser);
+    AssertPtr(pSelf);
 
     if (pSelf->m_pfnHostCallback)
@@ -545 +534 @@
         data.rc           = rc;
 
-        return pSelf->m_pfnHostCallback(pSelf->m_pvHostData, DragAndDropSvc::GUEST_DND_HG_EVT_PROGRESS, &data, sizeof(data));
+        return pSelf->m_pfnHostCallback(pSelf->m_pvHostData,
+                                        DragAndDropSvc::GUEST_DND_HG_EVT_PROGRESS,
+                                        &data, sizeof(data));
     }