Changeset 58257 in vbox for trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

Timestamp:

Oct 15, 2015 8:31:46 AM (9 years ago)

Author:

vboxsync

Message:

DnD: Added context IDs for all HGCM messages.

File:

• trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (modified) (14 diffs)

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

@@ -303 +303 @@
         GuestDnDMsg Msg;
         Msg.setType(HOST_DND_HG_EVT_ENTER);
+        if (mDataBase.m_uProtocolVersion >= 3)
+            Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
         Msg.setNextUInt32(aScreenId);
         Msg.setNextUInt32(aX);
@@ -377 +379 @@
         GuestDnDMsg Msg;
         Msg.setType(HOST_DND_HG_EVT_MOVE);
+        if (mDataBase.m_uProtocolVersion >= 3)
+            Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
         Msg.setNextUInt32(aScreenId);
         Msg.setNextUInt32(aX);
@@ -489 +493 @@
         GuestDnDMsg Msg;
         Msg.setType(HOST_DND_HG_EVT_DROPPED);
+        if (mDataBase.m_uProtocolVersion >= 3)
+            Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
         Msg.setNextUInt32(aScreenId);
         Msg.setNextUInt32(aX);
@@ -810 +816 @@
     else
     {
-        Msg.setNextUInt32(0);                                                              /** @todo uContext; not used yet. */
+        Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
         Msg.setNextPointer(pData->getMeta().getDataMutable(), pData->getMeta().getSize()); /* pvData */
         Msg.setNextUInt32(pData->getMeta().getSize());                                     /* cbData */
@@ -872 +878 @@
 
     pMsg->setType(HOST_DND_HG_SND_DIR);
+    if (mDataBase.m_uProtocolVersion >= 3)
+        pMsg->setNextUInt32(0); /** @todo ContextID not used yet. */
     pMsg->setNextString(strPath.c_str());                  /* path */
     pMsg->setNextUInt32((uint32_t)(strPath.length() + 1)); /* path length (maximum is RTPATH_MAX on guest side). */
@@ -920 +928 @@
                  */
                 pMsg->setType(HOST_DND_HG_SND_FILE_HDR);
-                pMsg->setNextUInt32(0);                                            /* uContextID */
-                rc = pMsg->setNextString(pObj->GetDestPath().c_str());             /* pvName */
-                AssertRC(rc);
+                pMsg->setNextUInt32(0); /** @todo ContextID not used yet. */
+                pMsg->setNextString(pObj->GetDestPath().c_str());                  /* pvName */
                 pMsg->setNextUInt32((uint32_t)(pObj->GetDestPath().length() + 1)); /* cbName */
                 pMsg->setNextUInt32(0);                                            /* uFlags */
@@ -989 +996 @@
     else if (mDataBase.m_uProtocolVersion >= 2)
     {
-        /* Since protocol v2 we also send the context ID. Currently unused. */
-        pMsg->setNextUInt32(0);                                            /* uContext */
+        pMsg->setNextUInt32(0);                                            /** @todo ContextID not used yet. */
     }
 
@@ -1057 +1063 @@
             AssertPtr(pCBData);
             AssertReturn(sizeof(VBOXDNDCBHGGETNEXTHOSTMSG) == cbParms, VERR_INVALID_PARAMETER);
-            AssertReturn(CB_MAGIC_DND_HG_GET_NEXT_HOST_MSG == pCBData->hdr.u32Magic, VERR_INVALID_PARAMETER);
+            AssertReturn(CB_MAGIC_DND_HG_GET_NEXT_HOST_MSG == pCBData->hdr.uMagic, VERR_INVALID_PARAMETER);
 
             try
@@ -1097 +1103 @@
             AssertPtr(pCBData);
             AssertReturn(sizeof(VBOXDNDCBEVTERRORDATA) == cbParms, VERR_INVALID_PARAMETER);
-            AssertReturn(CB_MAGIC_DND_GH_EVT_ERROR == pCBData->hdr.u32Magic, VERR_INVALID_PARAMETER);
+            AssertReturn(CB_MAGIC_DND_GH_EVT_ERROR == pCBData->hdr.uMagic, VERR_INVALID_PARAMETER);
 
             pCtx->mpResp->reset();
@@ -1243 +1249 @@
     AssertPtr(pCtx->mpResp);
 
-#define URI_DATA_IS_VALID_BREAK(x) \
-    if (!x) \
-    { \
-        LogFlowFunc(("Invalid URI data value for \"" #x "\"\n")); \
-        rc = VERR_INVALID_PARAMETER; \
-        break; \
-    }
-
 #define REGISTER_CALLBACK(x)                                        \
     rc = pCtx->mpResp->setCallback(x, i_sendURIDataCallback, pCtx); \
     if (RT_FAILURE(rc))                                             \
-        return rc;
+        break;
 
 #define UNREGISTER_CALLBACK(x)                        \
@@ -1269 +1267 @@
     if (RT_FAILURE(rc))
         return rc;
-
-    /*
-     * Register callbacks.
-     */
-    /* Guest callbacks. */
-    REGISTER_CALLBACK(GUEST_DND_GET_NEXT_HOST_MSG);
-    REGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
-    /* Host callbacks. */
-    REGISTER_CALLBACK(HOST_DND_HG_SND_DIR);
-    if (mDataBase.m_uProtocolVersion >= 2)
-        REGISTER_CALLBACK(HOST_DND_HG_SND_FILE_HDR);
-    REGISTER_CALLBACK(HOST_DND_HG_SND_FILE_DATA);
 
     do
@@ -1340 +1326 @@
         if (RT_SUCCESS(rc))
         {
+            /*
+             * Register callbacks.
+             */
+            /* Guest callbacks. */
+            REGISTER_CALLBACK(GUEST_DND_GET_NEXT_HOST_MSG);
+            REGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
+            /* Host callbacks. */
+            REGISTER_CALLBACK(HOST_DND_HG_SND_DIR);
+            if (mDataBase.m_uProtocolVersion >= 2)
+                REGISTER_CALLBACK(HOST_DND_HG_SND_FILE_HDR);
+            REGISTER_CALLBACK(HOST_DND_HG_SND_FILE_DATA);
+
             rc = waitForEvent(&pCtx->mCBEvent, pCtx->mpResp, msTimeout);
             if (RT_FAILURE(rc))
@@ -1351 +1349 @@
             else
                 rc = pCtx->mpResp->setProgress(100, DND_PROGRESS_COMPLETE, VINF_SUCCESS);
+
+            /*
+             * Unregister callbacks.
+             */
+            /* Guest callbacks. */
+            UNREGISTER_CALLBACK(GUEST_DND_GET_NEXT_HOST_MSG);
+            UNREGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
+            /* Host callbacks. */
+            UNREGISTER_CALLBACK(HOST_DND_HG_SND_DIR);
+            if (mDataBase.m_uProtocolVersion >= 2)
+                UNREGISTER_CALLBACK(HOST_DND_HG_SND_FILE_HDR);
+            UNREGISTER_CALLBACK(HOST_DND_HG_SND_FILE_DATA);
         }
 
     } while (0);
-
-    /*
-     * Unregister callbacks.
-     */
-    /* Guest callbacks. */
-    UNREGISTER_CALLBACK(GUEST_DND_GET_NEXT_HOST_MSG);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
-    /* Host callbacks. */
-    UNREGISTER_CALLBACK(HOST_DND_HG_SND_DIR);
-    if (mDataBase.m_uProtocolVersion >= 2)
-        UNREGISTER_CALLBACK(HOST_DND_HG_SND_FILE_HDR);
-    UNREGISTER_CALLBACK(HOST_DND_HG_SND_FILE_DATA);
 
 #undef REGISTER_CALLBACK
@@ -1380 +1378 @@
         AssertRC(rc2);
     }
-
-#undef URI_DATA_IS_VALID_BREAK
 
     LogFlowFuncLeaveRC(rc);