Changeset 54858 in vbox

Timestamp:

Mar 20, 2015 8:25:45 AM (10 years ago)

Author:

vboxsync

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

99065

Message:

Additions/VBoxClient: do not display an error if the clipboard or drag and drop services are not present on the host.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp (modified) (1 diff)
• common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (1 diff)
• x11/VBoxClient/clipboard.cpp (modified) (2 diffs)
• x11/VBoxClient/draganddrop.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp

@@ -58 +58 @@
             *pu32ClientId = Info.u32ClientID;
     }
+    if (rc == VERR_HGCM_SERVICE_NOT_FOUND)
+        rc = VINF_PERMISSION_DENIED;
     return rc;
 }

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -724 +724 @@
             *pu32ClientId = Info.u32ClientID;
     }
+    if (rc == VERR_HGCM_SERVICE_NOT_FOUND)
+        rc = VINF_PERMISSION_DENIED;
     return rc;
 }

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -202 +202 @@
     }
 
-    if (RT_FAILURE(rc) && g_ctx.pBackend)
+    if (rc != VINF_SUCCESS && g_ctx.pBackend)
         ClipDestructX11(g_ctx.pBackend);
     LogRelFlowFunc(("g_ctx.client=%u rc=%Rrc\n", g_ctx.client, rc));
@@ -293 +293 @@
         VBClFatalError(("Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));
     rc = vboxClipboardConnect();
-    if (RT_SUCCESS(rc))
+    if (rc == VINF_SUCCESS)
         rc = vboxClipboardMain();
     if (rc == VERR_NOT_SUPPORTED)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -2255 +2255 @@
     int rc = VbglR3DnDConnect(&uClientID);
     if (RT_FAILURE(rc))
-    {
         LogRel(("DnD: Unable to connect to drag'n drop service, rc=%Rrc\n", rc));
+    if (rc != VINF_SUCCESS)
         return rc;
-    }
 
     /* Number of invalid messages skipped in a row. */