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

Timestamp:

Mar 10, 2014 1:54:03 PM (11 years ago)

Author:

vboxsync

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

92721

Message:

DnD: Bugfixes.

File:

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

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

@@ -204 +204 @@
     HRESULT queryProgressTo(IProgress **ppProgress);
 
+    int writeToFile(const char *pszPath, size_t cbPath, void *pvData, size_t cbData, uint32_t fMode);
+
 public:
 
@@ -223 +225 @@
     /** Dropped files directory on the host. */
     Utf8Str              m_strDropDir;
+    /** The handle of the currently opened file being written to
+     *  or read from. */
+    RTFILE               m_hFile;
+    Utf8Str              m_strFile;
 
     ComObjPtr<Guest>     m_parent;
@@ -294 +300 @@
   , m_cbDataCurrent(0)
   , m_cbDataTotal(0)
+  , m_hFile(NIL_RTFILE)
   , m_parent(pGuest)
 {
@@ -303 +310 @@
 {
     reset();
+
     int rc = RTSemEventDestroy(m_EventSem);
     AssertRC(rc);
@@ -346 +354 @@
             break;
 
+        case VERR_NOT_FOUND:
+            /* Should not happen due to file locking on the guest, but anyway ... */
+            strError += Utf8StrFmt(pGuest->tr("One or more guest files or directories selected for transferring to the host were not"
+                                              "found on the guest anymore. This can be the case if the guest files were moved and/or"
+                                              "altered while the drag'n drop operation was in progress."));
+            break;
+
         case VERR_SHARING_VIOLATION:
             strError += Utf8StrFmt(pGuest->tr("One or more guest files or directories selected for transferring to the host were locked. "
@@ -367 +382 @@
 void DnDGuestResponse::reset(void)
 {
+    LogFlowThisFuncEnter();
+
+    m_defAction = 0;
+    m_allActions = 0;
+
     m_strDropDir = "";
     m_strFormat = "";
@@ -375 +395 @@
         m_pvData = NULL;
     }
-    m_cbData = 0;
-
+    m_cbData = 0;    
     m_cbDataCurrent = 0;
     m_cbDataTotal = 0;
+
+    if (m_hFile != NIL_RTFILE)
+    {
+        RTFileClose(m_hFile);
+        m_hFile = NIL_RTFILE;
+    }
+    m_strFile = "";
 }
 
@@ -492 +518 @@
 }
 
+int DnDGuestResponse::writeToFile(const char *pszPath, size_t cbPath, 
+                                  void *pvData, size_t cbData, uint32_t fMode)
+{
+    /** @todo Support locking more than one file at a time! We
+     *        might want to have a table in DnDGuestImpl which
+     *        keeps those file pointers around, or extend the
+     *        actual protocol for explicit open calls.
+     *  
+     *        For now we only keep one file open at a time, so if
+     *        a client does alternating writes to different files
+     *        this function will close the old and re-open the new
+     *        file on every call. */
+    int rc;
+    if (   m_hFile == NIL_RTFILE
+        || m_strFile != pszPath) 
+    {
+        char *pszFile = RTPathJoinA(m_strDropDir.c_str(), pszPath);
+        if (pszFile)
+        {
+            RTFILE hFile;
+            /** @todo Respect fMode!  */
+            rc = RTFileOpen(&hFile, pszFile,
+                              RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE 
+                            | RTFILE_O_WRITE | RTFILE_O_APPEND);
+            if (RT_SUCCESS(rc))
+            {
+                LogFlowFunc(("Opening \"%s\" (fMode=0x%x) for writing ...\n", 
+                             pszFile, fMode));
+
+                m_hFile = hFile;
+                m_strFile = pszPath;
+            }
+
+            RTStrFree(pszFile);
+        }
+        else
+            rc = VERR_NO_MEMORY;
+    }
+    else
+        rc = VINF_SUCCESS;
+
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTFileWrite(m_hFile, pvData, cbData,
+                         NULL /* No partial writes */);
+
+        if (RT_SUCCESS(rc))
+            rc = dataSetStatus(cbData);
+    }
+
+    return rc;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -719 +798 @@
 
         DnDGuestResponse *pResp = d->response();
-        /* This blocks until the request is answered (or timeout). */
         if (pResp->waitForGuestResponse() == VERR_TIMEOUT)
             return S_OK;
@@ -783 +861 @@
 
         DnDGuestResponse *pResp = d->response();
-        /* This blocks until the request is answered (or timeout). */
         if (pResp->waitForGuestResponse() == VERR_TIMEOUT)
             return S_OK;
@@ -813 +890 @@
 
         DnDGuestResponse *pResp = d->response();
-        /* This blocks until the request is answered (or timeout). */
         pResp->waitForGuestResponse();
     }
@@ -873 +949 @@
 
         DnDGuestResponse *pResp = d->response();
-        /* This blocks until the request is answered (or timeout). */
         if (pResp->waitForGuestResponse() == VERR_TIMEOUT)
             return S_OK;
 
-        /* Copy the response info */
+        /* Get the resulting action from the guest. */
         *pResultAction = d->toMainAction(pResp->defAction());
+
+        LogFlowFunc(("resFormat=%s, resAction=%RU32\n", 
+                     pResp->format().c_str(), pResp->defAction()));
+
         Bstr(pResp->format()).cloneTo(pstrFormat);
-
-        LogFlowFunc(("*pResultAction=%ld\n", *pResultAction));
     }
     catch (HRESULT hr2)
@@ -957 +1034 @@
                     paParms);
 
-        /* This blocks until the request is answered (or timed out). */
         DnDGuestResponse *pResp = d->response();
         if (pResp->waitForGuestResponse() == VERR_TIMEOUT)
@@ -1167 +1243 @@
                  pszPath, cbPath, fMode));
 
-    /** @todo Add file locking between calls! */
-    int rc;
-    char *pszFile = RTPathJoinA(pResp->dropDir().c_str(), pszPath);
-    if (pszFile)
-    {
-        RTFILE hFile;
-        rc = RTFileOpen(&hFile, pszFile,
-                        RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_WRITE | RTFILE_O_WRITE);
-        if (RT_SUCCESS(rc))
-        {
-            rc = RTFileWrite(hFile, pvData, cbData,
-                             NULL /* No partial writes */);
-            RTFileClose(hFile);
-        }
-        RTStrFree(pszFile);
-    }
-    else
-        rc = VERR_NO_MEMORY;
-
-    if (RT_SUCCESS(rc))
-        rc = pResp->dataSetStatus(cbData);
+    int rc = pResp->writeToFile(pszPath, cbPath, pvData, cbData, fMode);
 
     LogFlowFuncLeaveRC(rc);