Changeset 1663 in vbox

Timestamp:

Mar 23, 2007 10:50:02 AM (18 years ago)

Author:

vboxsync

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

19796

Message:

Some shutdown fixes. (not well done)

Location:

trunk/src/VBox/Devices/Serial

Files:

• DrvChar.cpp (modified) (1 diff)
• DrvNamedPipe.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Serial/DrvChar.cpp

@@ -163 +163 @@
                 cbRemaining = sizeof(aBuffer);
                 rc = pData->pDrvStream->pfnRead(pData->pDrvStream, aBuffer, &cbRemaining);
+                if (rc == VERR_BROKEN_PIPE)
+                    return VINF_SUCCESS;        /* abort; typically happens when shutting down. */
+
                 AssertRC(rc);
             }

trunk/src/VBox/Devices/Serial/DrvNamedPipe.cpp

@@ -310 +310 @@
 static DECLCALLBACK(int) drvNamedPipeListenLoop(RTTHREAD ThreadSelf, void *pvUser)
 {
-    PDRVNAMEDPIPE pData = (PDRVNAMEDPIPE)pvUser;
-    int rc = VINF_SUCCESS;
+    PDRVNAMEDPIPE   pData = (PDRVNAMEDPIPE)pvUser;
+    int             rc = VINF_SUCCESS;
+    RTFILE          NamedPipe = pData->NamedPipe;
 
     while (RT_LIKELY(!pData->fShutdown))
     {
 #ifdef __WIN__
-        BOOL fConnected = ConnectNamedPipe((HANDLE)pData->NamedPipe, NULL);
+        BOOL fConnected = ConnectNamedPipe((HANDLE)NamedPipe, NULL);
         if (!fConnected)
         {