Changeset 79120 in vbox for trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

Timestamp:

Jun 13, 2019 10:08:33 AM (5 years ago)

Author:

vboxsync

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

@@ -8462 +8462 @@
 
             VBOXCLIPBOARDEXTPARMS *pParms = (VBOXCLIPBOARDEXTPARMS *)pvParms;
-            AssertPtr(pParms);
+            AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 
             /* The guest announces clipboard formats. This must be delivered to all clients. */
@@ -8478 +8478 @@
 
             VBOXCLIPBOARDEXTPARMS *pParms = (VBOXCLIPBOARDEXTPARMS *)pvParms;
-            AssertPtr(pParms);
+            AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 
             /* The clipboard service expects that the pvData buffer will be filled
@@ -8497 +8497 @@
 
             VBOXCLIPBOARDEXTPARMS *pParms = (VBOXCLIPBOARDEXTPARMS *)pvParms;
-            AssertPtr(pParms);
+            AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
 
             if (pThis->mConsoleVRDPServer)
@@ -8515 +8515 @@
             if (SUCCEEDED(hrc))
             {
-                 PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
-                 AssertPtr(pParms);
-
-                 /* Return the registered area ID back to the caller. */
-                 pParms->uID = uID;
+                PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
+                AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
+
+                /* Return the registered area ID back to the caller. */
+                pParms->uID = uID;
             }
             else
@@ -8529 +8529 @@
             PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
+
             hrc = pControl->ClipboardAreaUnregister(pParms->uID);
             if (FAILED(hrc))
@@ -8538 +8539 @@
             PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
+
             hrc = pControl->ClipboardAreaAttach(pParms->uID);
             if (FAILED(hrc))
@@ -8547 +8549 @@
             PVBOXCLIPBOARDEXTAREAPARMS pParms = (PVBOXCLIPBOARDEXTAREAPARMS)pvParms;
             AssertPtrBreakStmt(pParms, rc = VERR_INVALID_POINTER);
+
             hrc = pControl->ClipboardAreaDetach(pParms->uID);
             if (FAILED(hrc))
@@ -8561 +8564 @@
 # ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
     if (FAILED(hrc))
+    {
+        LogRel(("Shared Clipboard: Area handling failed with %Rhrc\n", hrc));
         rc = VERR_GENERAL_FAILURE; /** @todo Fudge; fix this. */
-# endif
-
-# ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST_DISABLED
-    int rc2 = SharedClipboard::hostServiceCallback(SHAREDCLIPBOARDINST(), u32Function, pvParms, cbParms);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
+    }
 # endif