Changeset 3155 in vbox for trunk

Timestamp:

Jun 19, 2007 11:25:14 AM (18 years ago)

Author:

vboxsync

Message:

Allow the VM to start with NULL framebuffer.

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.cpp (modified) (2 diffs)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/MouseImpl.cpp (modified) (1 diff)
• Main/VMMDevInterface.cpp (modified) (2 diffs)

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

@@ -4397 +4397 @@
                 if (pData->pDrv)
                 {
-                    if (    pData->pDrv->pu8Data
-                        &&  pData->pDrv->pfnRefresh
+                    /* pData->pDrv->pu8Data can be NULL when there is no framebuffer. */
+                    if (    pData->pDrv->pfnRefresh
                         &&  pData->pDrv->pfnResize
                         &&  pData->pDrv->pfnUpdateRect)
@@ -4404 +4404 @@
                     else
                     {
-                        Assert(pData->pDrv->pu8Data);
                         Assert(pData->pDrv->pfnRefresh);
                         Assert(pData->pDrv->pfnResize);

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4936 +4936 @@
     ULONG ulHeightReduction;
     IFramebuffer *pFramebuffer = pConsole->getDisplay()->getFramebuffer();
-    hrc = pFramebuffer->COMGETTER(HeightReduction)(&ulHeightReduction);             H();
+    if (pFramebuffer)
+    {
+        hrc = pFramebuffer->COMGETTER(HeightReduction)(&ulHeightReduction);         H();
+    }
+    else
+    {
+        /* If framebuffer is not available, there is no height reduction. */
+        ulHeightReduction = 0;
+    }
     rc = CFGMR3InsertInteger(pCfg,  "HeightReduction", ulHeightReduction);          RC_CHECK();
 

trunk/src/VBox/Main/MouseImpl.cpp

@@ -274 +274 @@
     ComAssertComRCRet (rc, rc);
 
-    uint32_t mouseXAbs = (x * 0xFFFF) / displayWidth;
-    uint32_t mouseYAbs = (y * 0xFFFF) / displayHeight;
+    uint32_t mouseXAbs = displayWidth? (x * 0xFFFF) / displayWidth: 0;
+    uint32_t mouseYAbs = displayHeight? (y * 0xFFFF) / displayHeight: 0;
 
     /*

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -269 +269 @@
         return VERR_INVALID_PARAMETER;
     IFramebuffer *framebuffer = pDrv->pVMMDev->getParent()->getDisplay()->getFramebuffer();
-    Assert(framebuffer);
-    framebuffer->VideoModeSupported(width, height, bpp, (BOOL*)fSupported);
+    if (framebuffer)
+        framebuffer->VideoModeSupported(width, height, bpp, (BOOL*)fSupported);
+    else
+        *fSupported = true;
     return VINF_SUCCESS;
 }
@@ -281 +283 @@
         return VERR_INVALID_PARAMETER;
     IFramebuffer *framebuffer = pDrv->pVMMDev->getParent()->getDisplay()->getFramebuffer();
-    Assert(framebuffer);
-    framebuffer->COMGETTER(HeightReduction)((ULONG*)heightReduction);
+    if (framebuffer)
+        framebuffer->COMGETTER(HeightReduction)((ULONG*)heightReduction);
+    else
+        *heightReduction = 0;
     return VINF_SUCCESS;
 }