Changeset 83234 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Mar 9, 2020 8:10:44 AM (5 years ago)

Author:

vboxsync

Message:

bugref:9637. small fixes

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (2 diffs)
• display-svga-x11.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -33 +33 @@
  VBoxClient_DEFS += VBOX_WITH_DBUS
 endif
-ifdef VBOX_WITH_DISTRO_XRAND_XINERAMA
- VBoxClient_DEFS += WITH_DISTRO_XRAND_XINERAMA
- VBoxClient_LIBS += Xrandr
-endif
-
 
 VBoxClient_DEFS.linux += _GNU_SOURCE
@@ -66 +61 @@
 VBoxClient_LIBS = \
         X11 Xt Xext Xmu
+ifdef VBOX_WITH_DISTRO_XRAND_XINERAMA
+ VBoxClient_DEFS += WITH_DISTRO_XRAND_XINERAMA
+ VBoxClient_LIBS += Xrandr
+endif
+
 # XXX: -L comes from the template, but not rpath
 VBoxClient_LDFLAGS.netbsd = \

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -144 +144 @@
 static int determineOutputCount();
 
+#define checkFunctionPtr(pFunction)                                     \
+    do{                                                                 \
+        if (!pFunction)                                                 \
+        {                                                               \
+            VBClLogFatalError("Could not find symbol address\n");       \
+            dlclose(x11Context.pRandLibraryHandle);                     \
+            x11Context.pRandLibraryHandle = NULL;                       \
+            return VERR_NOT_FOUND;                                      \
+        }                                                               \
+    }while(0)
 
 bool VMwareCtrlSetTopology(Display *dpy, int hExtensionMajorOpcode,
@@ -409 +419 @@
         return VERR_NOT_FOUND;
     }
+
     *(void **)(&x11Context.pXRRSelectInput) = dlsym(x11Context.pRandLibraryHandle, "XRRSelectInput");
-    if (!x11Context.pXRRSelectInput)
-    {
-        VBClLogFatalError("Could not find address for the symbol XRRSelectInput\n");
-        dlclose(x11Context.pRandLibraryHandle);
-        x11Context.pRandLibraryHandle = NULL;
-        return VERR_NOT_FOUND;
-    }
+    checkFunctionPtr(x11Context.pXRRSelectInput);
+
     *(void **)(&x11Context.pXRRQueryExtension) = dlsym(x11Context.pRandLibraryHandle, "XRRQueryExtension");
-    if (!x11Context.pXRRQueryExtension)
-    {
-        VBClLogFatalError("Could not find address for the symbol XRRQueryExtension\n");
-        dlclose(x11Context.pRandLibraryHandle);
-        x11Context.pRandLibraryHandle = NULL;
-        return VERR_NOT_FOUND;
-    }
+    checkFunctionPtr(x11Context.pXRRQueryExtension);
+
     *(void **)(&x11Context.pXRRQueryVersion) = dlsym(x11Context.pRandLibraryHandle, "XRRQueryVersion");
-    if (!x11Context.pXRRQueryVersion)
-    {
-        VBClLogFatalError("Could not find address for the symbol XRRQueryVersion\n");
-        dlclose(x11Context.pRandLibraryHandle);
-        x11Context.pRandLibraryHandle = NULL;
-        return VERR_NOT_FOUND;
-    }
+    checkFunctionPtr(x11Context.pXRRQueryVersion);
+
     *(void **)(&x11Context.pXRRGetMonitors) = dlsym(x11Context.pRandLibraryHandle, "XRRGetMonitors");
-    if (!x11Context.pXRRGetMonitors)
-    {
-        VBClLogFatalError("Could not find address for the symbol XRRGetMonitors\n");
-        dlclose(x11Context.pRandLibraryHandle);
-        x11Context.pRandLibraryHandle = NULL;
-        return VERR_NOT_FOUND;
-    }
+    checkFunctionPtr(x11Context.pXRRGetMonitors);
+
     *(void **)(&x11Context.pXRRFreeMonitors) = dlsym(x11Context.pRandLibraryHandle, "XRRFreeMonitors");
-    if (!x11Context.pXRRFreeMonitors)
-    {
-        VBClLogFatalError("Could not find address for the symbol XRRFreeMonitors\n");
-        dlclose(x11Context.pRandLibraryHandle);
-        x11Context.pRandLibraryHandle = NULL;
-        return VERR_NOT_FOUND;
-    }
+    checkFunctionPtr(x11Context.pXRRFreeMonitors);
 
     return VINF_SUCCESS;