Changeset 26443 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 11, 2010 4:42:07 PM (15 years ago)

Author:

vboxsync

Message:

Fixed loading DisplayScreenshot from saved state (a corrected fix).

Location:

trunk/src/VBox/Main

Files:

• DisplayImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -454 +454 @@
      *
      *  Each block is:
-     *    uint32_t cbBlock;        size of the block in bytes including 'cbBlock' and 'typeOfBlock' fields.
-     *    uint32_t typeOfBlock;    0 - 32bpp RGB bitmap, 1 - PNG, ignored if no block data.
+     *    uint32_t cbBlock;        if 0 - no 'block data'.
+     *    uint32_t typeOfBlock;    0 - 32bpp RGB bitmap, 1 - PNG, ignored if 'cbBlock' is 0.
      *    [block data]
      *
@@ -517 +517 @@
         LogFlowFunc(("[%d] type %d, size %d bytes\n", i, typeOfBlock, cbBlock));
 
+        /* Note: displaySSMSaveScreenshot writes size of a block = 8 and
+         * do not write any data if the image size was 0.
+         * @todo Fix and increase saved state version.
+         */
         if (cbBlock > 2 * sizeof (uint32_t))
         {
-            rc = SSMR3Skip(pSSM, cbBlock - 2 * sizeof (uint32_t));
+            rc = SSMR3Skip(pSSM, cbBlock);
             AssertRCBreak(rc);
         }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4142 +4142 @@
                     else
                     {
+                        /* displaySSMSaveScreenshot did not write any data, if
+                         * cbBlock was == 2 * sizeof (uint32_t).
+                         */
                         if (cbBlock > 2 * sizeof (uint32_t))
                         {
-                            rc = SSMR3Skip(pSSM, cbBlock - 2 * sizeof (uint32_t));
+                            rc = SSMR3Skip(pSSM, cbBlock);
                             AssertRCBreak(rc);
                         }