vbox的更動 55422 路徑 trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

時間撮記:

2015-4-24 下午01:52:33 (10 年 以前)

作者:

vboxsync

訊息:

DnD: Protocol overhaul with versioning added which now can communicate with Main.

檔案:

• trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (修改) (4 筆差異)

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2014 Oracle Corporation
+ * Copyright (C) 2014-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 
 #include <VBox/GuestHost/DragAndDrop.h>
-
-DnDURIObject::DnDURIObject(Type type,
-                           const RTCString &strSrcPath,
-                           const RTCString &strDstPath,
-                           uint32_t fMode, uint64_t cbSize)
-    : m_Type(type)
-    , m_strSrcPath(strSrcPath)
-    , m_strDstPath(strDstPath)
-    , m_fMode(fMode)
-    , m_cbSize(cbSize)
-    , m_cbProcessed(0)
-{
-    RT_ZERO(u);
-}
-
-DnDURIObject::~DnDURIObject(void)
-{
-    closeInternal();
-}
-
-void DnDURIObject::closeInternal(void)
-{
-    if (m_Type == File)
-    {
-        if (u.m_hFile)
-        {
-            RTFileClose(u.m_hFile);
-            u.m_hFile = NULL;
-        }
-    }
-}
-
-bool DnDURIObject::IsComplete(void) const
-{
-    bool fComplete = false;
-
-    Assert(m_cbProcessed <= m_cbSize);
-    if (m_cbProcessed == m_cbSize)
-        fComplete = true;
-
-    switch (m_Type)
-    {
-        case File:
-            if (!fComplete)
-                fComplete = !u.m_hFile;
-            break;
-
-        case Directory:
-            fComplete = true;
-            break;
-
-        default:
-            break;
-    }
-
-    return fComplete;
-}
-
-/* static */
-/** @todo Put this into an own class like DnDURIPath : public RTCString? */
-int DnDURIObject::RebaseURIPath(RTCString &strPath,
-                                const RTCString &strBaseOld,
-                                const RTCString &strBaseNew)
-{
-    int rc;
-    const char *pszPath = RTUriPath(strPath.c_str());
-    if (pszPath)
-    {
-        const char *pszPathStart = pszPath;
-        const char *pszBaseOld = strBaseOld.c_str();
-        if (   pszBaseOld
-            && RTPathStartsWith(pszPath, pszBaseOld))
-        {
-            pszPathStart += strlen(pszBaseOld);
-        }
-
-        rc = VINF_SUCCESS;
-
-        if (RT_SUCCESS(rc))
-        {
-            char *pszPathNew = RTPathJoinA(strBaseNew.c_str(), pszPathStart);
-            if (pszPathNew)
-            {
-                char *pszPathURI = RTUriCreate("file" /* pszScheme */, "/" /* pszAuthority */,
-                                               pszPathNew /* pszPath */,
-                                               NULL /* pszQuery */, NULL /* pszFragment */);
-                if (pszPathURI)
-                {
-#ifdef DEBUG_andy
-                    LogFlowFunc(("Rebasing \"%s\" to \"%s\"", strPath.c_str(), pszPathURI));
-#endif
-                    strPath = RTCString(pszPathURI) + "\r\n";
-                    RTStrFree(pszPathURI);
-
-                    rc = VINF_SUCCESS;
-                }
-                else
-                    rc = VERR_INVALID_PARAMETER;
-
-                RTStrFree(pszPathNew);
-            }
-            else
-                rc = VERR_NO_MEMORY;
-        }
-    }
-    else
-        rc = VERR_INVALID_PARAMETER;
-
-#ifdef DEBUG_andy
-    LogFlowFuncLeaveRC(rc);
-#endif
-    return rc;
-}
-
-int DnDURIObject::Read(void *pvBuf, uint32_t cbToRead, uint32_t *pcbRead)
-{
-    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
-    AssertReturn(cbToRead, VERR_INVALID_PARAMETER);
-    /* pcbRead is optional. */
-
-    int rc;
-    switch (m_Type)
-    {
-        case File:
-        {
-            if (!u.m_hFile)
-            {
-                /* Open files on the source with RTFILE_O_DENY_WRITE to prevent races
-                 * where the OS writes to the file while the destination side transfers
-                 * it over. */
-                rc = RTFileOpen(&u.m_hFile, m_strSrcPath.c_str(),
-                                RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
-            }
-            else
-                rc = VINF_SUCCESS;
-
-            bool fDone = false;
-            if (RT_SUCCESS(rc))
-            {
-                size_t cbRead;
-                rc = RTFileRead(u.m_hFile, pvBuf, cbToRead, &cbRead);
-                if (RT_SUCCESS(rc))
-                {
-                    if (pcbRead)
-                        *pcbRead = (uint32_t)cbRead;
-
-                    m_cbProcessed += cbRead;
-                    Assert(m_cbProcessed <= m_cbSize);
-
-                    /* End of file reached or error occurred? */
-                    if (   m_cbProcessed == m_cbSize
-                        || RT_FAILURE(rc))
-                    {
-                        closeInternal();
-                    }
-                }
-            }
-
-            break;
-        }
-
-        case Directory:
-        {
-            rc = VINF_SUCCESS;
-            break;
-        }
-
-        default:
-            rc = VERR_NOT_IMPLEMENTED;
-            break;
-    }
-
-    LogFlowFunc(("Returning strSourcePath=%s, rc=%Rrc\n",
-                 m_strSrcPath.c_str(), rc));
-    return rc;
-}
-
-/*** */
 
 DnDURIList::DnDURIList(void)
@@ -439 +261 @@
                              pszFilePath, pszFileName, pszRoot));
 #endif
-                rc = appendPathRecursive(pszFilePath, cbBase,
-                                         fFlags);
+                rc = appendPathRecursive(pszFilePath, cbBase, fFlags);
             }
             else
@@ -496 +317 @@
 void DnDURIList::RemoveFirst(void)
 {
+    if (m_lstTree.isEmpty())
+        return;
+
     DnDURIObject &curPath = m_lstTree.first();