Changeset 100546 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 12, 2023 12:03:22 PM (19 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Made transfers errors more visible via balloon tooltips when VBoxTray is running verbose mode. bugref:9437

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -192 +192 @@
 
 /**
- * @copydoc SharedClipboardWinDataObject::CALLBACKS::pfnTransferEnd
- *
- * Called by SharedClipboardWinDataObject when the assigned transfer has been ended.
- *
- * @thread  Clipboard main thread.
- */
-static DECLCALLBACK(int) vbtrShClDataObjectTransferEndCallback(SharedClipboardWinDataObject::PCALLBACKCTX pCbCtx,
-                                                               PSHCLTRANSFER pTransfer, int rcTransfer)
-{
-    LogFlowFuncEnter();
-
-    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pCbCtx->pvUser;
-    AssertPtr(pCtx);
-
-    SHCLTRANSFERSTATUS enmSts;
-
-    switch (rcTransfer)
-    {
-        case VERR_CANCELLED:
-            enmSts = SHCLTRANSFERSTATUS_CANCELED;
-            break;
-
-        default:
-            enmSts =   RT_SUCCESS(rcTransfer)
-                     ? SHCLTRANSFERSTATUS_UNINITIALIZED : SHCLTRANSFERSTATUS_ERROR;
-            break;
-    }
-
-    int rc = VbglR3ClipboardTransferStatusReply(&pCtx->CmdCtx, pTransfer, enmSts,
-                                                enmSts == SHCLTRANSFERSTATUS_ERROR ? rcTransfer : VINF_SUCCESS);
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-/**
  * @copydoc SHCLTRANSFERCALLBACKS::pfnOnCreated
  *
@@ -393 +358 @@
     AssertPtr(pCtx);
 
+    LogFlowFunc(("rcCompletion=%Rrc\n", rcCompletion));
+
     LogRel2(("Shared Clipboard: Transfer %RU16 %s\n",
              ShClTransferGetID(pCbCtx->pTransfer), rcCompletion == VERR_CANCELLED ? "canceled" : "complete"));
+
+    SHCLTRANSFERSTATUS enmSts;
+
+    switch (rcCompletion)
+    {
+        case VERR_CANCELLED:
+            enmSts = SHCLTRANSFERSTATUS_CANCELED;
+            break;
+
+        case VINF_SUCCESS:
+            enmSts = SHCLTRANSFERSTATUS_STOPPED;
+            break;
+
+        default:
+            AssertFailedStmt(enmSts = SHCLTRANSFERSTATUS_ERROR);
+            break;
+    }
+
+    int rc = VbglR3ClipboardTransferStatusReply(&pCtx->CmdCtx, pCbCtx->pTransfer, enmSts, rcCompletion);
+    LogFlowFuncLeaveRC(rc);
 }
 
@@ -404 +391 @@
 
     LogRel(("Shared Clipboard: Transfer %RU16 failed with %Rrc\n", ShClTransferGetID(pCbCtx->pTransfer), rcError));
-}
-
+
+    if (g_cVerbosity) /* Only show this in verbose mode. */
+    {
+        char szMsg  [256]; /* Sizes according to MSDN. */
+        char szTitle[64];
+
+        /** @todo Add some translation macros here. */
+        RTStrPrintf(szTitle, sizeof(szTitle), "VirtualBox Shared Clipboard");
+        RTStrPrintf(szMsg, sizeof(szMsg),
+                    "Transfer %RU16 failed with %Rrc", ShClTransferGetID(pCbCtx->pTransfer), rcError);
+
+        hlpShowBalloonTip(g_hInstance, g_hwndToolWindow, ID_TRAYICON,
+                          szMsg, szTitle,
+                          5000 /* Time to display in msec */, NIIF_INFO);
+    }
+
+    int rc = VbglR3ClipboardTransferStatusReply(&pCtx->CmdCtx, pCbCtx->pTransfer, SHCLTRANSFERSTATUS_ERROR, rcError);
+    LogFlowFuncLeaveRC(rc);
+}
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 
@@ -751 +755 @@
                     RT_ZERO(Callbacks);
                     Callbacks.pfnTransferBegin = vbtrShClDataObjectTransferBeginCallback;
-                    Callbacks.pfnTransferEnd   = vbtrShClDataObjectTransferEndCallback;
 
                     rc = SharedClipboardWinTransferCreateAndSetDataObject(pWinCtx, pCtx, &Callbacks);