Changeset 55838 in vbox for trunk

Timestamp:

May 13, 2015 6:56:40 AM (10 years ago)

Author:

vboxsync

Message:

DevVGA: pfnQueryColorDepth -> pfnQueryVideoMode

Location:

trunk

Files:

• include/VBox/vmm/pdmifs.h (modified) (3 diffs)
• src/VBox/Devices/Graphics/DevVGA.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmifs.h

@@ -524 +524 @@
 
     /**
-     * Return the current guest color depth in bits per pixel (bpp).
+     * Return the current guest resolution and color depth in bits per pixel (bpp).
      *
      * As the graphics card is able to provide display updates with the bpp
@@ -533 +533 @@
      * @param   pInterface         Pointer to this interface.
      * @param   pcBits             Where to store the current guest color depth.
-     * @thread  Any thread.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnQueryColorDepth,(PPDMIDISPLAYPORT pInterface, uint32_t *pcBits));
+     * @param   pcx                Where to store the horizontal resolution.
+     * @param   pcy                Where to store the vertical resolution.
+     * @thread  Any thread.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnQueryVideoMode,(PPDMIDISPLAYPORT pInterface, uint32_t *pcBits, uint32_t *pcx, uint32_t *pcy));
 
     /**
@@ -704 +706 @@
 /** PDMIDISPLAYPORT interface ID. */
 #ifdef VBOX_WITH_VMSVGA
-#define PDMIDISPLAYPORT_IID                     "e8da6d7e-8490-11e4-91d8-ab609a010f13"
+#define PDMIDISPLAYPORT_IID                     "9672e2b0-1aef-4c4d-9108-864cdb28333f"
 #else
-#define PDMIDISPLAYPORT_IID                     "db067c60-8490-11e4-8424-032afeb83818"
+#define PDMIDISPLAYPORT_IID                     "323f3412-8903-4564-b04c-cbfe0d2d1596"
 #endif
 

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

@@ -4771 +4771 @@
 
 
-/** @copydoc PDMIDISPLAYPORT::pfnQueryColorDepth */
-static DECLCALLBACK(int) vgaPortQueryColorDepth(PPDMIDISPLAYPORT pInterface, uint32_t *pcBits)
+/** @copydoc PDMIDISPLAYPORT::pfnQueryVideoMode */
+static DECLCALLBACK(int) vgaPortQueryVideoMode(PPDMIDISPLAYPORT pInterface, uint32_t *pcBits, uint32_t *pcx, uint32_t *pcy)
 {
     PVGASTATE pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
@@ -4779 +4779 @@
         return VERR_INVALID_PARAMETER;
     *pcBits = vga_get_bpp(pThis);
+    if (pcx)
+        *pcx = pThis->last_scr_width;
+    if (pcy)
+        *pcy = pThis->last_scr_height;
     return VINF_SUCCESS;
 }
@@ -6112 +6116 @@
     pThis->IPort.pfnUpdateDisplay       = vgaPortUpdateDisplay;
     pThis->IPort.pfnUpdateDisplayAll    = vgaPortUpdateDisplayAll;
-    pThis->IPort.pfnQueryColorDepth     = vgaPortQueryColorDepth;
+    pThis->IPort.pfnQueryVideoMode      = vgaPortQueryVideoMode;
     pThis->IPort.pfnSetRefreshRate      = vgaPortSetRefreshRate;
     pThis->IPort.pfnTakeScreenshot      = vgaPortTakeScreenshot;