Index: /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp	(revision 56654)
+++ /trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp	(revision 56655)
@@ -270,5 +270,5 @@
                 defaultAction = GuestDnD::toMainAction(pResp->defAction());
 
-                GuestDnD::toFormatVector(m_strFormats, pResp->format(), aFormats);
+                GuestDnD::toFormatVector(m_vecFmtSup, pResp->fmtReq(), aFormats);
                 GuestDnD::toMainActions(pResp->allActions(), aAllowedActions);
             }
@@ -758,5 +758,5 @@
      * when retrieving the data later. */
     pResp->reset();
-    pResp->setFormat(pCtx->mFormat);
+    pResp->setFmtReq(pCtx->mFormat);
 
     bool fHasURIList = DnDMIMENeedsDropDir(pCtx->mFormat.c_str(), pCtx->mFormat.length());
Index: /trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp	(revision 56654)
+++ /trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp	(revision 56655)
@@ -277,5 +277,6 @@
 
     /* Make a flat data string out of the supported format list. */
-    Utf8Str strFormats = GuestDnD::toFormatString(m_strFormats, aFormats);
+    Utf8Str strFormats = GuestDnD::toFormatString(m_vecFmtSup, aFormats);
+
     /* If there is no valid supported format, ignore this request. */
     if (strFormats.isEmpty())
@@ -343,5 +344,5 @@
 
     /* Make a flat data string out of the supported format list. */
-    RTCString strFormats = GuestDnD::toFormatString(m_strFormats, aFormats);
+    RTCString strFormats = GuestDnD::toFormatString(m_vecFmtSup, aFormats);
     /* If there is no valid supported format, ignore this request. */
     if (strFormats.isEmpty())
@@ -434,5 +435,5 @@
 
     /* Make a flat data string out of the supported format list. */
-    Utf8Str strFormats = GuestDnD::toFormatString(m_strFormats, aFormats);
+    Utf8Str strFormats = GuestDnD::toFormatString(m_vecFmtSup, aFormats);
     /* If there is no valid supported format, ignore this request. */
     if (strFormats.isEmpty())
@@ -462,8 +463,8 @@
             {
                 resAction = GuestDnD::toMainAction(pResp->defAction());
-                aFormat = pResp->format();
+                aFormat = pResp->fmtReq();
 
                 LogFlowFunc(("resFormat=%s, resAction=%RU32\n",
-                             pResp->format().c_str(), pResp->defAction()));
+                             pResp->fmtReq().c_str(), pResp->defAction()));
             }
         }
@@ -556,5 +557,5 @@
         pSendCtx->mpResp        = pResp;
         pSendCtx->mScreenID     = aScreenId;
-        pSendCtx->mFormat       = aFormat;
+        pSendCtx->mFmtReq       = aFormat;
         pSendCtx->mData.vecData = aData;
 
@@ -692,6 +693,6 @@
     mDataBase.mListOutgoing.clear();
 
-    const char *pszFormat = pCtx->mFormat.c_str();
-    uint32_t cbFormat = pCtx->mFormat.length() + 1;
+    const char *pszFormat = pCtx->mFmtReq.c_str();
+    uint32_t cbFormat = pCtx->mFmtReq.length() + 1;
 
     /* Do we need to build up a file tree? */
@@ -1129,6 +1130,6 @@
         MsgSndData.setType(DragAndDropSvc::HOST_DND_HG_SND_DATA);
         MsgSndData.setNextUInt32(pCtx->mScreenID);
-        MsgSndData.setNextPointer((void *)pCtx->mFormat.c_str(), (uint32_t)pCtx->mFormat.length() + 1);
-        MsgSndData.setNextUInt32((uint32_t)pCtx->mFormat.length() + 1);
+        MsgSndData.setNextPointer((void *)pCtx->mFmtReq.c_str(), (uint32_t)pCtx->mFmtReq.length() + 1);
+        MsgSndData.setNextUInt32((uint32_t)pCtx->mFmtReq.length() + 1);
         MsgSndData.setNextPointer((void*)strData.c_str(), (uint32_t)cbData);
         MsgSndData.setNextUInt32((uint32_t)cbData);
@@ -1279,6 +1280,6 @@
     Msg.setType(DragAndDropSvc::HOST_DND_HG_SND_DATA);
     Msg.setNextUInt32(pCtx->mScreenID);
-    Msg.setNextPointer((void *)pCtx->mFormat.c_str(), (uint32_t)pCtx->mFormat.length() + 1);
-    Msg.setNextUInt32((uint32_t)pCtx->mFormat.length() + 1);
+    Msg.setNextPointer((void *)pCtx->mFmtReq.c_str(), (uint32_t)pCtx->mFmtReq.length() + 1);
+    Msg.setNextUInt32((uint32_t)pCtx->mFmtReq.length() + 1);
     Msg.setNextPointer((void*)&pCtx->mData.vecData.front(), (uint32_t)cbDataTotal);
     Msg.setNextUInt32(cbDataTotal);