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

Timestamp:

Nov 18, 2019 8:42:02 PM (5 years ago)

Author:

vboxsync

Message:

Main/GraphicsAdapter: Split off a few attributes from Machine interface, which affects quite a few other interfaces.
Frontends/VirtualBox+VBoxManage+VBoxSDL+VBoxShell: Adapt accordingly.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl2.cpp (modified) (5 diffs)
• ConsoleVRDPServer.cpp (modified) (1 diff)
• DisplayImpl.cpp (modified) (1 diff)

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

@@ -1634 +1634 @@
          * VGA.
          */
+        ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+        hrc = pMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());           H();
         GraphicsControllerType_T enmGraphicsController;
-        hrc = pMachine->COMGETTER(GraphicsControllerType)(&enmGraphicsController);          H();
+        hrc = pGraphicsAdapter->COMGETTER(GraphicsControllerType)(&enmGraphicsController);          H();
         switch (enmGraphicsController)
         {
@@ -1647 +1649 @@
 #endif
             case GraphicsControllerType_VBoxVGA:
-                rc = i_configGraphicsController(pDevices, enmGraphicsController, pBusMgr, pMachine, biosSettings,
+                rc = i_configGraphicsController(pDevices, enmGraphicsController, pBusMgr, pMachine, pGraphicsAdapter, biosSettings,
                                                 RT_BOOL(fHMEnabled));
                 if (FAILED(rc))
@@ -3759 +3761 @@
                                         BusAssignmentManager *pBusMgr,
                                         const ComPtr<IMachine> &ptrMachine,
+                                        const ComPtr<IGraphicsAdapter> &ptrGraphicsAdapter,
                                         const ComPtr<IBIOSSettings> &ptrBiosSettings,
                                         bool fHMEnabled)
@@ -3778 +3781 @@
         InsertConfigNode(pInst,    "Config", &pCfg);
         ULONG cVRamMBs;
-        hrc = ptrMachine->COMGETTER(VRAMSize)(&cVRamMBs);                                   H();
+        hrc = ptrGraphicsAdapter->COMGETTER(VRAMSize)(&cVRamMBs);                           H();
         InsertConfigInteger(pCfg,  "VRamSize",             cVRamMBs * _1M);
         ULONG cMonitorCount;
-        hrc = ptrMachine->COMGETTER(MonitorCount)(&cMonitorCount);                          H();
+        hrc = ptrGraphicsAdapter->COMGETTER(MonitorCount)(&cMonitorCount);                  H();
         InsertConfigInteger(pCfg,  "MonitorCount",         cMonitorCount);
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
@@ -3789 +3792 @@
 #endif
         BOOL f3DEnabled;
-        hrc = ptrMachine->COMGETTER(Accelerate3DEnabled)(&f3DEnabled);                      H();
+        hrc = ptrGraphicsAdapter->COMGETTER(Accelerate3DEnabled)(&f3DEnabled);              H();
         InsertConfigInteger(pCfg,  "3DEnabled",            f3DEnabled);
 

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

@@ -618 +618 @@
         case VRDE_QP_NUMBER_MONITORS:
         {
-            ULONG cMonitors = 1;
-
-            server->mConsole->i_machine()->COMGETTER(MonitorCount)(&cMonitors);
+            uint32_t cMonitors = server->mConsole->i_getDisplay()->i_getMonitorCount();
 
             if (cbBuffer >= sizeof(uint32_t))

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

@@ -484 +484 @@
     fVGAResizing = false;
 
+    ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+    HRESULT hrc = mParent->i_machine()->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
+    AssertComRCReturnRC(hrc);
+    AssertReturn(!pGraphicsAdapter.isNull(), E_FAIL);
+
     ULONG ul;
-    mParent->i_machine()->COMGETTER(MonitorCount)(&ul);
+    pGraphicsAdapter->COMGETTER(MonitorCount)(&ul);
     mcMonitors = ul;
     xInputMappingOrigin = 0;