Changeset 71488 in vbox

Timestamp:

Mar 23, 2018 3:12:15 PM (7 years ago)

Author:

vboxsync

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

121460

Message:

DevVGA, Additions: minor improvements for the VGA configuration interface.

Location:

trunk

Files:

• include/VBox/Graphics/VBoxVideoGuest.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxVideo/Modesetting.cpp (modified) (2 diffs)
• src/VBox/Devices/Graphics/DevVGA.cpp (modified) (1 diff)

trunk/include/VBox/Graphics/VBoxVideoGuest.h

@@ -127 +127 @@
 DECLHIDDEN(uint32_t) VBoxHGSMIGetMonitorCount(PHGSMIGUESTCOMMANDCONTEXT pCtx);
 DECLHIDDEN(bool)     VBoxVGACfgAvailable(void);
-DECLHIDDEN(bool)     VBoxVGACfgQuery(uint16_t u16Id, uint32_t *pu32Value);
+DECLHIDDEN(bool)     VBoxVGACfgQuery(uint16_t u16Id, uint32_t *pu32Value, uint32_t u32DefValue);
 DECLHIDDEN(uint32_t) VBoxVideoGetVRAMSize(void);
 DECLHIDDEN(bool)     VBoxVideoAnyWidthAllowed(void);

trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp

@@ -79 +79 @@
  *
  * @returns Whether the value is supported.
- * @param  u16Id     Identifier of the configuration value (VBE_DISPI_CFG_ID_*).
- * @param  pu32Value Where to store value from the host.
- */
-DECLHIDDEN(bool) VBoxVGACfgQuery(uint16_t u16Id, uint32_t *pu32Value)
+ * @param  u16Id       Identifier of the configuration value (VBE_DISPI_CFG_ID_*).
+ * @param  pu32Value   Where to store value from the host.
+ * @param  u32DefValue What to assign to *pu32Value if the value is not supported.
+ */
+DECLHIDDEN(bool) VBoxVGACfgQuery(uint16_t u16Id, uint32_t *pu32Value, uint32_t u32DefValue)
 {
     uint32_t u32;
@@ -95 +96 @@
     }
 
+    *pu32Value = u32DefValue;
     return false;
 }

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -854 +854 @@
     const bool fQuerySupport = RT_BOOL(u16Cfg & VBE_DISPI_CFG_MASK_SUPPORT);
 
+    uint32_t val = 0;
     switch (u16Id)
     {
-        case VBE_DISPI_CFG_ID_VERSION:
-           return fQuerySupport ? 1 : 0;
-        case VBE_DISPI_CFG_ID_VRAM_SIZE:
-           return fQuerySupport ? 1 : pThis->vram_size;
-        case VBE_DISPI_CFG_ID_3D:
-           return fQuerySupport ? 1 : pThis->f3DEnabled;
-        case VBE_DISPI_CFG_ID_VMSVGA:
-           return fQuerySupport ? 1 : pThis->fVMSVGAEnabled;
+        case VBE_DISPI_CFG_ID_VERSION:   val = 1; break;
+        case VBE_DISPI_CFG_ID_VRAM_SIZE: val = pThis->vram_size; break;
+        case VBE_DISPI_CFG_ID_3D:        val = pThis->f3DEnabled; break;
+        case VBE_DISPI_CFG_ID_VMSVGA:    val = pThis->fVMSVGAEnabled; break;
         default:
            return 0; /* Not supported. */
     }
+
+    return fQuerySupport ? 1 : val;
 }