Changeset 24365 in vbox

Timestamp:

Nov 5, 2009 3:07:25 AM (16 years ago)

Author:

vboxsync

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

54389

Message:

ConsoleImplTeleporter.cpp: Error info handling on windows (grrr!). Locking fix. Annoying warnings.

File:

• trunk/src/VBox/Main/ConsoleImplTeleporter.cpp (modified) (8 diffs)

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -275 +275 @@
 
     AssertReturn(cbToWrite > 0, VINF_SUCCESS);
+    AssertReturn(cbToWrite < UINT32_MAX, VERR_OUT_OF_RANGE);
     AssertReturn(pState->mfIsSource, VERR_INVALID_HANDLE);
 
@@ -282 +283 @@
         TELEPORTERTCPHDR Hdr;
         Hdr.u32Magic = TELEPORTERTCPHDR_MAGIC;
-        Hdr.cb       = RT_MIN(cbToWrite, TELEPORTERTCPHDR_MAX_SIZE);
+        Hdr.cb       = RT_MIN((uint32_t)cbToWrite, TELEPORTERTCPHDR_MAX_SIZE);
         int rc = RTTcpWrite(pState->mhSocket, &Hdr, sizeof(Hdr));
         if (RT_FAILURE(rc))
@@ -405 +406 @@
         if (RT_FAILURE(rc))
             return rc;
-        size_t cb = RT_MIN(pState->mcbReadBlock, cbToRead);
+        uint32_t cb = (uint32_t)RT_MIN(pState->mcbReadBlock, cbToRead);
         rc = RTTcpRead(pState->mhSocket, pvBuf, cb, pcbRead);
         if (RT_FAILURE(rc))
@@ -415 +416 @@
         if (pcbRead)
         {
-            pState->moffStream   += *pcbRead;
-            pState->mcbReadBlock -= *pcbRead;
+            cb = (uint32_t)*pcbRead;
+            pState->moffStream   += cb;
+            pState->mcbReadBlock -= cb;
             return VINF_SUCCESS;
         }
@@ -569 +571 @@
      * Wait for Console::Teleport to change the state.
      */
-    { AutoWriteLock autoLock(); }
+    { AutoWriteLock autoLock(this); }
 
     BOOL fCancelled = TRUE;
@@ -683 +685 @@
         hrc = pState->mptrConsole->teleporterSrc(pState);
 
+    /* Aaarg! setMachineState trashes error info on Windows, so we have to
+       complete things here on failure instead of right before cleanup. */
+    if (FAILED(hrc))
+        pState->mptrProgress->notifyComplete(hrc);
+
     /* We can no longer be cancelled (success), or it doesn't matter any longer (failure). */
     pState->mptrProgress->setCancelCallback(NULL, NULL);
@@ -705 +712 @@
         autoVMCaller.release();
         hrc = pState->mptrConsole->powerDown();
+        pState->mptrProgress->notifyComplete(hrc);
     }
     else
@@ -763 +771 @@
     }
     autoLock.leave();
-
-    pState->mptrProgress->notifyComplete(hrc);
 
     /*