Changeset 97801 in vbox

Timestamp:

Dec 14, 2022 2:50:42 PM (2 years ago)

Author:

vboxsync

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

154876

Message:

DnD/Main: Some more reset handling fixes.

Location:

trunk/src/VBox/Main

Files:

• include/GuestDnDPrivate.h (modified) (1 diff)
• src-client/GuestDnDPrivate.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -853 +853 @@
      * @{ */
     bool isProgressCanceled(void) const;
+    bool isProgressRunning(void) const;
     int setProgress(unsigned uPercentage, uint32_t uState, int rcOp = VINF_SUCCESS, const Utf8Str &strMsg = "");
     HRESULT resetProgress(const ComObjPtr<Guest>& pParent);

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

@@ -356 +356 @@
  *
  * @returns VBox status code. Will get sent back to the host service.
+ * @retval  VERR_NO_DATA if no new messages from the host side are available at the moment.
  * @retval  VERR_CANCELLED for indicating that the current operation was cancelled.
  * @param   uMsg                HGCM message ID (function number).
@@ -395 +396 @@
         }
 
+        case GUEST_DND_FN_GET_NEXT_HOST_MSG:
+            vrc = VERR_NO_DATA; /* Indicate back to the host service that there are no new messages. */
+            break;
+
         default:
-            AssertMsgBreakStmt(pThis->isProgressCanceled(), ("Transfer not cancelled (yet)!\n"), vrc = VERR_INVALID_STATE);
+            AssertMsgBreakStmt(pThis->isProgressRunning() == false,
+                               ("Progress object not completed / canceld yet! State is '%s' (%#x)\n",
+                                DnDStateToStr(pThis->m_enmState), pThis->m_enmState),
+                               vrc = VERR_INVALID_STATE); /* Please report this! */
             vrc = VERR_CANCELLED;
             break;
@@ -429 +437 @@
  * Returns whether the progress object has been canceled or not.
  *
- * @returns \c true if canceled, \c false if not.
+ * @returns \c true if canceled or progress does not exist, \c false if not.
  */
 bool GuestDnDState::isProgressCanceled(void) const
 {
+    if (m_pProgress.isNull())
+        return true;
+
     BOOL fCanceled;
-    if (!m_pProgress.isNull())
-    {
-        HRESULT hr = m_pProgress->COMGETTER(Canceled)(&fCanceled);
-        AssertComRC(hr);
-    }
-    else
-        fCanceled = TRUE;
-
+    HRESULT hr = m_pProgress->COMGETTER(Canceled)(&fCanceled);
+    AssertComRCReturn(hr, false);
     return RT_BOOL(fCanceled);
+}
+
+/**
+ * Returns whether the progress object still is in a running state or not.
+ *
+ * @returns \c true if running, \c false if not.
+ */
+bool GuestDnDState::isProgressRunning(void) const
+{
+    if (m_pProgress.isNull())
+        return false;
+
+    BOOL fRunning;
+    HRESULT hr = m_pProgress->COMGETTER(Completed)(&fRunning);
+    AssertComRCReturn(hr, false);
+    return RT_BOOL(fRunning);
 }