Changeset 84998 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 29, 2020 4:34:22 PM (5 years ago)

Author:

vboxsync

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

138893

Message:

DnD: Greatly simplified usage / API of the DnDURIObject class.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDSourceImpl.cpp (modified) (10 diffs)
• GuestDnDTargetImpl.cpp (modified) (10 diffs)

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

@@ -780 +780 @@
                 && !pObj->IsComplete())
             {
-                AssertMsgFailed(("Object '%s' not complete yet\n", pObj->GetDestPathAbs().c_str()));
+                AssertMsgFailed(("Object '%s' not complete yet\n", pObj->GetPath().c_str()));
                 rc = VERR_WRONG_ORDER;
                 break;
@@ -787 +787 @@
             if (pObj->IsOpen()) /* File already opened? */
             {
-                AssertMsgFailed(("Current opened object is '%s', close this first\n", pObj->GetDestPathAbs().c_str()));
+                AssertMsgFailed(("Current opened object is '%s', close this first\n", pObj->GetPath().c_str()));
                 rc = VERR_WRONG_ORDER;
                 break;
@@ -825 +825 @@
             LogRel2(("DnD: Absolute file path for guest file on the host is now '%s'\n", pszPathAbs));
 
-            /** @todo Add sparse file support based on fFlags? (Use Open(..., fFlags | SPARSE). */
-            rc = pObj->OpenEx(pszPathAbs, DnDURIObject::View_Target,
-                              RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE,
-                              (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR);
+            rc = pObj->Init(DnDURIObject::Type_File, pszPathAbs);
             if (RT_SUCCESS(rc))
             {
-                /* Add for having a proper rollback. */
-                int rc2 = pCtx->mURI.getDroppedFiles().AddFile(pszPathAbs);
-                AssertRC(rc2);
+                /** @todo Add sparse file support based on fFlags? (Use Open(..., fFlags | SPARSE). */
+                rc = pObj->Open(RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE,
+                                (fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR);
+                if (RT_SUCCESS(rc))
+                {
+                    /* Add for having a proper rollback. */
+                    int rc2 = pCtx->mURI.getDroppedFiles().AddFile(pszPathAbs);
+                    AssertRC(rc2);
+                }
             }
-            else
+
+            if (RT_FAILURE(rc))
                 LogRel(("DnD: Error opening/creating guest file '%s' on host, rc=%Rrc\n", pszPathAbs, rc));
         }
@@ -847 +851 @@
             /** @todo Unescape path before printing. */
             LogRel2(("DnD: Transferring guest file '%s' to host (%RU64 bytes, mode 0x%x)\n",
-                     pObj->GetDestPathAbs().c_str(), pObj->GetSize(), pObj->GetMode()));
+                     pObj->GetPath().c_str(), pObj->GetSize(), pObj->GetMode()));
 
             /** @todo Set progress object title to current file being transferred? */
@@ -853 +857 @@
             if (pObj->IsComplete()) /* 0-byte file? We're done already. */
             {
-                /** @todo Sanitize path. */
-                LogRel2(("DnD: Transferring guest file '%s' (0 bytes) to host complete\n", pObj->GetDestPathAbs().c_str()));
+                LogRel2(("DnD: Transferring guest file '%s' (0 bytes) to host complete\n", pObj->GetPath().c_str()));
 
                 pCtx->mURI.processObject(*pObj);
@@ -902 +905 @@
         if (pObj->IsComplete())
         {
-            LogFlowFunc(("Warning: Object '%s' already completed\n", pObj->GetDestPathAbs().c_str()));
+            LogFlowFunc(("Warning: Object '%s' already completed\n", pObj->GetPath().c_str()));
             rc = VERR_WRONG_ORDER;
             break;
@@ -909 +912 @@
         if (!pObj->IsOpen()) /* File opened on host? */
         {
-            LogFlowFunc(("Warning: Object '%s' not opened\n", pObj->GetDestPathAbs().c_str()));
+            LogFlowFunc(("Warning: Object '%s' not opened\n", pObj->GetPath().c_str()));
             rc = VERR_WRONG_ORDER;
             break;
@@ -921 +924 @@
             if (cbWritten < cbData)
             {
-                /** @todo What to do when the host's disk is full? */
-                rc = VERR_DISK_FULL;
+                LogRel(("DnD: Only written %RU32 of %RU32 bytes of guest file '%s' -- disk full?\n",
+                        cbWritten, cbData, pObj->GetPath().c_str()));
+                rc = VERR_IO_GEN_FAILURE; /** @todo Find a better rc. */
             }
 
@@ -929 +933 @@
         }
         else
-            LogRel(("DnD: Error writing guest file data for '%s', rc=%Rrc\n", pObj->GetDestPathAbs().c_str(), rc));
+            LogRel(("DnD: Error writing guest file data for '%s', rc=%Rrc\n", pObj->GetPath().c_str(), rc));
 
         if (RT_SUCCESS(rc))
@@ -936 +940 @@
             {
                 /** @todo Sanitize path. */
-                LogRel2(("DnD: Transferring guest file '%s' to host complete\n", pObj->GetDestPathAbs().c_str()));
+                LogRel2(("DnD: Transferring guest file '%s' to host complete\n", pObj->GetPath().c_str()));
                 pCtx->mURI.processObject(*pObj);
                 objCtx.reset();

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

@@ -882 +882 @@
     AssertPtr(pObj);
 
-    RTCString strPath = pObj->GetDestPathAbs();
+    RTCString strPath = pObj->GetPath();
     if (strPath.isEmpty())
         return VERR_INVALID_PARAMETER;
@@ -909 +909 @@
     AssertPtr(pObj);
 
-    RTCString strPathSrc = pObj->GetSourcePathAbs();
+    RTCString strPathSrc = pObj->GetPath();
     if (strPathSrc.isEmpty())
         return VERR_INVALID_PARAMETER;
@@ -922 +922 @@
     {
         LogRel2(("DnD: Opening host file '%s' for transferring to guest\n", strPathSrc.c_str()));
-        rc = pObj->OpenEx(strPathSrc, DnDURIObject::View_Source,
-                          RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
+        rc = pObj->Init(DnDURIObject::Type_File, strPathSrc);
+        if (RT_SUCCESS(rc))
+            rc = pObj->Open(RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
+
         if (RT_FAILURE(rc))
             LogRel(("DnD: Opening host file '%s' failed, rc=%Rrc\n", strPathSrc.c_str(), rc));
@@ -943 +945 @@
                 pMsg->setType(HOST_DND_HG_SND_FILE_HDR);
                 pMsg->setNextUInt32(0); /** @todo ContextID not used yet. */
-                pMsg->setNextString(pObj->GetDestPathAbs().c_str());                  /* pvName */
-                pMsg->setNextUInt32((uint32_t)(pObj->GetDestPathAbs().length() + 1)); /* cbName */
-                pMsg->setNextUInt32(0);                                            /* uFlags */
-                pMsg->setNextUInt32(pObj->GetMode());                              /* fMode */
-                pMsg->setNextUInt64(pObj->GetSize());                              /* uSize */
+                pMsg->setNextString(pObj->GetPath().c_str());                  /* pvName */
+                pMsg->setNextUInt32((uint32_t)(pObj->GetPath().length() + 1)); /* cbName */
+                pMsg->setNextUInt32(0);                                        /* uFlags */
+                pMsg->setNextUInt32(pObj->GetMode());                          /* fMode */
+                pMsg->setNextUInt64(pObj->GetSize());                          /* uSize */
 
                 LogFlowFunc(("Sending file header ...\n"));
-                LogRel2(("DnD: Transferring host file to guest: %s (%RU64 bytes, mode 0x%x)\n",
-                         strPathSrc.c_str(), pObj->GetSize(), pObj->GetMode()));
+                LogRel2(("DnD: Transferring host file '%s' to guest (%RU64 bytes, mode 0x%x)\n",
+                         pObj->GetPath().c_str(), pObj->GetSize(), pObj->GetMode()));
 
                 /** @todo Set progress object title to current file being transferred? */
@@ -1007 +1009 @@
     if (mDataBase.m_uProtocolVersion <= 1)
     {
-        pMsg->setNextString(pObj->GetDestPathAbs().c_str());                  /* pvName */
-        pMsg->setNextUInt32((uint32_t)(pObj->GetDestPathAbs().length() + 1)); /* cbName */
+        pMsg->setNextString(pObj->GetPath().c_str());                  /* pvName */
+        pMsg->setNextUInt32((uint32_t)(pObj->GetPath().length() + 1)); /* cbName */
     }
     else if (mDataBase.m_uProtocolVersion >= 2)
@@ -1044 +1046 @@
         if (pObj->IsComplete()) /* Done reading? */
         {
-            LogRel2(("DnD: Transferring file '%s' to guest complete\n", pObj->GetSourcePathAbs().c_str()));
-            LogFlowFunc(("File '%s' complete\n", pObj->GetSourcePathAbs().c_str()));
+            LogRel2(("DnD: Transferring file '%s' to guest complete\n", pObj->GetPath().c_str()));
+            LogFlowFunc(("File '%s' complete\n", pObj->GetPath().c_str()));
 
             /* DnDURIObject::Read() returns VINF_EOF when finished reading the entire fire,
@@ -1054 +1056 @@
 
     if (RT_FAILURE(rc))
-        LogRel(("DnD: Reading from host file '%s' failed, rc=%Rrc\n", pObj->GetSourcePathAbs().c_str(), rc));
+        LogRel(("DnD: Reading from host file '%s' failed, rc=%Rrc\n", pObj->GetPath().c_str(), rc));
 
     LogFlowFuncLeaveRC(rc);
@@ -1449 +1451 @@
     AssertPtr(pCurObj);
 
-    DnDURIObject::Type enmType = pCurObj->GetType();
+    const DnDURIObject::Type enmType = pCurObj->GetType();
+
     LogRel3(("DnD: Processing: srcPath=%s, dstPath=%s, enmType=%RU32, cbSize=%RU32\n",
-             pCurObj->GetSourcePathAbs().c_str(), pCurObj->GetDestPathAbs().c_str(),
+             pCurObj->GetPath().c_str(), pCurObj->GetPath().c_str(),
              enmType, pCurObj->GetSize()));
 
@@ -1465 +1468 @@
     {
         AssertMsgFailed(("enmType=%RU32 is not supported for srcPath=%s, dstPath=%s\n",
-                         enmType, pCurObj->GetSourcePathAbs().c_str(), pCurObj->GetDestPathAbs().c_str()));
+                         enmType, pCurObj->GetPath().c_str(), pCurObj->GetPath().c_str()));
         rc = VERR_NOT_SUPPORTED;
     }
@@ -1478 +1481 @@
     if (fRemove)
     {
-        LogFlowFunc(("Removing \"%s\" from list, rc=%Rrc\n", pCurObj->GetSourcePathAbs().c_str(), rc));
+        LogFlowFunc(("Removing \"%s\" from list, rc=%Rrc\n", pCurObj->GetPath().c_str(), rc));
         pCtx->mURI.removeObjCurrent();
     }