Changeset 60967 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

May 12, 2016 7:11:42 PM (9 years ago)

Author:

vboxsync

Message:

DnD/VBoxClient: Exit gracefully if DnD is not available on the host.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (4 diffs)

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

@@ -719 +719 @@
 int DragInstance::init(uint32_t u32ScreenID)
 {
-    int rc;
+    int rc = VbglR3DnDConnect(&m_dndCtx);
+    /* Note: Can return VINF_PERMISSION_DENIED if HGCM host service is not available. */
+    if (rc != VINF_SUCCESS)
+        return rc;
 
     do
     {
-        rc = VbglR3DnDConnect(&m_dndCtx);
-        if (RT_FAILURE(rc))
-            break;
-
         rc = RTSemEventCreate(&m_eventQueueEvent);
         if (RT_FAILURE(rc))
@@ -2964 +2963 @@
          * another screen number than zero. Maybe in the future it will become
          * necessary if VBox supports multiple X11 screens. */
-        rc = m_pCurDnD->init(0);
-        if (RT_FAILURE(rc))
-            break;
+        rc = m_pCurDnD->init(0 /* uScreenID */);
+        /* Note: Can return VINF_PERMISSION_DENIED if HGCM host service is not available. */
+        if (rc != VINF_SUCCESS)
+        {
+            if (RT_FAILURE(rc))
+                LogRel(("DnD: Unable to connect to drag and drop service, rc=%Rrc\n", rc));
+            else if (rc == VINF_PERMISSION_DENIED)
+                LogRel(("DnD: Not available on host, terminating\n"));
+            break;
+        }
 
         LogRel(("DnD: Started\n"));
@@ -3102 +3108 @@
         } while (!ASMAtomicReadBool(&m_fSrvStopping));
 
+        LogRel(("DnD: Stopped with rc=%Rrc\n", rc));
+
     } while (0);
 
-    LogRel(("DnD: Stopped with rc=%Rrc\n", rc));
     return rc;
 }
@@ -3183 +3190 @@
 
     int rc = VbglR3DnDConnect(&dndCtx);
-    if (RT_FAILURE(rc))
-        LogRel(("DnD: Unable to connect to drag and drop service, rc=%Rrc\n", rc));
-    /* Not RT_FAILURE: VINF_PERMISSION_DENIED is host service not present. */
+    /* Note: Can return VINF_PERMISSION_DENIED if HGCM host service is not available. */
     if (rc != VINF_SUCCESS)
         return rc;