Changeset 97760 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 7, 2022 3:13:42 PM (2 years ago)

Author:

vboxsync

Message:

DnD/Main: Don't set any (new) progress if the progress object already has been completed and/or cancelled.

File:

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

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

@@ -431 +431 @@
     HRESULT hr = S_OK;
 
+    if (m_pProgress.isNull())
+        return VINF_SUCCESS;
+
     BOOL fCompleted = FALSE;
+    hr = m_pProgress->COMGETTER(Completed)(&fCompleted);
+    AssertComRCReturn(hr, VERR_COM_UNEXPECTED);
+
     BOOL fCanceled  = FALSE;
+    hr = m_pProgress->COMGETTER(Canceled)(&fCanceled);
+    AssertComRCReturn(hr, VERR_COM_UNEXPECTED);
+
+    LogFlowFunc(("Progress fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
 
     int rc = VINF_SUCCESS;
 
-    if (!m_pProgress.isNull())
-    {
-        hr = m_pProgress->COMGETTER(Completed)(&fCompleted);
-        AssertComRC(hr);
-
-        hr = m_pProgress->COMGETTER(Canceled)(&fCanceled);
-        AssertComRC(hr);
-
-        LogFlowFunc(("Progress fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
-    }
-
     switch (uStatus)
     {
@@ -453 +452 @@
             LogRel(("DnD: Guest reported error %Rrc\n", rcOp));
 
-            if (   !m_pProgress.isNull()
-                && !fCompleted)
+            if (   !fCompleted
+                && !fCanceled)
                 hr = m_pProgress->i_notifyComplete(VBOX_E_DND_ERROR,
                                                    COM_IIDOF(IGuest),
@@ -466 +465 @@
             LogRel2(("DnD: Guest cancelled operation\n"));
 
-            if (   !m_pProgress.isNull()
-                && !fCompleted)
+            if (   !fCompleted
+                && !fCanceled)
             {
                 hr = m_pProgress->Cancel();
@@ -485 +484 @@
             LogRel2(("DnD: Guest reporting running/completion status with %u%%\n", uPercentage));
 
-            if (   !m_pProgress.isNull()
-                && !fCompleted)
+            if (   !fCompleted
+                && !fCanceled)
             {
                 hr = m_pProgress->SetCurrentOperationProgress(uPercentage);
-                AssertComRC(hr);
+                AssertComRCReturn(hr, VERR_COM_UNEXPECTED);
                 if (   uStatus     == DragAndDropSvc::DND_PROGRESS_COMPLETE
                     || uPercentage >= 100)
                 {
                     hr = m_pProgress->i_notifyComplete(S_OK);
-                    AssertComRC(hr);
+                    AssertComRCReturn(hr, VERR_COM_UNEXPECTED);
                 }
             }
@@ -502 +501 @@
         default:
             break;
-    }
-
-    if (!m_pProgress.isNull())
-    {
-        hr = m_pProgress->COMGETTER(Completed)(&fCompleted);
-        AssertComRC(hr);
-        hr = m_pProgress->COMGETTER(Canceled)(&fCanceled);
-        AssertComRC(hr);
-
-        LogFlowFunc(("Progress fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
     }