Changeset 34141 in vbox

Timestamp:

Nov 17, 2010 5:06:11 PM (14 years ago)

Author:

vboxsync

Message:

2d: solaris burn fix, additianal saved state fix

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA_VBVA.cpp (modified) (1 diff)
• Devices/Graphics/DevVGA_VDMA.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (4 diffs)

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

@@ -1373 +1373 @@
     }
 #else
-    for (UINT i = 0; i < pVGAState->cMonitors; ++i)
+    for (uint32_t i = 0; i < pVGAState->cMonitors; ++i)
     {
         rc = SSMR3PutU32 (pSSM, VBOXVBVASAVEDSTATE_VHWAUNAVAILABLE_MAGIC);

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

@@ -101 +101 @@
 {
     uint32_t cRefs;
-    uint32_t rc;
+    int32_t rc;
     PFNVBOXVDMACRCTL_CALLBACK pfnCompletion;
     void *pvCompletion;
@@ -461 +461 @@
 
     uint8_t * pvRam = pVdma->pVGAState->vram_ptrR3;
-    VBOXVDMA_RECTL updateRectl = {0};
+    VBOXVDMA_RECTL updateRectl = {0, 0, 0, 0};
 
     if (pBlt->cDstSubRects)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -60 +60 @@
 
 #define VBOXQGL_STATE_NAMEBASE "QGLVHWAData"
-#define VBOXQGL_STATE_VERSION 2
+#define VBOXQGL_STATE_VERSION           3
+#define VBOXQGL_STATE_VERSION_PIPESAVED 3
 
 #ifdef DEBUG
@@ -4776 +4777 @@
     if (RT_SUCCESS(rc))
     {
-        rc = mCmdPipe.loadExec(pSSM, u32Version, mOverlayImage.vramBase());
-        AssertRC(rc);
+        if (u32Version >= VBOXQGL_STATE_VERSION_PIPESAVED)
+        {
+            rc = mCmdPipe.loadExec(pSSM, u32Version, mOverlayImage.vramBase());
+            AssertRC(rc);
+        }
     }
     return rc;
@@ -5199 +5203 @@
     bool b;
     int rc;
-    rc = SSMR3GetU32(pSSM, &u32);
+    rc = SSMR3GetU32(pSSM, &u32); AssertRC(rc);
     if (RT_SUCCESS(rc))
     {
@@ -5265 +5269 @@
         }
     }
-    else if (rc == VERR_SSM_LOADED_TOO_MUCH)
-    {
-        /* this would mean we do not have a cmd pipe data saved.
-         * skip the failure.
-         * not sure if that's a good idea actually,
-         * but this allows keeping the state version unchanged */
-        rc = VINF_SUCCESS;
-    }
 
     return rc;