Changeset 1721 in vbox

Timestamp:

Mar 27, 2007 11:46:18 AM (18 years ago)

Author:

vboxsync

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

19878

Message:

Implemented new 'MonitorCount' VM setting, to be used by VGA device and NT guest driver.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• MachineImpl.cpp (modified) (7 diffs)
• SystemPropertiesImpl.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (1 diff)
• include/GuestOSTypeImpl.h (modified) (1 diff)
• include/MachineImpl.h (modified) (2 diffs)
• include/SystemPropertiesImpl.h (modified) (1 diff)
• xml/SchemaDefs.xsl (modified) (1 diff)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4337 +4337 @@
     BSTR            str = NULL;
     ULONG           cRamMBs;
+    ULONG           cMonitors;
     unsigned        i;
 
@@ -4737 +4738 @@
     hrc = pMachine->COMGETTER(VRAMSize)(&cRamMBs);                                  H();
     rc = CFGMR3InsertInteger(pCfg,  "VRamSize",             cRamMBs * _1M);         RC_CHECK();
+    hrc = pMachine->COMGETTER(MonitorCount)(&cMonitors);                            H();
+    rc = CFGMR3InsertInteger(pCfg,  "MonitorCount",         cMonitors);             RC_CHECK();
 
     /* Custom VESA mode list */
@@ -5335 +5338 @@
                 break;
             }
-#endif 
+#endif
         }
     }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -162 +162 @@
     mMemorySize = 128;
     mVRAMSize = 8;
+    mMonitorCount = 1;
     mHWVirtExEnabled = TriStateBool_False;
 
@@ -185 +186 @@
     if (mMemorySize != that.mMemorySize ||
         mVRAMSize != that.mVRAMSize ||
+        mMonitorCount != that.mMonitorCount ||
         mHWVirtExEnabled != that.mHWVirtExEnabled ||
         mClipboardMode != that.mClipboardMode)
@@ -944 +946 @@
     mHWData.backup();
     mHWData->mVRAMSize = memorySize;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMGETTER(MonitorCount) (ULONG *monitorCount)
+{
+    if (!monitorCount)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *monitorCount = mHWData->mMonitorCount;
+
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(MonitorCount) (ULONG monitorCount)
+{
+    /* make sure monitor count is a sensible number */
+    if (monitorCount < 1 || monitorCount > SchemaDefs::MaxGuestMonitors)
+        return setError (E_INVALIDARG,
+            tr ("Invalid monitor count: %lu (must be in range [%lu, %lu])"),
+                monitorCount, 1, SchemaDefs::MaxGuestMonitors);
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoLock alock (this);
+
+    CHECK_SETTER();
+
+    mHWData.backup();
+    mHWData->mMonitorCount = monitorCount;
 
     return S_OK;
@@ -3544 +3582 @@
         CFGLDRQueryUInt32 (displayNode, "VRAMSize", &VRAMSize);
         mHWData->mVRAMSize = VRAMSize;
+
+        uint32_t MonitorCount;
+        CFGLDRQueryUInt32 (displayNode, "MonitorCount", &MonitorCount);
+        mHWData->mMonitorCount = MonitorCount;
+
         CFGLDRReleaseNode (displayNode);
     }
@@ -3952 +3995 @@
         else if (driver == L"coreaudio")
             audioDriver = AudioDriverType_CoreAudioDriver;
-#endif 
+#endif
         else
             AssertMsgFailed (("Invalid driver: %ls\n", driver.raw()));
@@ -5402 +5445 @@
         CFGLDRCreateChildNode (aNode, "Display", &displayNode);
         CFGLDRSetUInt32 (displayNode, "VRAMSize", mHWData->mVRAMSize);
+        CFGLDRSetUInt32 (displayNode, "MonitorCount", mHWData->mMonitorCount);
         CFGLDRReleaseNode (displayNode);
     }
@@ -5751 +5795 @@
                 break;
             }
