Changeset 40188 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Feb 21, 2012 8:32:47 AM (13 years ago)

Author:

vboxsync

Message:

Main: disable 3D support for the guest if the availabilty test was not successful (e.g. host 3D drivers busted)

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1729 +1729 @@
             ComPtr<INetworkAdapter> networkAdapter;
             hrc = pMachine->GetNetworkAdapter(ulInstance, networkAdapter.asOutParam());     H();
-            BOOL fEnabled = FALSE;
-            hrc = networkAdapter->COMGETTER(Enabled)(&fEnabled);                            H();
-            if (!fEnabled)
+            BOOL fEnabledNetAdapter = FALSE;
+            hrc = networkAdapter->COMGETTER(Enabled)(&fEnabledNetAdapter);                  H();
+            if (!fEnabledNetAdapter)
                 continue;
 
@@ -1944 +1944 @@
             ComPtr<ISerialPort> serialPort;
             hrc = pMachine->GetSerialPort(ulInstance, serialPort.asOutParam());             H();
-            BOOL fEnabled = FALSE;
+            BOOL fEnabledSerPort = FALSE;
             if (serialPort)
-                hrc = serialPort->COMGETTER(Enabled)(&fEnabled);                            H();
-            if (!fEnabled)
+                hrc = serialPort->COMGETTER(Enabled)(&fEnabledSerPort);                     H();
+            if (!fEnabledSerPort)
                 continue;
 
@@ -2005 +2005 @@
             ComPtr<IParallelPort> parallelPort;
             hrc = pMachine->GetParallelPort(ulInstance, parallelPort.asOutParam());         H();
-            BOOL fEnabled = FALSE;
+            BOOL fEnabledParPort = FALSE;
             if (parallelPort)
             {
-                hrc = parallelPort->COMGETTER(Enabled)(&fEnabled);                          H();
-            }
-            if (!fEnabled)
+                hrc = parallelPort->COMGETTER(Enabled)(&fEnabledParPort);                   H();
+            }
+            if (!fEnabledParPort)
                 continue;
 
@@ -2501 +2501 @@
          */
         {
-            BOOL fEnabled = false;
-            hrc = pMachine->COMGETTER(Accelerate3DEnabled)(&fEnabled); H();
-
-            if (fEnabled)
+            BOOL fEnabled3D = false;
+            hrc = pMachine->COMGETTER(Accelerate3DEnabled)(&fEnabled3D); H();
+
+            if (fEnabled3D)
+            {
+                BOOL fSupports3D = false;
+                hrc = host->COMGETTER(Acceleration3DAvailable)(&fSupports3D); H();
+                if (!fSupports3D)
+                {
+                    setVMRuntimeErrorCallbackF(pVM, this, 0,
+                            "Accel3DNotAvailable",
+                            N_("This VM was configured to use 3D support. However, the "
+                               "3D support of the host is not working properly. Therefore "
+                               "3D support for the guest has been disabled"));
+                    fEnabled3D = false;
+                }
+            }
+
+            if (fEnabled3D)
             {
                 /* Load the service */
@@ -4613 +4628 @@
                         {
                             /* there is a DHCP server available for this network */
-                            BOOL fEnabled;
-                            hrc = dhcpServer->COMGETTER(Enabled)(&fEnabled);
+                            BOOL fEnabledDhcp;
+                            hrc = dhcpServer->COMGETTER(Enabled)(&fEnabledDhcp);
                             if (FAILED(hrc))
                             {
@@ -4621 +4636 @@
                             }
 
-                            if (fEnabled)
+                            if (fEnabledDhcp)
                                 hrc = dhcpServer->Start(networkName.raw(),
                                                         trunkName.raw(),