Changeset 55963 in vbox for trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

Timestamp:

May 20, 2015 11:18:14 AM (10 years ago)

Author:

vboxsync

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

100467

Message:

DnD: Fixed hang when reporting host errors such as inaccessible (locked) files.

File:

• trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp (modified) (7 diffs)

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

@@ -177 +177 @@
 }
 
-int GuestDnDCallbackEvent::Notify(int rc)
+int GuestDnDCallbackEvent::Notify(int rc /* = VINF_SUCCESS */)
 {
     mRc = rc;
@@ -209 +209 @@
 }
 
-/* static */
-Utf8Str GuestDnDResponse::errorToString(const ComObjPtr<Guest>& pGuest, int guestRc)
-{
-    Utf8Str strError;
-
-    switch (guestRc)
-    {
-        case VERR_ACCESS_DENIED:
-            strError += Utf8StrFmt(pGuest->tr("For one or more guest files or directories selected for transferring to the host your guest "
-                                              "user does not have the appropriate access rights for. Please make sure that all selected "
-                                              "elements can be accessed and that your guest user has the appropriate rights."));
-            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 and 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. "
-                                              "Please make sure that all selected elements can be accessed and that your guest user has "
-                                              "the appropriate rights."));
-            break;
-
-        default:
-            strError += Utf8StrFmt("Drag and drop guest error (%Rrc)", guestRc);
-            break;
-    }
-
-    return strError;
-}
-
 int GuestDnDResponse::notifyAboutGuestResponse(void) const
 {
@@ -312 +278 @@
 
 int GuestDnDResponse::setProgress(unsigned uPercentage,
-                                  uint32_t uStatus, int rcOp /* = VINF_SUCCESS */)
-{
-    LogFlowFunc(("uStatus=%RU32, uPercentage=%RU32, rcOp=%Rrc\n",
-                 uStatus, uPercentage, rcOp));
+                                  uint32_t uStatus,
+                                  int rcOp /* = VINF_SUCCESS */, const Utf8Str &strMsg /* = "" */)
+{
+    LogFlowFunc(("uStatus=%RU32, uPercentage=%RU32, rcOp=%Rrc, strMsg=%s\n",
+                 uStatus, uPercentage, rcOp, strMsg.c_str()));
 
     int rc = VINF_SUCCESS;
@@ -338 +305 @@
                     hr = m_progress->i_notifyComplete(VBOX_E_IPRT_ERROR,
                                                       COM_IIDOF(IGuest),
-                                                      m_parent->getComponentName(),
-                                                      GuestDnDResponse::errorToString(m_parent, rcOp).c_str());
+                                                      m_parent->getComponentName(), strMsg.c_str());
                     reset();
                     break;
@@ -898 +864 @@
          * Wait until our desired callback triggered the
          * wait event. As we don't want to block if the guest does not
-         * respond, so do busy waiting here.
+         * respond, do busy waiting here.
          */
         rc = Event.Wait(500 /* ms */);
@@ -908 +874 @@
         }
         else if (rc == VERR_TIMEOUT) /* Continue waiting. */
-            rc = VINF_SUCCESS;
+            continue;
 
         if (   msTimeout != RT_INDEFINITE_WAIT
@@ -914 +880 @@
         {
             rc = VERR_TIMEOUT;
-        }
-        else if (pResp->isProgressCanceled())
-        {
-            pResp->setProgress(100 /* Percent */, DragAndDropSvc::DND_PROGRESS_CANCELLED);
+            LogFlowFunc(("Guest did not respond within time\n"));
+        }
+        else if (pResp->isProgressCanceled()) /** @todo GuestDnDResponse *pResp needs to go. */
+        {
+            LogFlowFunc(("Canceled by user\n"));
             rc = VERR_CANCELLED;
         }