-#endif 
+#endif
             default:
                 ComAssertMsgFailedBreak (("Wrong audio driver type! driver = %d\n",

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -145 +145 @@
 }
 
+STDMETHODIMP SystemProperties::COMGETTER(MaxGuestMonitors)(ULONG *maxMonitors)
+{
+    if (!maxMonitors)
+        return E_POINTER;
+    AutoLock lock(this);
+    CHECK_READY();
+
+    *maxMonitors = SchemaDefs::MaxGuestMonitors;
+
+    return S_OK;
+}
+
 STDMETHODIMP SystemProperties::COMGETTER(MaxVDISize)(ULONG64 *maxVDISize)
 {

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1936 +1936 @@
         </attribute>
 
+        <attribute name="MonitorCount" type="unsigned long">
+            <desc>
+                Number of virtual monitors.
+                <note>
+                    Only effective on Windows XP and later guests with
+                    Guest Additions installed.
+                </note>
+            </desc>
+        </attribute>
+
         <attribute name="BIOSSettings" type="IBIOSSettings" readonly="yes">
             <desc>Object containing all BIOS settings.</desc>

trunk/src/VBox/Main/include/GuestOSTypeImpl.h

@@ -75 +75 @@
     uint32_t mVRAMSize;
     uint32_t mHDDSize;
+    uint32_t mMonitorCount;
 };
 

trunk/src/VBox/Main/include/MachineImpl.h

@@ -243 +243 @@
         ULONG          mMemorySize;
         ULONG          mVRAMSize;
+        ULONG          mMonitorCount;
         TriStateBool_T mHWVirtExEnabled;
 
@@ -319 +320 @@
     STDMETHOD(COMGETTER(VRAMSize))(ULONG *memorySize);
     STDMETHOD(COMSETTER(VRAMSize))(ULONG memorySize);
+    STDMETHOD(COMGETTER(MonitorCount))(ULONG *monitorCount);
+    STDMETHOD(COMSETTER(MonitorCount))(ULONG monitorCount);
     STDMETHOD(COMGETTER(BIOSSettings))(IBIOSSettings **biosSettings);
     STDMETHOD(COMGETTER(HWVirtExEnabled))(TriStateBool_T *enabled);

trunk/src/VBox/Main/include/SystemPropertiesImpl.h

@@ -60 +60 @@
     STDMETHOD(COMGETTER(MinGuestVRAM)(ULONG *minVRAM));
     STDMETHOD(COMGETTER(MaxGuestVRAM)(ULONG *maxVRAM));
+    STDMETHOD(COMGETTER(MaxGuestMonitors)(ULONG *maxMonitors));
     STDMETHOD(COMGETTER(MaxVDISize)(ULONG64 *maxVDISize));
     STDMETHOD(COMGETTER(NetworkAdapterCount)(ULONG *count));

trunk/src/VBox/Main/xml/SchemaDefs.xsl

@@ -125 +125 @@
   </xsl:call-template>
   <xsl:call-template name="defineEnumMember">
+      <xsl:with-param name="member" select="'        MaxGuestMonitors'"/>
+      <xsl:with-param name="select" select="
+        xsd:complexType[@name='TDisplay']/xsd:attribute[@name='MonitorCount']//xsd:maxInclusive/@value
+      "/>
+  </xsl:call-template>
+  <xsl:call-template name="defineEnumMember">
       <xsl:with-param name="member" select="'        NetworkAdapterCount'"/>
       <xsl:with-param name="select" select="

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -378 +378 @@
     </xsd:simpleType>
   </xsd:attribute>
+  <xsd:attribute name="MonitorCount" default="1">
+    <xsd:simpleType>
+      <xsd:restriction base="xsd:unsignedInt">
+        <xsd:maxInclusive value="8"/>
+      </xsd:restriction>
+    </xsd:simpleType>
+  </xsd:attribute>
 </xsd:complexType>