Changeset 68563 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Aug 31, 2017 12:10:19 PM (7 years ago)

Author:

vboxsync

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

117780

Message:

merging vbglioc r117720: x11-clipboard.cpp: clipLoadXFixes: pyramid code and LogRel statements detailing failure reason.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp (modified) (2 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp

@@ -744 +744 @@
 static int clipLoadXFixes(Display *pDisplay, CLIPBACKEND *pCtx)
 {
-    int dummy1 = 0, dummy2 = 0, rc = VINF_SUCCESS;
-    void *hFixesLib;
-
-    hFixesLib = dlopen("libXfixes.so.1", RTLD_LAZY);
+    int rc;
+
+    void *hFixesLib = dlopen("libXfixes.so.1", RTLD_LAZY);
     if (!hFixesLib)
         hFixesLib = dlopen("libXfixes.so.2", RTLD_LAZY);
@@ -755 +754 @@
         hFixesLib = dlopen("libXfixes.so.4", RTLD_LAZY);
     if (hFixesLib)
-        pCtx->fixesSelectInput =
-            (void (*)(Display *, Window, Atom, long unsigned int))
-                (uintptr_t)dlsym(hFixesLib, "XFixesSelectSelectionInput");
-    /* For us, a NULL function pointer is a failure */
-    if (!hFixesLib || !pCtx->fixesSelectInput)
+    {
+        /* For us, a NULL function pointer is a failure */
+        pCtx->fixesSelectInput = (void (*)(Display *, Window, Atom, long unsigned int))
+                                 (uintptr_t)dlsym(hFixesLib, "XFixesSelectSelectionInput");
+        if (pCtx->fixesSelectInput)
+        {
+            int dummy1 = 0;
+            int dummy2 = 0;
+            if (XQueryExtension(pDisplay, "XFIXES", &dummy1, &pCtx->fixesEventBase, &dummy2) != 0)
+            {
+                if (pCtx->fixesEventBase >= 0)
+                    rc = VINF_SUCCESS;
+                else
+                {
+                    LogRel(("clipLoadXFixes: fixesEventBase is less than zero: %d\n", pCtx->fixesEventBase));
+                    rc = VERR_NOT_SUPPORTED;
+                }
+            }
+            else
+            {
+                LogRel(("clipLoadXFixes: XQueryExtension failed\n"));
+                rc = VERR_NOT_SUPPORTED;
+            }
+        }
+        else
+        {
+            LogRel(("clipLoadXFixes: Symbol XFixesSelectSelectionInput not found!\n"));
+            rc = VERR_NOT_SUPPORTED;
+        }
+    }
+    else
+    {
+        LogRel(("clipLoadXFixes: libxFixes.so.* not found!\n"));
         rc = VERR_NOT_SUPPORTED;
-    if (   RT_SUCCESS(rc)
-        && !XQueryExtension(pDisplay, "XFIXES", &dummy1,
-                            &pCtx->fixesEventBase, &dummy2))
-        rc = VERR_NOT_SUPPORTED;
-    if (RT_SUCCESS(rc) && pCtx->fixesEventBase < 0)
-        rc = VERR_NOT_SUPPORTED;
+    }
     return rc;
 }