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

Timestamp:

Jun 7, 2019 2:56:19 PM (6 years ago)

Author:

vboxsync

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

131194

Message:

Shared Clipboard/URI: Update.

File:

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

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

@@ -8445 +8445 @@
 
 # ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-    HRESULT hrc;
-#  define H()         AssertMsgBreakStmt(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), rc = VERR_GENERAL_FAILURE)
+    HRESULT hrc = S_OK;
 # endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
+
+    LogFunc(("mConsoleVRDPServer=%p\n", pThis->mConsoleVRDPServer));
 
     switch (u32Function)
@@ -8511 +8512 @@
             com::SafeArray<BSTR> abstrParms; /* Empty for now. */
             ULONG uID;
-            hrc = pControl->ClipboardAreaRegister(ComSafeArrayAsInParam(abstrParms), &uID);      H();
+            hrc = pControl->ClipboardAreaRegister(ComSafeArrayAsInParam(abstrParms), &uID);
             if (SUCCEEDED(hrc))
             {
@@ -8520 +8521 @@
                  pParms->uID = uID;
             }
+            else
+                LogFunc(("Registering clipboard area failed with %Rhrc\n", hrc));
         } break;
 
@@ -8526 +8529 @@
             PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
-            hrc = pControl->ClipboardAreaUnregister(pParms->uID);                                H();
+            hrc = pControl->ClipboardAreaUnregister(pParms->uID);
+            if (FAILED(hrc))
+                LogFunc(("Unregistering clipboard area %RU32 failed with %Rhrc\n", pParms->uID, hrc));
         } break;
 
@@ -8533 +8538 @@
             PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
-            hrc = pControl->ClipboardAreaAttach(pParms->uID);                                    H();
+            hrc = pControl->ClipboardAreaAttach(pParms->uID);
+            if (FAILED(hrc))
+                LogFunc(("Attaching to clipboard area %RU32 failed with %Rhrc\n", pParms->uID, hrc));
         } break;
 
@@ -8540 +8547 @@
             PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
-            hrc = pControl->ClipboardAreaDetach(pParms->uID);                                    H();
+            hrc = pControl->ClipboardAreaDetach(pParms->uID);
+            if (FAILED(hrc))
+                LogFunc(("Detaching from clipboard area %RU32 failed with %Rhrc\n", pParms->uID, hrc));
         } break;
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
@@ -8549 +8558 @@
         } break;
     }
+
+    if (FAILED(hrc))
+        rc = VERR_GENERAL_FAILURE; /** @todo Fudge; fix this. */
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST_DISABLED
@@ -8555 +8567 @@
         rc = rc2;
 #endif
-
-#undef H
 
     LogFlowFuncLeaveRC(rc);