Changeset 50609 in vbox for trunk/src/VBox

Timestamp:

Feb 26, 2014 2:32:11 PM (11 years ago)

Author:

vboxsync

Message:

DnD: A bit of error-to-text resolving.

File:

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

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

@@ -204 +204 @@
     HRESULT queryProgressTo(IProgress **ppProgress);
 
+public:
+
+    Utf8Str errorToString(const ComObjPtr<Guest>& pGuest, int guestRc);
+
 private:
     RTSEMEVENT           m_EventSem;
@@ -296 +300 @@
 }
 
-DnDGuestResponse::~DnDGuestResponse()
+DnDGuestResponse::~DnDGuestResponse(void)
 {
     reset();
@@ -303 +307 @@
 }
 
-int DnDGuestResponse::notifyAboutGuestResponse()
-{
-    return RTSemEventSignal(m_EventSem);
-}
-
-int DnDGuestResponse::waitForGuestResponse(RTMSINTERVAL msTimeout /*= 500 */)
-{
-    int rc = RTSemEventWait(m_EventSem, msTimeout);
-#ifdef DEBUG_andy
-    LogFlowFunc(("msTimeout=%RU32, rc=%Rrc\n", msTimeout, rc));
-#endif
-    return rc;
-}
-
 int DnDGuestResponse::dataAdd(const void *pvData, uint32_t cbData,
                               uint32_t *pcbCurSize)
@@ -341 +331 @@
 
     return rc;
+}
+
+/* static */
+Utf8Str DnDGuestResponse::errorToString(const ComObjPtr<Guest>& pGuest, int guestRc)
+{
+    Utf8Str strError;
+
+    switch (guestRc)
+    {
+        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'n drop guest error (%Rrc)", guestRc);
+            break;
+    }
+
+    return strError;
+}
+
+int DnDGuestResponse::notifyAboutGuestResponse(void)
+{
+    return RTSemEventSignal(m_EventSem);
 }
 
@@ -384 +400 @@
             if (uState == DragAndDropSvc::DND_PROGRESS_ERROR)
             {
-                hr = m_progress->notifyComplete(E_FAIL,
+                hr = m_progress->notifyComplete(VBOX_E_IPRT_ERROR,
                                                 COM_IIDOF(IGuest),
                                                 m_parent->getComponentName(),
-                                                m_parent->tr("Drag'n drop guest error (%Rrc)"), rcOp);
+                                                DnDGuestResponse::errorToString(m_parent, rcOp).c_str());
                 reset();
             }
@@ -458 +474 @@
 }
 
+int DnDGuestResponse::waitForGuestResponse(RTMSINTERVAL msTimeout /*= 500 */)
+{
+    int rc = RTSemEventWait(m_EventSem, msTimeout);
+#ifdef DEBUG_andy
+    LogFlowFunc(("msTimeout=%RU32, rc=%Rrc\n", msTimeout, rc));
+#endif
+    return rc;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 HRESULT GuestDnDPrivate::adjustCoords(ULONG uScreenId, ULONG *puX, ULONG *puY) const
 {
@@ -499 +526 @@
                           p->tr("VMM device is not available (is the VM running?)"));
 
-    LogFlowFunc(("hgcmHostCall msg=%RU32, numParms=%RU32\n", u32Function, cParms));
+    LogFlowFunc(("hgcmHostCall uMsg=%RU32, cParms=%RU32\n", u32Function, cParms));
     int rc = pVMMDev->hgcmHostCall("VBoxDragAndDropSvc",
                                    u32Function,
@@ -505 +532 @@
     if (RT_FAILURE(rc))
     {
-        LogFlowFunc(("hgcmHostCall error: %Rrc\n", rc));
-        throw p->setError(VBOX_E_VM_ERROR,
+        LogFlowFunc(("hgcmHostCall failed with rc=%Rrc\n", rc));
+        throw p->setError(VBOX_E_IPRT_ERROR,
                           p->tr("hgcmHostCall failed (%Rrc)"), rc);
     }