Changeset 26426 in vbox

Timestamp:

Feb 11, 2010 12:45:34 PM (15 years ago)

Author:

vboxsync

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

57545

Message:

Fixed loading DisplayScreenshot from saved state.

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;        if 0 - no 'block data'.
-     *    uint32_t typeOfBlock;    0 - 32bpp RGB bitmap, 1 - PNG, ignored if 'cbBlock' is 0.
+     *    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.
      *    [block data]
      *
@@ -517 +517 @@
         LogFlowFunc(("[%d] type %d, size %d bytes\n", i, typeOfBlock, cbBlock));
 
-        if (cbBlock != 0)
-        {
-            rc = SSMR3Skip(pSSM, cbBlock);
+        if (cbBlock > 2 * sizeof (uint32_t))
+        {
+            rc = SSMR3Skip(pSSM, cbBlock - 2 * sizeof (uint32_t));
             AssertRCBreak(rc);
         }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4082 +4082 @@
                     else
                     {
-                        if (cbBlock != 0)
+                        if (cbBlock > 2 * sizeof (uint32_t))
                         {
-                            rc = SSMR3Skip(pSSM, cbBlock);
+                            rc = SSMR3Skip(pSSM, cbBlock - 2 * sizeof (uint32_t));
                             AssertRCBreak(rc);
                         }