Changeset 100510 in vbox

Timestamp:

Jul 11, 2023 11:54:05 AM (17 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Also propagate the last error set via SharedClipboardWinDataObject::SetStatus(). bugref:9437

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-win.h (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp (modified) (4 diffs)

trunk/include/VBox/GuestHost/SharedClipboard-win.h

@@ -333 +333 @@
     /** The object's current status. */
     Status                      m_enmStatus;
+    /** Last (IPRT-style) error set in conjunction with the status. */
+    int                         m_rcStatus;
     /** Data object callback table to use. */
     CALLBACKS                   m_Callbacks;

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

@@ -57 +57 @@
     : m_pCtx(NULL)
     , m_enmStatus(Uninitialized)
+    , m_rcStatus(VERR_IPE_UNINITIALIZED_STATUS)
     , m_lRefCount(0)
     , m_cFormats(0)
@@ -585 +586 @@
 
                         case Completed:
-                            LogRel2(("Shared Clipboard: Transfer complete\n"));
+                            LogRel2(("Shared Clipboard: Data object: Transfer complete\n"));
                             break;
 
                         case Canceled:
-                            LogRel2(("Shared Clipboard: Transfer canceled\n"));
+                            LogRel2(("Shared Clipboard: Data object: Transfer canceled\n"));
                             break;
 
                         case Error:
-                            LogRel(("Shared Clipboard: Transfer error within data object thread occurred\n"));
+                            LogRel(("Shared Clipboard: Data object: Transfer error %Rrc occurred\n", pThis->m_rcStatus));
                             break;
 
@@ -1273 +1274 @@
  * @param   enmStatus           New status to signal.
  * @param   rc                  Result code. Optional.
+ *                              Errors only accepted when status also is 'Error'.
  *
  * @note    Caller must have taken the critical section.
@@ -1281 +1283 @@
     AssertReturn(RTCritSectIsOwned(&m_CritSect), VERR_WRONG_ORDER);
 
-    RT_NOREF(rc);
-
-    LogFlowFunc(("enmStatus=%#x (current is: %#x)\n", enmStatus, m_enmStatus));
+    LogFlowFunc(("enmStatus=%#x, rc=%Rrc (current is: %#x)\n", enmStatus, rc, m_enmStatus));
 
     int rc2 = VINF_SUCCESS;
+
+    m_rcStatus = rc;
 
     switch (enmStatus)