Changeset 54858 in vbox for trunk/src

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:

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

r44529	r54858
58	58	*pu32ClientId = Info.u32ClientID;
59	59	}
	60	if (rc == VERR_HGCM_SERVICE_NOT_FOUND)
	61	rc = VINF_PERMISSION_DENIED;
60	62	return rc;
61	63	}

r52800	r54858
724	724	*pu32ClientId = Info.u32ClientID;
725	725	}
	726	if (rc == VERR_HGCM_SERVICE_NOT_FOUND)
	727	rc = VINF_PERMISSION_DENIED;
726	728	return rc;
727	729	}

-              r54008
+              r54858
+    }
     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));
 …
         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)

-              r54008
+              r54858
     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. */

Note: See TracChangeset for help on using the changeset viewer.