Changeset 84156 in vbox for trunk/src/VBox/Additions

Timestamp:

May 6, 2020 9:22:11 AM (5 years ago)

Author:

vboxsync

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

137757

Message:

bugref:9637. Don't bail out if wmware's extension is not avaible.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (6 diffs)

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

@@ -124 +124 @@
     XRRScreenResources *pScreenResources;
     int hRandRMajor;
-    int hVMWCtrlMajorOpCode;
     int hRandRMinor;
     int hRandREventBase;
@@ -132 +131 @@
     int hOutputCount;
     void *pRandLibraryHandle;
+    bool fWmwareCtrlExtention;
+    int hVMWCtrlMajorOpCode;
     /** Function pointers we used if we dlopen libXrandr instead of linking. */
     void (*pXRRSelectInput) (Display *, Window, int);
@@ -426 +427 @@
 }
 
-
+/** Makes a call to vmwarectrl extension. This updates the
+ * connection information and possible resolutions (modes)
+ * of each monitor on the driver. Also sets the preferred mode
+ * of each output (monitor) to currently selected one. */
 bool VMwareCtrlSetTopology(Display *dpy, int hExtensionMajorOpcode,
                             int screen, xXineramaScreenInfo extents[], int number)
@@ -780 +784 @@
     x11Context.pXRRGetCrtcInfo = NULL;
     x11Context.pXRRAddOutputMode = NULL;
+    x11Context.fWmwareCtrlExtention = false;
 
     int dummy;
@@ -798 +803 @@
     }
 #endif
-    if (!XQueryExtension(x11Context.pDisplay, "VMWARE_CTRL",
-                         &x11Context.hVMWCtrlMajorOpCode, &dummy, &dummy))
-    {
-        XCloseDisplay(x11Context.pDisplay);
-        XCloseDisplay(x11Context.pDisplayRandRMonitoring);
-        x11Context.pDisplay = NULL;
-        x11Context.pDisplayRandRMonitoring = NULL;
-        return;
-    }
+
+    x11Context.fWmwareCtrlExtention = XQueryExtension(x11Context.pDisplay, "VMWARE_CTRL",
+                                                      &x11Context.hVMWCtrlMajorOpCode, &dummy, &dummy);
+    if (!x11Context.fWmwareCtrlExtention)
+        VBClLogError("VMWARE's ctrl extension is not available!\n");
+    else
+    {
+        VBClLogInfo("VMWARE's ctrl extension is available. Major Opcode is %d.\n", x11Context.hVMWCtrlMajorOpCode);
+    }
+
+    /* Check Xrandr stuff. */
     bool fSuccess = false;
 #ifdef WITH_DISTRO_XRAND_XINERAMA
@@ -1115 +1122 @@
 {
     XGrabServer(x11Context.pDisplay);
-    callVMWCTRL(paOutputs);
+    if (x11Context.fWmwareCtrlExtention)
+        callVMWCTRL(paOutputs);
 
 #ifdef WITH_DISTRO_XRAND_XINERAMA